From 6fe08428c13ee7839d640f347851cb8668d50607 Mon Sep 17 00:00:00 2001 From: Sudharsanan11 Date: Mon, 20 Apr 2026 04:18:09 +0530 Subject: [PATCH 001/249] fix(stock): ignore fetching warehouse account for asset items --- erpnext/controllers/stock_controller.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index 01366d7bcc8..7ef893d1580 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -264,14 +264,15 @@ class StockController(AccountsController): ) is_asset_pr = any(d.get("is_fixed_asset") for d in self.get("items")) - - if ( + need_inventory_map = (self.get_stock_items() or self.get("packed_items")) and ( cint(erpnext.is_perpetual_inventory_enabled(self.company)) - or provisional_accounting_for_non_stock_items - or is_asset_pr - ): + ) + + inventory_account_map = frappe._dict() + if need_inventory_map: inventory_account_map = self.get_inventory_account_map() + if need_inventory_map or provisional_accounting_for_non_stock_items or is_asset_pr: if self.docstatus == 1: if not gl_entries: gl_entries = ( From 8cf4402823525e9053fe99f1ab8d50b1890871cb Mon Sep 17 00:00:00 2001 From: Sudharsanan11 Date: Mon, 27 Apr 2026 15:38:11 +0530 Subject: [PATCH 002/249] test(stock): add test to create pr for asset item without checking the stock account --- erpnext/assets/doctype/asset/test_asset.py | 4 +- .../purchase_receipt/test_purchase_receipt.py | 141 ++++++++++++++++++ 2 files changed, 143 insertions(+), 2 deletions(-) diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py index 91ab627b113..a1c5fc5e55e 100644 --- a/erpnext/assets/doctype/asset/test_asset.py +++ b/erpnext/assets/doctype/asset/test_asset.py @@ -2062,7 +2062,7 @@ def create_asset_category(enable_cwip=1): asset_category.insert() -def create_fixed_asset_item(item_code=None, auto_create_assets=1, is_grouped_asset=0): +def create_fixed_asset_item(item_code=None, auto_create_assets=1, is_grouped_asset=0, asset_category=None): meta = frappe.get_meta("Asset") naming_series = meta.get_field("naming_series").options.splitlines()[0] or "ACC-ASS-.YYYY.-" try: @@ -2072,7 +2072,7 @@ def create_fixed_asset_item(item_code=None, auto_create_assets=1, is_grouped_ass "item_code": item_code or "Macbook Pro", "item_name": "Macbook Pro", "description": "Macbook Pro Retina Display", - "asset_category": "Computers", + "asset_category": asset_category or "Computers", "item_group": "All Item Groups", "stock_uom": "Nos", "is_stock_item": 0, diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py index ec6d8634355..1ef171b80ec 100644 --- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py @@ -5510,6 +5510,147 @@ class TestPurchaseReceipt(ERPNextTestSuite): "Buying Settings", "set_landed_cost_based_on_purchase_invoice_rate", original_value ) + def test_purchase_receipt_gl_entries_for_asset_item(self): + from erpnext.assets.doctype.asset.test_asset import create_fixed_asset_item + + # Create a Company without Stock Accounts Linked. + company = frappe.get_doc( + { + "doctype": "Company", + "company_name": "Asset Company", + "country": "India", + "default_currency": "INR", + } + ).insert() + + stock_accounts = ( + company.default_inventory_account, + company.stock_adjustment_account, + company.stock_received_but_not_billed, + ) + + company.update( + {"stock_in_hand_account": "", "stock_adjustment_account": "", "stock_received_but_not_billed": ""} + ).save() + + for account in stock_accounts: + frappe.db.delete("Account", account) + + asset_category = create_asset_category_for_pr_test() + asset_item = create_fixed_asset_item( + item_code="Test Fixed Asset Item for PR GL Test", asset_category=asset_category.name + ) + arnb_account = frappe.db.get_value("Company", company.name, "asset_received_but_not_billed") + + # Purchase Receipt should be able to create even without any stock accounts linked to company + pr = make_purchase_receipt( + item_code=asset_item.name, warehouse="Stores - AC", qty=1, rate=10000, company=company.name + ) + + gl_entries = get_gl_entries("Purchase Receipt", pr.name) + + self.assertTrue(gl_entries) + gl_accounts = [d.account for d in gl_entries] + + # The fixed asset account set on the item row must be debited + asset_expense_account = pr.items[0].expense_account + self.assertIn(asset_expense_account, gl_accounts) + + # Asset Received But Not Billed must be credited + self.assertIn(arnb_account, gl_accounts) + + # No Stock-type account should appear — the inventory account map is not + # needed and must not be consulted for an asset-only receipt + for entry in gl_entries: + account_type = frappe.db.get_value("Account", entry.account, "account_type") + self.assertNotEqual(account_type, "Stock") + + pr.cancel() + + def test_purchase_receipt_gl_entries_with_mixed_asset_and_stock_items(self): + from erpnext.assets.doctype.asset.test_asset import create_fixed_asset_item + + company = frappe.get_doc( + { + "doctype": "Company", + "company_name": "Asset Company", + "country": "India", + "default_currency": "INR", + } + ).insert() + + asset_category = create_asset_category_for_pr_test() + asset_item = create_fixed_asset_item( + item_code="Test Fixed Asset Item for PR GL Test", asset_category=asset_category.name + ) + arnb_account = frappe.db.get_value("Company", company.name, "asset_received_but_not_billed") + + pr = make_purchase_receipt( + item_code=asset_item.name, + qty=1, + rate=10000, + warehouse="Stores - AC", + do_not_save=True, + company=company.name, + ) + pr.append( + "items", + { + "item_code": "_Test Item", + "warehouse": "Stores - AC", + "qty": 5, + "received_qty": 5, + "rejected_qty": 0, + "rate": 50, + "uom": "_Test UOM", + "stock_uom": "_Test UOM", + "conversion_factor": 1.0, + "cost_center": frappe.get_cached_value("Company", pr.company, "cost_center"), + }, + ) + pr.insert() + pr.submit() + + gl_entries = get_gl_entries("Purchase Receipt", pr.name) + self.assertTrue(gl_entries) + + gl_accounts = [d.account for d in gl_entries] + self.assertIn(arnb_account, gl_accounts) + + # The fixed asset account set on the item row must be debited + asset_expense_account = pr.items[0].expense_account + self.assertIn(asset_expense_account, gl_accounts) + + # Asset Received But Not Billed must be credited + self.assertIn(asset_category.accounts[0].fixed_asset_account, gl_accounts) + + # Stock Accounts should be used for Stock Items + self.assertIn(company.stock_received_but_not_billed, gl_accounts) + self.assertIn(company.default_inventory_account, gl_accounts) + pr.cancel() + + +def create_asset_category_for_pr_test(): + category_name = "Test Asset Category for PR" + + asset_category = frappe.get_doc( + { + "doctype": "Asset Category", + "asset_category_name": category_name, + "enable_cwip_accounting": 0, + "depreciation_method": "Straight Line", + "total_number_of_depreciations": 12, + "frequency_of_depreciation": 1, + "accounts": [ + { + "company_name": "Asset Company", + "fixed_asset_account": "Electronic Equipment - AC", + } + ], + } + ).insert() + return asset_category + def prepare_data_for_internal_transfer(): from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier From c933c2bd533f64619d5880a9474dce18cb3ccdec Mon Sep 17 00:00:00 2001 From: Ejaaz Khan Date: Wed, 29 Apr 2026 21:35:11 +0530 Subject: [PATCH 003/249] refactor: remove dead print format --- .../sales_invoice_print/__init__.py | 0 .../sales_invoice_print.html | 161 ------------------ .../sales_invoice_print.json | 32 ---- 3 files changed, 193 deletions(-) delete mode 100644 erpnext/accounts/print_format/sales_invoice_print/__init__.py delete mode 100644 erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html delete mode 100644 erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.json diff --git a/erpnext/accounts/print_format/sales_invoice_print/__init__.py b/erpnext/accounts/print_format/sales_invoice_print/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html b/erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html deleted file mode 100644 index 2204e3559b1..00000000000 --- a/erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html +++ /dev/null @@ -1,161 +0,0 @@ -{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%} - {% if letter_head and not no_letterhead %} -
{{ letter_head }}
- {% endif %} - {% if print_heading_template %} - {{ frappe.render_template(print_heading_template, {"doc":doc}) }} - {% else %} - {% endif %} - {%- if doc.meta.is_submittable and doc.docstatus==2-%} -
-

{{ _("CANCELLED") }}

-
- {%- endif -%} -{%- endmacro -%} -{% for page in layout %} -
-
- {{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }} -
- - - {% if print_settings.repeat_header_footer %} - - {% endif %} - -
-
-
{{ doc.customer }}
-
- {{ doc.address_display }} -
-
- {{ _("Contact: ")+doc.contact_display if doc.contact_display else '' }} -
-
- {{ _("Mobile: ")+doc.contact_mobile if doc.contact_mobile else '' }} -
-
-
-
-
-
-
{{ doc.name }}
-
-
-
-
{{ frappe.utils.format_date(doc.posting_date) }}
-
-
-
-
{{ frappe.utils.format_date(doc.due_date) }}
-
-
-
- -
- - - - - - - - - - - - - - - - - - {% for item in doc.items %} - - - - - - - - {% endfor %} -
{{ _("Sr") }}{{ _("Details") }}{{ _("Qty") }}{{ _("Rate") }}{{ _("Amount") }}
{{ loop.index }} - {{ item.item_code }}: {{ item.item_name }} - {% if (item.description != item.item_name) %} -
{{ item.description }} - {% endif %} -
- {{ item.get_formatted("qty", 0) }} - {{ item.get_formatted("uom", 0) }} - {{ item.get_formatted("net_rate", doc) }}{{ item.get_formatted("net_amount", doc) }}
- -
- -
-
- - {{ doc.in_words }} -
-
- - {{ doc.status }} -
-
-
-
-
{{ _("Sub Total") }}
-
{{ doc.get_formatted("net_total", doc) }}
-
-
- {% for d in doc.taxes %} - {% if d.tax_amount %} -
-
{{ _(d.description) }}
-
{{ d.get_formatted("tax_amount") }}
-
- {% endif %} - {% endfor %} -
-
-
{{ _("Total") }}
-
{{ doc.get_formatted("grand_total", doc) }}
-
-
- -
-
- - -
-
-
-
-
{{ doc.terms if doc.terms else '' }}
-
-
-
-
-{% endfor %} diff --git a/erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.json b/erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.json deleted file mode 100644 index d4acf5fb36e..00000000000 --- a/erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "absolute_value": 0, - "align_labels_right": 0, - "creation": "2025-01-22 16:23:51.012200", - "css": "", - "custom_format": 0, - "default_print_language": "en", - "disabled": 0, - "doc_type": "Sales Invoice", - "docstatus": 0, - "doctype": "Print Format", - "font": "", - "font_size": 14, - "idx": 0, - "line_breaks": 0, - "margin_bottom": 0.0, - "margin_left": 0.0, - "margin_right": 0.0, - "margin_top": 0.0, - "modified": "2025-01-22 16:23:51.012200", - "modified_by": "Administrator", - "module": "Accounts", - "name": "Sales Invoice Print", - "owner": "Administrator", - "page_number": "Hide", - "print_format_builder": 0, - "print_format_builder_beta": 0, - "print_format_type": "Jinja", - "raw_printing": 0, - "show_section_headings": 0, - "standard": "Yes" -} \ No newline at end of file From 01e382b1068db6940e142bec0dcebb70eb4e0f59 Mon Sep 17 00:00:00 2001 From: ervishnucs Date: Wed, 6 May 2026 17:08:27 +0530 Subject: [PATCH 004/249] fix: normalize date comparison to avoid datatype mismatch --- erpnext/accounts/party.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index 450e973845a..bb603c7bb1b 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -687,7 +687,7 @@ def validate_due_date_with_template(posting_date, due_date, bill_date, template_ if not default_due_date: return - if default_due_date != posting_date and getdate(due_date) > getdate(default_due_date): + if getdate(default_due_date) != getdate(posting_date) and getdate(due_date) > getdate(default_due_date): if frappe.get_single_value("Accounts Settings", "credit_controller") in frappe.get_roles(): party_type = "supplier" if doctype == "Purchase Invoice" else "customer" From bdf0136fc50c5cc3f4dbd6b2710d1c2e90ebaa05 Mon Sep 17 00:00:00 2001 From: HemilSangani Date: Mon, 11 May 2026 18:58:57 +0530 Subject: [PATCH 005/249] fix: add company filter to Budget Against dimension options --- .../report/budget_variance_report/budget_variance_report.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js index c74450191aa..00f7ae85d46 100644 --- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js @@ -96,9 +96,12 @@ function get_filters() { if (!frappe.query_report.filters) return; let budget_against = frappe.query_report.get_filter_value("budget_against"); + let company = frappe.query_report.get_filter_value("company"); if (!budget_against) return; + // Branch does not have company field + const filters = budget_against !== "Branch" && company ? { company: company } : {}; - return frappe.db.get_link_options(budget_against, txt); + return frappe.db.get_link_options(budget_against, txt, filters); }, }, { From c5e24eda69c975af8b009ce5c01aedf774e66b66 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Thu, 14 May 2026 12:35:57 +0530 Subject: [PATCH 006/249] Revert "feat: show reconciled/unreconciled indicator in list view" --- .../doctype/payment_entry/payment_entry_list.js | 16 ---------------- erpnext/public/js/utils/unreconcile.js | 16 ++-------------- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry_list.js b/erpnext/accounts/doctype/payment_entry/payment_entry_list.js index 95be03d4f10..6974e58c78c 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry_list.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry_list.js @@ -1,20 +1,4 @@ frappe.listview_settings["Payment Entry"] = { - add_fields: ["unallocated_amount", "docstatus"], - get_indicator: function (doc) { - if (doc.docstatus === 2) { - return [__("Cancelled"), "red", "docstatus,=,2"]; - } - - if (doc.docstatus === 0) { - return [__("Draft"), "orange", "docstatus,=,0"]; - } - - if (flt(doc.unallocated_amount) > 0) { - return [__("Unreconciled"), "orange", "docstatus,=,1|unallocated_amount,>,0"]; - } - - return [__("Reconciled"), "green", "docstatus,=,1|unallocated_amount,=,0"]; - }, onload: function (listview) { if (listview.page.fields_dict.party_type) { listview.page.fields_dict.party_type.get_query = function () { diff --git a/erpnext/public/js/utils/unreconcile.js b/erpnext/public/js/utils/unreconcile.js index 1f9ffda7c24..4ccbf0106d7 100644 --- a/erpnext/public/js/utils/unreconcile.js +++ b/erpnext/public/js/utils/unreconcile.js @@ -140,8 +140,7 @@ erpnext.accounts.unreconcile_payment = { selected_allocations ); erpnext.accounts.unreconcile_payment.create_unreconcile_docs( - selection_map, - frm + selection_map ); d.hide(); } else { @@ -157,23 +156,12 @@ erpnext.accounts.unreconcile_payment = { } }, - create_unreconcile_docs(selection_map, frm) { + create_unreconcile_docs(selection_map) { frappe.call({ method: "erpnext.accounts.doctype.unreconcile_payment.unreconcile_payment.create_unreconcile_doc_for_selection", args: { selections: selection_map, }, - callback: function (r) { - if (r.exc) { - return; - } - - if (frm && !frm.is_new()) { - frm.reload_doc(); - } - - frappe.show_alert({ message: __("Unreconciled successfully"), indicator: "green" }); - }, }); }, }; From 78a79120ea99379aab0b64ed46d281ee58abac5f Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 14 May 2026 13:56:51 +0530 Subject: [PATCH 007/249] fix: status not changing for dropshipped POs and SOs (#54934) * fix: status not changing for dropshipped POs and SOs * test: change test case to accomodate new flow --- .../doctype/purchase_order/purchase_order.py | 13 ++++++++++--- .../purchase_order_item.json | 3 +-- .../purchase_order_item/purchase_order_item.py | 1 + .../selling/doctype/sales_order/sales_order.py | 18 ++++++------------ .../doctype/sales_order/test_sales_order.py | 7 ++++++- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index aa1867a9d37..6a621fb6774 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -469,7 +469,6 @@ class PurchaseOrder(BuyingController): self.update_status_updater_if_from_pp() if self.has_drop_ship_item(): - self.update_delivered_qty_in_sales_order() self.set_received_qty_to_zero_for_drop_ship_items() self.update_receiving_percentage() @@ -600,9 +599,17 @@ class PurchaseOrder(BuyingController): ) ) - item.received_qty += d.get("qty_change") + qty_change = item.received_qty + d.get("qty_change") + item.db_set("received_qty", qty_change, update_modified=True) + self.add_comment( + "Label", + _("updated delivered quantity for item {0} to {1}").format( + frappe.bold(item.item_code), frappe.bold(qty_change) + ), + ) self.update_receiving_percentage() - self.save() + self.set_status(update=True) + self.update_delivered_qty_in_sales_order() def is_against_so(self): return any(d.sales_order for d in self.items if d.sales_order) diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json index d65947ac56f..2479a00e2de 100644 --- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -612,7 +612,6 @@ "width": "100px" }, { - "allow_on_submit": 1, "depends_on": "received_qty", "fieldname": "received_qty", "fieldtype": "Float", @@ -942,7 +941,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2026-05-08 20:40:10.683023", + "modified": "2026-05-14 12:16:16.192936", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order Item", diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.py b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.py index 4d89584598d..b8741486efc 100644 --- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.py +++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.py @@ -27,6 +27,7 @@ class PurchaseOrderItem(Document): billed_amt: DF.Currency blanket_order: DF.Link | None blanket_order_rate: DF.Currency + bom: DF.Link | None brand: DF.Link | None company_total_stock: DF.Float conversion_factor: DF.Float diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 321515252bb..4f2df0223f7 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -686,18 +686,12 @@ class SalesOrder(SellingController): for item in self.items: if item.delivered_by_supplier: - item_delivered_qty = frappe.db.sql( - """select sum(qty) - from `tabPurchase Order Item` poi, `tabPurchase Order` po - where poi.sales_order_item = %s - and poi.item_code = %s - and poi.parent = po.name - and po.docstatus = 1 - and po.status = 'Delivered'""", - (item.name, item.item_code), - ) - - item_delivered_qty = item_delivered_qty[0][0] if item_delivered_qty else 0 + item_delivered_qty = frappe.get_all( + "Purchase Order Item", + {"sales_order_item": item.name, "docstatus": 1}, + [{"SUM": "received_qty", "AS": "received_qty"}], + pluck="received_qty", + )[0] item.db_set("delivered_qty", flt(item_delivered_qty), update_modified=False) delivered_qty += min(item.delivered_qty, item.qty) diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py index 3dcea77fb5a..da46870b958 100644 --- a/erpnext/selling/doctype/sales_order/test_sales_order.py +++ b/erpnext/selling/doctype/sales_order/test_sales_order.py @@ -1224,9 +1224,14 @@ class TestSalesOrder(ERPNextTestSuite): self.assertEqual(abs(flt(reserved_qty)), 0) # test per_delivered status - update_status("Delivered", po.name) + self.assertEqual(po.status, "To Receive and Bill") + self.assertEqual(so.status, "To Deliver and Bill") + po.update_dropship_received_qty([{"name": po.items[0].name, "qty_change": 2}]) self.assertEqual(flt(frappe.db.get_value("Sales Order", so.name, "per_delivered"), 2), 100.00) po.load_from_db() + so.reload() + self.assertEqual(po.status, "To Bill") + self.assertEqual(so.status, "To Bill") # test after closing so so.db_set("status", "Closed") From 4380d710c7c62b0a6a669222560746abc648d9e7 Mon Sep 17 00:00:00 2001 From: MochaMind Date: Thu, 14 May 2026 17:00:43 +0530 Subject: [PATCH 008/249] fix: sync translations from crowdin (#54893) * fix: Persian translations * fix: Croatian translations * fix: Swedish translations --- erpnext/locale/fa.po | 46 ++++++++++++++++++------------------ erpnext/locale/hr.po | 56 ++++++++++++++++++++++---------------------- erpnext/locale/sv.po | 4 ++-- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/erpnext/locale/fa.po b/erpnext/locale/fa.po index fa4e1620c48..6ad85d9e1cc 100644 --- a/erpnext/locale/fa.po +++ b/erpnext/locale/fa.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" "POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:21\n" +"PO-Revision-Date: 2026-05-12 19:33\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -30797,7 +30797,7 @@ msgstr "برنامه پرداخت وجود ندارد" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:249 msgid "Missing Required Filter" -msgstr "" +msgstr "فیلتر مورد نیاز وجود ندارد" #: erpnext/assets/doctype/asset_repair/asset_repair.py:297 msgid "Missing Serial No Bundle" @@ -37054,7 +37054,7 @@ msgstr "" #: erpnext/public/js/utils/naming_series_dialog.js:170 msgid "Please add at least one naming series." -msgstr "" +msgstr "لطفا حداقل یک سری نامگذاری اضافه کنید." #: erpnext/public/js/utils/serial_no_batch_selector.js:661 msgid "Please add atleast one Serial No / Batch No" @@ -37717,7 +37717,7 @@ msgstr "لطفاً یک تامین کننده برای واکشی پرداخت #: erpnext/public/js/utils/naming_series_dialog.js:165 msgid "Please select a transaction." -msgstr "" +msgstr "لطفا یک تراکنش را انتخاب کنید." #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py:139 msgid "Please select a valid Purchase Order that is configured for Subcontracting." @@ -40128,7 +40128,7 @@ msgstr "سود / زیان موقت (بستانکار)" #. DocType 'Item Default' #: erpnext/stock/doctype/item_default/item_default.json msgid "Provisional liability account used for service items before invoice is received" -msgstr "" +msgstr "حساب بدهی موقت برای آیتم‌های خدماتی قبل از دریافت فاکتور استفاده می‌شود" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json @@ -46310,7 +46310,7 @@ msgstr "" #: erpnext/public/js/utils/naming_series_dialog.js:54 msgid "Rules for configuring series" -msgstr "" +msgstr "قوانین پیکربندی سری‌ها" #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:189 msgid "Rules to match against the transaction description" @@ -58316,7 +58316,7 @@ msgstr "استفاده از فیلدهای شماره سریال / دسته" #: banking/src/components/features/BankReconciliation/TransferModal.tsx:543 msgid "Use Suggestion" -msgstr "" +msgstr "استفاده از پیشنهاد" #. Label of the use_transaction_date_exchange_rate (Check) field in DocType #. 'Purchase Invoice' @@ -59159,19 +59159,19 @@ msgstr "مشاهده لاگ تماس" #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:937 msgid "View older transaction" -msgstr "" +msgstr "مشاهده تراکنش قدیمی‌تر" #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:937 msgid "View older transactions" -msgstr "" +msgstr "مشاهده تراکنش‌های قدیمی‌تر" #: banking/src/components/features/BankStatementImporter/CSV/StatementDetails.tsx:284 msgid "View transaction" -msgstr "" +msgstr "مشاهده تراکنش" #: banking/src/components/features/BankStatementImporter/CSV/StatementDetails.tsx:284 msgid "View transactions" -msgstr "" +msgstr "مشاهده تراکنش‌ها" #. Option for the 'Provider' (Select) field in DocType 'Video' #: erpnext/utilities/doctype/video/video.json @@ -59228,7 +59228,7 @@ msgstr "# سند مالی" #. Transaction Payments' #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json msgid "Voucher Created" -msgstr "" +msgstr "سند مالی ایجاد شد" #. Label of the voucher_detail_no (Data) field in DocType 'GL Entry' #. Label of the voucher_detail_no (Data) field in DocType 'Payment Ledger @@ -60041,7 +60041,7 @@ msgstr "" #. Default' #: erpnext/stock/doctype/item_default/item_default.json msgid "When you pay for something upfront (like annual insurance), the cost is held here and recognized gradually over time" -msgstr "" +msgstr "وقتی هزینه‌ای را از قبل پرداخت می‌کنید (مثل بیمه سالانه)، هزینه در اینجا نگهداری می‌شود و به تدریج در طول زمان به رسمیت شناخته می‌شود" #: erpnext/accounts/doctype/account/account.py:380 msgid "While creating account for Child Company {0}, parent account {1} found as a ledger account." @@ -60150,23 +60150,23 @@ msgstr "" #: banking/src/components/features/Settings/Preferences.tsx:70 msgid "Within 1 day" -msgstr "" +msgstr "طی ۱ روز" #: banking/src/components/features/Settings/Preferences.tsx:71 msgid "Within 2 days" -msgstr "" +msgstr "طی ۲ روز" #: banking/src/components/features/Settings/Preferences.tsx:72 msgid "Within 3 days" -msgstr "" +msgstr "طی ۳ روز" #: banking/src/components/features/Settings/Preferences.tsx:73 msgid "Within 4 days" -msgstr "" +msgstr "طی ۴ روز" #: banking/src/components/features/Settings/Preferences.tsx:74 msgid "Within 5 days" -msgstr "" +msgstr "طی ۵ روز" #. Label of a chart in the CRM Workspace #: erpnext/crm/workspace/crm/crm.json @@ -60704,7 +60704,7 @@ msgstr "همچنین می‌توانید حساب پیش‌فرض «کارهای #: erpnext/public/js/utils/naming_series_dialog.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" -msgstr "" +msgstr "همچنین می‌توانید با قرار دادن متغیرها بین (.) نقطه، از آنها در نام سری استفاده کنید" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1016 msgid "You can change the parent account to a Balance Sheet account or select a different account." @@ -61058,7 +61058,7 @@ msgstr "به عنوان مثال \"پیشنهاد 20 تعطیلات تابستا #: banking/src/components/features/BankReconciliation/RecordPaymentModal.tsx:1256 #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:685 msgid "e.g. Bank Charges" -msgstr "" +msgstr "مثلاً کارمزد بانک" #. Description of the 'Shipping Rule Label' (Data) field in DocType 'Shipping #. Rule' @@ -61278,7 +61278,7 @@ msgstr "تراکنش" #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:404 msgid "transaction selected" -msgstr "" +msgstr "تراکنش انتخاب شد" #: banking/src/components/features/BankStatementImporter/CSV/StatementDetails.tsx:169 #: banking/src/components/features/BankStatementImporter/CSV/StatementDetails.tsx:173 @@ -61287,7 +61287,7 @@ msgstr "تراکنش‌ها" #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:404 msgid "transactions selected" -msgstr "" +msgstr "تراکنش‌ها انتخاب شدند" #. Description of the 'Coupon Code' (Data) field in DocType 'Coupon Code' #: erpnext/accounts/doctype/coupon_code/coupon_code.json @@ -61664,7 +61664,7 @@ msgstr "{0} تا {1}" #: banking/src/components/features/BankStatementImporter/CSV/StatementDetails.tsx:225 msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." -msgstr "" +msgstr "{0} تراکنش‌ها به سیستم درون‌بُرد خواهند شد. لطفاً جزئیات زیر را بررسی کرده و برای ادامه روی دکمه «درون‌بُرد» کلیک کنید." #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." diff --git a/erpnext/locale/hr.po b/erpnext/locale/hr.po index edb55cba36b..75fefbb3b49 100644 --- a/erpnext/locale/hr.po +++ b/erpnext/locale/hr.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" "POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-11 18:40\n" +"PO-Revision-Date: 2026-05-12 19:34\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Croatian\n" "MIME-Version: 1.0\n" @@ -1236,7 +1236,7 @@ msgstr "Akademski korisnik" #: banking/src/components/features/Settings/KeyboardShortcuts.tsx:38 msgid "Accept Matching Rule" -msgstr "Prihvati Pravilo Podudaranja" +msgstr "Prihvati Pravilo Usklađivanja" #: banking/src/components/features/Settings/KeyboardShortcuts.tsx:39 msgid "Accept the rule for the selected transaction" @@ -1637,7 +1637,7 @@ msgstr "Račun {0} ne postoji" #: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py:48 msgid "Account {0} does not match with Company {1} in Mode of Account: {2}" -msgstr "Račun {0} se ne podudara sa tvrtkom {1} u Kontnom Planu: {2}" +msgstr "Račun {0} nije usklađen sa {1} u Kontnom Planu: {2}" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:138 msgid "Account {0} doesn't belong to Company {1}" @@ -5440,7 +5440,7 @@ msgstr "Odobravajući Korisnik ne može biti isti kao korisnik na koji je pravil #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json msgid "Approximately match the description/party name against parties" -msgstr "Približno podudaranje opisu/nazivu stranke aspram stranki" +msgstr "Otprilike uskladite opis/naziv stranke s strankama" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json @@ -11554,7 +11554,7 @@ msgstr "Filtri tvrtke i računa nisu postavljeni!" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2580 msgid "Company currencies of both the companies should match for Inter Company Transactions." -msgstr "Valute obje tvrtke treba da se podudaraju sa transakcijama između tvrtki." +msgstr "Valute obje tvrtke trebaju biti usklađne sa transakcijama između tvrtki." #: erpnext/stock/doctype/material_request/material_request.js:380 #: erpnext/stock/doctype/stock_entry/stock_entry.js:834 @@ -11645,7 +11645,7 @@ msgstr "Tvrtka {} još ne postoji. Postavljanje poreza je prekinuto." #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:576 msgid "Company {} does not match with POS Profile Company {}" -msgstr "Tvrtka {} se ne podudara s Kasa Profilom Tvrtke {}" +msgstr "Tvrtka {} nije usklađena s Kasa Profilom Tvrtke {}" #. Name of a DocType #. Label of the competitor (Link) field in DocType 'Competitor Detail' @@ -11680,7 +11680,7 @@ msgstr "Završi Posao" #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:857 msgid "Complete Match" -msgstr "Potpuno Podudaranje" +msgstr "Potpuno Usklađivanje" #: erpnext/selling/page/point_of_sale/pos_payment.js:44 msgid "Complete Order" @@ -11861,7 +11861,7 @@ msgstr "Konfiguriraj Seriju Imenovanja" #: banking/src/components/features/BankReconciliation/MatchFilters.tsx:21 #: banking/src/components/features/BankReconciliation/MatchFilters.tsx:27 msgid "Configure match filters for vouchers" -msgstr "Konfigurirajte filtere podudaranja za vaučere" +msgstr "Konfigurirajte filtere usklađivanja za vaučere" #: banking/src/components/features/Settings/Rules/RuleList.tsx:202 msgid "Configure rules to save time when reconciling transactions." @@ -18737,7 +18737,7 @@ msgstr "Omogući Evropski Pristup" #. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json msgid "Enable Fuzzy Matching" -msgstr "Omogući nejasno podudaranje" +msgstr "Omogući Približno Usklađivanje" #. Label of the enable_health_monitor (Check) field in DocType 'Ledger Health #. Monitor' @@ -18826,7 +18826,7 @@ msgstr "Omogući YouTube praćenje" #: banking/src/components/features/Settings/Preferences.tsx:104 msgid "Enable automatic party matching" -msgstr "Omogući automatsko podudaranje stranki" +msgstr "Omogući automatsko usklađivanje stranki" #. Description of the 'Enable Accounting Dimensions' (Check) field in DocType #. 'Accounts Settings' @@ -18882,7 +18882,7 @@ msgstr "Omogući ako korisnici žele da uzmu u obzir odbijene materijale za slan #: banking/src/components/features/Settings/Preferences.tsx:125 msgid "Enable party name/description fuzzy matching" -msgstr "Omogućite približno podudaranje imena/opisa stranke" +msgstr "Omogući približno usklađivanje imena/opisa stranke" #. Description of the 'Has Priority' (Check) field in DocType 'Pricing Rule' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json @@ -19260,7 +19260,7 @@ msgstr "Pogreška pri preuzimanju detalja za {0}: {1}" #: erpnext/accounts/doctype/bank_transaction/bank_transaction.py:320 msgid "Error in party matching for Bank Transaction {0}" -msgstr "Greška u podudaranju stranaka za Bankovnu Transakciju {0}" +msgstr "Pogreška u usklađibvanju stranaka za bankovnu transakciju {0}" #: banking/src/components/features/BankReconciliation/BankEntryModal.tsx:373 msgid "Error uploading attachments" @@ -23161,7 +23161,7 @@ msgstr "Ako je Prihod ili Rashod" #: banking/src/components/features/Settings/Preferences.tsx:127 msgid "If a party cannot be matched by account number or IBAN, the system will try fuzzy matching using the party name and transaction description." -msgstr "Ako se stranka ne može uskladiti prema broju računa ili IBAN-u, sustav će pokušati priblišno podudaranje koristeći ime stranke i opis transakcije." +msgstr "Ako se stranka ne može uskladiti prema broju računa ili IBAN-u, sustav će pokušati priblišno usklađivanje koristeći ime stranke i opis transakcije." #: erpnext/manufacturing/doctype/operation/operation.js:32 msgid "If an operation is divided into sub operations, they can be added here." @@ -23296,7 +23296,7 @@ msgstr "Ako je omogućeno, unosi registra će biti knjiženi za iznos promjene u #. (Check) field in DocType 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json msgid "If enabled, rule matching algorithm will run every hour" -msgstr "Ako je omogućen, algoritam za podudaranje pravila će se pokretati svakog sata" +msgstr "Ako je omogućen, algoritam za isklađivanje pravila će se pokretati svakog sata" #. Description of the 'Grant Commission' (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json @@ -23451,7 +23451,7 @@ msgstr "Ako je cijena nula, artikal će se tretirati kao \"Besplatni Artikal\"" #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:258 msgid "If rule matches, then:" -msgstr "Ako se pravilo podudara, onda:" +msgstr "Ako je pravilo usklađeno, onda:" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:51 msgid "If selected Pricing Rule is made for 'Rate', it will overwrite Price List. Pricing Rule rate is the final rate, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field." @@ -27354,7 +27354,7 @@ msgstr "PDV Detalji po Stavki" #: erpnext/controllers/taxes_and_totals.py:573 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" -msgstr "PDV Detalji po Stavki ne podudaraju se s PDV i Naknadama u sljedećim redovima:" +msgstr "PDV Detalji po Artiklu nisu uskađeni se s PDV i Naknadama u sljedećim redovima:" #. Label of the section_break_rrrx (Section Break) field in DocType 'Sales #. Forecast' @@ -27963,7 +27963,7 @@ msgstr "Tip Naloga Knjiženja treba postaviti kao Unos Amortizacije za amortizac #: erpnext/accounts/doctype/journal_entry/journal_entry.py:728 msgid "Journal Entry {0} does not have account {1} or already matched against other voucher" -msgstr "Naloga Knjiženja {0} nema račun {1} ili se podudara naspram drugog verifikata" +msgstr "Naloga Knjiženja {0} nema račun {1} ili nije usklađen naspram drugog verifikata" #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:394 msgid "Journal Template Accounts" @@ -29914,7 +29914,7 @@ msgstr "Postavke" #: banking/src/components/features/ActionLog/ActionLog.tsx:346 msgid "Match" -msgstr "Podudaranje" +msgstr "Usklađivanje" #: banking/src/pages/BankReconciliation.tsx:116 msgid "Match and Reconcile" @@ -32146,7 +32146,7 @@ msgstr "Nema artikala u korpi" #: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:1043 msgid "No matches occurred via auto reconciliation" -msgstr "Nije došlo do podudaranja putem automatskog usaglašavanja" +msgstr "Nije došlo do usklađivanja putem automatskog usklađivanja" #: erpnext/manufacturing/doctype/production_plan/production_plan.py:1040 msgid "No material request created" @@ -35021,7 +35021,7 @@ msgstr "Pogreška Raščlanjivanja" #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:857 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:888 msgid "Partial Match" -msgstr "Djelomično podudaranje" +msgstr "Djelomično Usklađivanje" #. Option for the 'Status' (Select) field in DocType 'Subcontracting Order' #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json @@ -43535,7 +43535,7 @@ msgstr "Poslovi preimenovanja za tip dokumenta {0} nisu stavljeni u red čekanja #: erpnext/accounts/doctype/account/account.py:550 msgid "Renaming it is only allowed via parent company {0}, to avoid mismatch." -msgstr "Preimenovanje je dozvoljeno samo preko nadređene tvrtke {0}, kako bi se izbjegla nepodudaranje." +msgstr "Preimenovanje je dozvoljeno samo preko nadređene tvrtke {0}, kako bi se izbjegla neusklađenost." #: erpnext/manufacturing/doctype/workstation/test_workstation.py:78 #: erpnext/manufacturing/doctype/workstation/test_workstation.py:89 @@ -45527,7 +45527,7 @@ msgstr "Red #{0}: Artikla {1} se ne slaže. Promjena koda artikla nije dozvoljen #: erpnext/accounts/doctype/payment_entry/payment_entry.py:765 msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher" -msgstr "Red #{0}: Nalog Knjiženja {1} nema račun {2} ili se već podudara naspram drugog verifikata" +msgstr "Red #{0}: Nalog Knjiženja {1} nema račun {2} ili je već usklađen naspram drugog voučera" #: erpnext/assets/doctype/asset_category/asset_category.py:149 msgid "Row #{0}: Missing {1} for company {2}." @@ -46157,7 +46157,7 @@ msgstr "Red {0}: Otpremnica je već kreirana za artikal {1}." #: erpnext/accounts/doctype/journal_entry/journal_entry.py:824 msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}" -msgstr "Red {0}: Strana/ Račun se ne podudara sa {1} / {2} u {3} {4}" +msgstr "Red {0}: Stranka/ Račun nije usklađen sa {1} / {2} u {3} {4}" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:602 msgid "Row {0}: Party Type and Party is required for Receivable / Payable account {1}" @@ -46306,7 +46306,7 @@ msgstr "Red {0}: {1} {2} ne može biti isto kao {3} (Račun Stranke) {4}" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:838 msgid "Row {0}: {1} {2} does not match with {3}" -msgstr "Red {0}: {1} {2} se ne podudara sa {3}" +msgstr "Red {0}: {1} {2} nije usklađen sa {3}" #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py:136 msgid "Row {0}: {1} {2} is linked to company {3}. Please select a document belonging to company {4}." @@ -48047,7 +48047,7 @@ msgstr "Odaberi Prikaz" #: erpnext/public/js/bank_reconciliation_tool/dialog_manager.js:251 msgid "Select Vouchers to Match" -msgstr "Odaber Verifikate za Podudaranje" +msgstr "Odaberi Voučere za Usklađivanje" #: erpnext/public/js/stock_analytics.js:72 msgid "Select Warehouse..." @@ -51725,7 +51725,7 @@ msgstr "Zalihe se ne mogu ažurirati za Fakturu Nabave {0} jer je za ovu transak #: erpnext/stock/doctype/warehouse/warehouse.py:125 msgid "Stock entries exist with the old account. Changing the account may lead to a mismatch between the warehouse closing balance and the account closing balance. The overall closing balance will still match, but not for the specific account." -msgstr "Unosi zaliha postoje na starom računu. Promjena računa može dovesti do neusklađenosti između završnog stanja skladišta i završnog stanja računa. Ukupno završno stanje će se i dalje podudarati, ali ne za određeni račun." +msgstr "Unosi zaliha postoje na starom računu. Promjena računa može dovesti do neusklađenosti između završnog stanja skladišta i završnog stanja računa. Ukupno završno stanje će biti usklađeno, ali ne za određeni račun." #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1140 msgid "Stock has been unreserved for work order {0}." @@ -54342,7 +54342,7 @@ msgstr "Kampanja '{0}' već postoji za {1} '{2}'" #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py:71 msgid "The Company {0} of Sales Forecast {1} does not match with the Company {2} of Master Production Schedule {3}." -msgstr "Prognoza prodaje tvrtke {0} {1} ne podudara se s tvrtkom {2} glavnog proizvodnog rasporeda {3}." +msgstr "Prognoza prodaje tvrtke {0} {1} nije usklađena se s tvrtkom {2} glavnog proizvodnog rasporeda {3}." #: erpnext/support/doctype/service_level_agreement/service_level_agreement.py:206 msgid "The Document Type {0} must have a Status field to configure Service Level Agreement" @@ -54512,7 +54512,7 @@ msgstr "Fiskalna godina je automatski kreirana u onemogućenom stanju kako bi se #: erpnext/accounts/doctype/share_transfer/share_transfer.py:240 msgid "The folio numbers are not matching" -msgstr "Brojevi Folija se ne podudaraju" +msgstr "Brojevi Folija nisu usklađeni" #: erpnext/stock/doctype/putaway_rule/putaway_rule.py:307 msgid "The following Items, having Putaway Rules, could not be accomodated:" diff --git a/erpnext/locale/sv.po b/erpnext/locale/sv.po index 13ea7c81a92..983c4cd4423 100644 --- a/erpnext/locale/sv.po +++ b/erpnext/locale/sv.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" "POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-11 18:40\n" +"PO-Revision-Date: 2026-05-13 19:29\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -32210,7 +32210,7 @@ msgstr "Antal Månader" #. Reposting Settings' #: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json msgid "No of Parallel Reposting (Per Item)" -msgstr "Antal Parallell Ombokning (Per Artikel)" +msgstr "Antal Parallella Ombokningar (Per Artikel)" #. Label of the no_of_shares (Int) field in DocType 'Share Balance' #. Label of the no_of_shares (Int) field in DocType 'Share Transfer' From 63daba97150067146ed0b055228a27fbc5748d43 Mon Sep 17 00:00:00 2001 From: Shllokkk Date: Thu, 14 May 2026 20:13:23 +0530 Subject: [PATCH 009/249] feat(company): add a default_letter_head_report field in company doctype --- erpnext/setup/doctype/company/company.js | 16 +++++++++++++++ erpnext/setup/doctype/company/company.json | 23 +++++++++++++++++++--- erpnext/setup/doctype/company/company.py | 1 + erpnext/startup/boot.py | 2 +- 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js index f8daf3c6f31..bc700044f63 100644 --- a/erpnext/setup/doctype/company/company.js +++ b/erpnext/setup/doctype/company/company.js @@ -69,6 +69,22 @@ frappe.ui.form.on("Company", { }, }; }); + + frm.set_query("default_letter_head", function () { + return { + filters: { + letter_head_for: "DocType", + }, + }; + }); + + frm.set_query("default_letter_head_report", function () { + return { + filters: { + letter_head_for: "Report", + }, + }; + }); }, company_name: function (frm) { diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json index 37eda038e3b..d8c3c227f64 100644 --- a/erpnext/setup/doctype/company/company.json +++ b/erpnext/setup/doctype/company/company.json @@ -17,12 +17,15 @@ "is_group", "default_holiday_list", "cb0", - "default_letter_head", "tax_id", "domain", "date_of_establishment", "parent_company", "reporting_currency", + "section_break_soma", + "default_letter_head", + "column_break_zqmp", + "default_letter_head_report", "company_info", "company_logo", "date_of_incorporation", @@ -253,7 +256,7 @@ { "fieldname": "default_letter_head", "fieldtype": "Link", - "label": "Default Letter Head", + "label": "Default Letter Head (DocType)", "options": "Letter Head" }, { @@ -962,6 +965,20 @@ { "fieldname": "accounts_closing_section", "fieldtype": "Section Break" + }, + { + "fieldname": "default_letter_head_report", + "fieldtype": "Link", + "label": "Default Letter Head (Report)", + "options": "Letter Head" + }, + { + "fieldname": "section_break_soma", + "fieldtype": "Section Break" + }, + { + "fieldname": "column_break_zqmp", + "fieldtype": "Column Break" } ], "grid_page_length": 50, @@ -970,7 +987,7 @@ "image_field": "company_logo", "is_tree": 1, "links": [], - "modified": "2026-04-17 17:11:46.586135", + "modified": "2026-05-14 16:50:34.132345", "modified_by": "Administrator", "module": "Setup", "name": "Company", diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index d30b082e557..3c7d900f3e8 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -76,6 +76,7 @@ class Company(NestedSet): default_income_account: DF.Link | None default_inventory_account: DF.Link | None default_letter_head: DF.Link | None + default_letter_head_report: DF.Link | None default_operating_cost_account: DF.Link | None default_payable_account: DF.Link | None default_provisional_account: DF.Link | None diff --git a/erpnext/startup/boot.py b/erpnext/startup/boot.py index 08cf9154c2b..e9f6a5c9641 100644 --- a/erpnext/startup/boot.py +++ b/erpnext/startup/boot.py @@ -49,7 +49,7 @@ def boot_session(bootinfo): bootinfo.docs += frappe.db.sql( """select name, default_currency, cost_center, default_selling_terms, default_buying_terms, - default_letter_head, default_bank_account, enable_perpetual_inventory, country, exchange_gain_loss_account from `tabCompany`""", + default_letter_head, default_letter_head_report, default_bank_account, enable_perpetual_inventory, country, exchange_gain_loss_account from `tabCompany`""", as_dict=1, update={"doctype": ":Company"}, ) From 28a2230d0221088ea424b71e2a783c622fbfc405 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 15 May 2026 10:26:20 +0530 Subject: [PATCH 010/249] refactor: flag to disable opening balance calculation --- .../report/general_ledger/general_ledger.js | 6 ++++++ .../report/general_ledger/general_ledger.py | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js index d2bc9b6d564..a0c5131acfe 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.js +++ b/erpnext/accounts/report/general_ledger/general_ledger.js @@ -177,10 +177,16 @@ frappe.query_reports["General Ledger"] = { fieldtype: "Check", default: 1, }, + { + fieldname: "disable_opening_balance_calculation", + label: __("Disable Opening Balance Calculation"), + fieldtype: "Check", + }, { fieldname: "show_opening_entries", label: __("Show Opening Entries"), fieldtype: "Check", + depends_on: "eval: !doc.disable_opening_balance_calculation", }, { fieldname: "include_default_book_entries", diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index 8bea44c73d8..8670a4fd175 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -283,7 +283,15 @@ def get_conditions(filters): if filters.get("party"): conditions.append("party in %(party)s") - if not ( + if filters.get("disable_opening_balance_calculation"): + if not ignore_is_opening: + conditions.append("(posting_date >=%(from_date)s or is_opening = 'Yes')") + else: + conditions.append("posting_date >=%(from_date)s") + + # opening balance calculation is done only if filtered on account/party + # so from_date filter is not applied + elif not ( filters.get("account") or filters.get("party") or filters.get("categorize_by") in ["Categorize by Account", "Categorize by Party"] @@ -553,7 +561,11 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map): gle.remarks = _(gle.remarks) gle.party_type = _(gle.party_type) - if gle.posting_date < from_date or (cstr(gle.is_opening) == "Yes" and not show_opening_entries): + if gle.posting_date < from_date or ( + cstr(gle.is_opening) == "Yes" + and not show_opening_entries + and not filters.disable_opening_balance_calculation + ): if not group_by_voucher_consolidated: update_value_in_dict(gle_map[group_by_value].totals, "opening", gle, True) update_value_in_dict(gle_map[group_by_value].totals, "closing", gle, True) From 69642860ee5100438bf938df9fa9f457b23b02c1 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Fri, 15 May 2026 13:55:28 +0530 Subject: [PATCH 011/249] fix(payment_entry): `paid_amount` and `received_amount` calculation depending upon `account_currency` --- .../doctype/payment_entry/payment_entry.js | 104 ++++++++---------- .../doctype/payment_entry/payment_entry.json | 4 +- 2 files changed, 45 insertions(+), 63 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index f1e816a9cbe..cf15139b712 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -710,31 +710,12 @@ frappe.ui.form.on("Payment Entry", { if (!frm.doc.paid_from_account_currency || !frm.doc.company) return; let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency; - if (frm.doc.paid_from_account_currency == company_currency) { - frm.set_value("source_exchange_rate", 1); - } else if (frm.doc.paid_from) { - if (["Internal Transfer", "Pay"].includes(frm.doc.payment_type)) { - let company_currency = frappe.get_doc(":Company", frm.doc.company)?.default_currency; - frappe.call({ - method: "erpnext.setup.utils.get_exchange_rate", - args: { - from_currency: frm.doc.paid_from_account_currency, - to_currency: company_currency, - transaction_date: frm.doc.posting_date, - }, - callback: function (r, rt) { - frm.set_value("source_exchange_rate", r.message); - }, - }); - } else { - frm.events.set_current_exchange_rate( - frm, - "source_exchange_rate", - frm.doc.paid_from_account_currency, - company_currency - ); - } - } + frm.events.set_current_exchange_rate( + frm, + "source_exchange_rate", + frm.doc.paid_from_account_currency, + company_currency + ); }, paid_to_account_currency: function (frm) { @@ -766,49 +747,24 @@ frappe.ui.form.on("Payment Entry", { posting_date: function (frm) { frm.events.paid_from_account_currency(frm); + frm.events.paid_to_account_currency(frm); }, source_exchange_rate: function (frm) { - let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency; - if (frm.doc.paid_amount) { - frm.set_value("base_paid_amount", flt(frm.doc.paid_amount) * flt(frm.doc.source_exchange_rate)); - // target exchange rate should always be same as source if both account currencies is same - if (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) { - frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate); - frm.set_value("base_received_amount", frm.doc.base_paid_amount); - } else if (company_currency == frm.doc.paid_to_account_currency) { - frm.set_value("received_amount", frm.doc.base_paid_amount); - frm.set_value("base_received_amount", frm.doc.base_paid_amount); - } - - // set_unallocated_amount is called by below method, - // no need trigger separately - frm.events.set_total_allocated_amount(frm); - } - - // Make read only if Accounts Settings doesn't allow stale rates - frm.set_df_property("source_exchange_rate", "read_only", erpnext.stale_rate_allowed() ? 0 : 1); - }, - - target_exchange_rate: function (frm) { frm.set_paid_amount_based_on_received_amount = true; let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency; - if (frm.doc.received_amount) { - frm.set_value( - "base_received_amount", - flt(frm.doc.received_amount) * flt(frm.doc.target_exchange_rate) - ); + if (frm.doc.base_received_amount && frm.doc.source_exchange_rate) { + frm.set_value("base_paid_amount", frm.doc.base_received_amount); - if ( - !frm.doc.source_exchange_rate && - frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency - ) { - frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate); - frm.set_value("base_paid_amount", frm.doc.base_received_amount); - } else if (company_currency == frm.doc.paid_from_account_currency) { - frm.set_value("paid_amount", frm.doc.base_received_amount); - frm.set_value("base_paid_amount", frm.doc.base_received_amount); + // target exchange rate should always be same as source if both account currencies is same + if (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) { + frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate); + } else { + frm.set_value( + "paid_amount", + flt(frm.doc.base_paid_amount) / flt(frm.doc.source_exchange_rate) + ); } // set_unallocated_amount is called by below method, @@ -817,6 +773,32 @@ frappe.ui.form.on("Payment Entry", { } frm.set_paid_amount_based_on_received_amount = false; + // Make read only if Accounts Settings doesn't allow stale rates + frm.set_df_property("source_exchange_rate", "read_only", erpnext.stale_rate_allowed() ? 0 : 1); + }, + + target_exchange_rate: function (frm) { + let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency; + + if (frm.doc.base_paid_amount && frm.doc.target_exchange_rate) { + frm.set_value("base_received_amount", frm.doc.base_paid_amount); + if ( + !frm.doc.source_exchange_rate && + frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency + ) { + frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate); + } else { + frm.set_value( + "received_amount", + flt(frm.doc.base_received_amount) / flt(frm.doc.target_exchange_rate) + ); + } + + // set_unallocated_amount is called by below method, + // no need trigger separately + frm.events.set_total_allocated_amount(frm); + } + // Make read only if Accounts Settings doesn't allow stale rates frm.set_df_property("target_exchange_rate", "read_only", erpnext.stale_rate_allowed() ? 0 : 1); }, diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json index 5500e1b3e07..6ac5f909bf5 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.json +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json @@ -322,7 +322,7 @@ "reqd": 1 }, { - "depends_on": "doc.received_amount", + "depends_on": "eval:doc.received_amount;", "fieldname": "base_received_amount", "fieldtype": "Currency", "label": "Received Amount (Company Currency)", @@ -795,7 +795,7 @@ "table_fieldname": "payment_entries" } ], - "modified": "2026-03-09 17:15:30.453920", + "modified": "2026-05-15 13:31:01.166010", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Entry", From 2773b7c0022bbad0e872d05289fdfedeac0a79f7 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 15 May 2026 13:49:41 +0530 Subject: [PATCH 012/249] fix: incoming rate for legacy serial no --- erpnext/stock/deprecated_serial_batch.py | 11 ++++++++++- .../stock_reposting_settings.json | 17 +++++++++++++++-- .../stock_reposting_settings.py | 1 + 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/deprecated_serial_batch.py b/erpnext/stock/deprecated_serial_batch.py index 47767d7c713..50bcd8416a8 100644 --- a/erpnext/stock/deprecated_serial_batch.py +++ b/erpnext/stock/deprecated_serial_batch.py @@ -48,9 +48,18 @@ class DeprecatedSerialNoValuation: if not posting_datetime and self.sle.posting_date: posting_datetime = get_combine_datetime(self.sle.posting_date, self.sle.posting_time) + do_not_fetch_rate = frappe.db.get_single_value( + "Stock Reposting Settings", "do_not_fetch_incoming_rate_from_serial_no" + ) + for serial_no in serial_nos: sn_details = frappe.db.get_value("Serial No", serial_no, ["purchase_rate", "company"], as_dict=1) - if sn_details and sn_details.purchase_rate and sn_details.company == self.sle.company: + if ( + sn_details + and sn_details.purchase_rate + and sn_details.company == self.sle.company + and (not frappe.flags.through_repost_item_valuation or not do_not_fetch_rate) + ): self.serial_no_incoming_rate[serial_no] += flt(sn_details.purchase_rate) incoming_values += self.serial_no_incoming_rate[serial_no] continue diff --git a/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json b/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json index ccca2fc9819..ed48522d770 100644 --- a/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +++ b/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_bulk_edit": 1, "allow_rename": 1, "beta": 1, "creation": "2021-10-01 10:56:30.814787", @@ -13,6 +14,8 @@ "end_time", "limits_dont_apply_on", "item_based_reposting", + "column_break_mavd", + "do_not_fetch_incoming_rate_from_serial_no", "section_break_dxuf", "enable_parallel_reposting", "no_of_parallel_reposting", @@ -99,13 +102,23 @@ "fieldname": "enable_separate_reposting_for_gl", "fieldtype": "Check", "label": "Enable Separate Reposting for GL" + }, + { + "fieldname": "column_break_mavd", + "fieldtype": "Column Break" + }, + { + "default": "0", + "description": "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction", + "fieldname": "do_not_fetch_incoming_rate_from_serial_no", + "fieldtype": "Check", + "label": "Do not fetch incoming rate from Serial No" } ], - "hide_toolbar": 0, "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2026-03-16 13:28:20.978007", + "modified": "2026-05-15 12:59:34.392491", "modified_by": "Administrator", "module": "Stock", "name": "Stock Reposting Settings", diff --git a/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py b/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py index 40f9f1f6d69..8976d260ff9 100644 --- a/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py +++ b/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py @@ -16,6 +16,7 @@ class StockRepostingSettings(Document): if TYPE_CHECKING: from frappe.types import DF + do_not_fetch_incoming_rate_from_serial_no: DF.Check enable_parallel_reposting: DF.Check enable_separate_reposting_for_gl: DF.Check end_time: DF.Time | None From 4b1d369ac6123e025adb35f46eb851c7388f821a Mon Sep 17 00:00:00 2001 From: Dany Robert Date: Sat, 16 May 2026 11:48:18 +0530 Subject: [PATCH 013/249] fix(ppr): make default_advance_account optional --- .../process_payment_reconciliation.json | 4 ++-- .../process_payment_reconciliation.py | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json index 08c7d8247ac..fabb2e32164 100644 --- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json +++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json @@ -151,13 +151,13 @@ "label": "Default Advance Account", "mandatory_depends_on": "doc.party_type", "options": "Account", - "reqd": 1 + "reqd": 0 } ], "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2025-01-08 08:22:14.798085", + "modified": "2026-05-16 11:43:12.758685", "modified_by": "Administrator", "module": "Accounts", "name": "Process Payment Reconciliation", diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py index 4f6741f17cd..7023b64b35c 100644 --- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py +++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py @@ -218,10 +218,7 @@ def trigger_reconciliation_for_queued_docs(): fields = ["company", "party_type", "party", "receivable_payable_account", "default_advance_account"] def get_filters_as_tuple(fields, doc): - filters = () - for x in fields: - filters += tuple(doc.get(x)) - return filters + return tuple(doc.get(x) or "" for x in fields) for x in all_queued: doc = frappe.get_doc("Process Payment Reconciliation", x) From 30b9e113035824253d4eab199f0eea63612d9938 Mon Sep 17 00:00:00 2001 From: Dany Robert Date: Sat, 16 May 2026 12:09:59 +0530 Subject: [PATCH 014/249] fix: update default_advance_account type --- .../process_payment_reconciliation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py index 7023b64b35c..91eaf67d083 100644 --- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py +++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py @@ -23,7 +23,7 @@ class ProcessPaymentReconciliation(Document): bank_cash_account: DF.Link | None company: DF.Link cost_center: DF.Link | None - default_advance_account: DF.Link + default_advance_account: DF.Link | None error_log: DF.LongText | None from_invoice_date: DF.Date | None from_payment_date: DF.Date | None From 2ad9231fb200cb3e353ae0fa52096491d35389af Mon Sep 17 00:00:00 2001 From: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com> Date: Sun, 17 May 2026 12:13:13 +0530 Subject: [PATCH 015/249] fix(stock): apply posting datetime filters while fetching available batches (#54976) --- erpnext/controllers/queries.py | 15 +++++++++++++++ .../public/js/utils/serial_no_batch_selector.js | 2 ++ frappe-semgrep-rules | 1 + 3 files changed, 18 insertions(+) create mode 160000 frappe-semgrep-rules diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index 109f1bc9b64..5be68e60591 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -17,6 +17,7 @@ from pypika import Order import erpnext from erpnext.accounts.utils import build_qb_match_conditions from erpnext.stock.get_item_details import ItemDetailsCtx, _get_item_tax_template +from erpnext.stock.utils import get_combine_datetime # searches for active employees @@ -498,6 +499,13 @@ def get_batches_from_stock_ledger_entries(searchfields, txt, filters, start=0, p .limit(page_len) ) + if not filters.get("is_inward"): + if filters.get("posting_date") and filters.get("posting_time"): + query = query.where( + stock_ledger_entry.posting_datetime + <= get_combine_datetime(filters.posting_date, filters.posting_time) + ) + if not filters.get("include_expired_batches"): query = query.where((batch_table.expiry_date >= expiry_date) | (batch_table.expiry_date.isnull())) @@ -551,6 +559,13 @@ def get_batches_from_serial_and_batch_bundle(searchfields, txt, filters, start=0 .limit(page_len) ) + if not filters.get("is_inward"): + if filters.get("posting_date") and filters.get("posting_time"): + bundle_query = bundle_query.where( + stock_ledger_entry.posting_datetime + <= get_combine_datetime(filters.posting_date, filters.posting_time) + ) + if not filters.get("include_expired_batches"): bundle_query = bundle_query.where( (batch_table.expiry_date >= expiry_date) | (batch_table.expiry_date.isnull()) diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js index 34326ad16dc..fd1e0c4167f 100644 --- a/erpnext/public/js/utils/serial_no_batch_selector.js +++ b/erpnext/public/js/utils/serial_no_batch_selector.js @@ -484,6 +484,8 @@ erpnext.SerialBatchPackageSelector = class SerialNoBatchBundleUpdate { warehouse: this.item.s_warehouse || this.item.t_warehouse || this.item.warehouse, is_inward: is_inward, + posting_date: this.frm.doc.posting_date, + posting_time: this.frm.doc.posting_time, include_expired_batches: include_expired_batches, }, }; diff --git a/frappe-semgrep-rules b/frappe-semgrep-rules new file mode 160000 index 00000000000..a05bce32ad3 --- /dev/null +++ b/frappe-semgrep-rules @@ -0,0 +1 @@ +Subproject commit a05bce32ad3e37cf9a87a6913e9b08e45c8ba8cf From 78e3b549535f988ba1590e06bc2b688f54d32f4e Mon Sep 17 00:00:00 2001 From: MochaMind Date: Mon, 18 May 2026 01:15:21 +0530 Subject: [PATCH 016/249] chore: update POT file (#54991) --- erpnext/locale/main.pot | 1140 ++++++++++++++++++++------------------- 1 file changed, 592 insertions(+), 548 deletions(-) diff --git a/erpnext/locale/main.pot b/erpnext/locale/main.pot index 6c5939d0b14..b8e61b6b453 100644 --- a/erpnext/locale/main.pot +++ b/erpnext/locale/main.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ERPNext VERSION\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 10:00+0000\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-17 10:04+0000\n" "Last-Translator: hello@frappe.io\n" "Language-Team: hello@frappe.io\n" "MIME-Version: 1.0\n" @@ -94,15 +94,15 @@ msgstr "" msgid " Summary" msgstr "" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "" @@ -301,7 +301,7 @@ msgstr "" msgid "'From Date' must be after 'To Date'" msgstr "" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "" @@ -337,7 +337,7 @@ msgstr "" msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "" @@ -1042,7 +1042,7 @@ msgstr "" msgid "A logical Warehouse against which stock entries are made." msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1254,7 +1254,7 @@ msgstr "" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1924,8 +1924,8 @@ msgstr "" msgid "Accounting Entry for Asset" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1933,7 +1933,7 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "" @@ -1946,16 +1946,16 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "" @@ -2253,12 +2253,6 @@ msgstr "" msgid "Action If Quality Inspection Is Rejected" msgstr "" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "" @@ -2317,6 +2311,12 @@ msgstr "" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2584,7 +2584,7 @@ msgstr "" msgid "Actual qty in stock" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "" @@ -2598,7 +2598,7 @@ msgstr "" msgid "Add / Edit Prices" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "" @@ -2752,7 +2752,7 @@ msgstr "" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -2997,7 +2997,7 @@ msgstr "" msgid "Additional Discount Amount (Company Currency)" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -3283,7 +3283,7 @@ msgstr "" msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3396,7 +3396,7 @@ msgstr "" msgid "Advance amount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "" @@ -3465,7 +3465,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "" @@ -3583,7 +3583,7 @@ msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "" @@ -3607,7 +3607,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "" @@ -3888,7 +3888,7 @@ msgstr "" msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "" @@ -3896,7 +3896,7 @@ msgstr "" msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "" @@ -3945,7 +3945,7 @@ msgstr "" msgid "Allocate Advances Automatically (FIFO)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "" @@ -3955,7 +3955,7 @@ msgstr "" msgid "Allocate Payment Based On Payment Terms" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "" @@ -3985,7 +3985,7 @@ msgstr "" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4106,15 +4106,15 @@ msgstr "" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4143,12 +4143,6 @@ msgstr "" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4361,8 +4355,11 @@ msgstr "" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4454,7 +4451,7 @@ msgstr "" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4651,7 +4648,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4681,7 +4678,6 @@ msgstr "" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4851,10 +4847,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5474,7 +5466,7 @@ msgstr "" msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "" -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "" @@ -5624,7 +5616,7 @@ msgstr "" msgid "Asset Category Name" msgstr "" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "" @@ -6020,7 +6012,7 @@ msgstr "" msgid "Asset {0} must be submitted" msgstr "" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6058,11 +6050,11 @@ msgstr "" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "" -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "" @@ -6135,7 +6127,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "" @@ -6167,7 +6159,7 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "" @@ -6231,7 +6223,11 @@ msgstr "" msgid "Attribute Value" msgstr "" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "" @@ -6239,11 +6235,19 @@ msgstr "" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "" @@ -6303,24 +6307,12 @@ msgstr "" msgid "Auto Create Exchange Rate Revaluation" msgstr "" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6439,6 +6431,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6656,7 +6660,7 @@ msgstr "" msgid "Available for use date is required" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "" @@ -6755,7 +6759,7 @@ msgstr "" msgid "BIN Qty" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7028,7 +7032,7 @@ msgstr "" msgid "BOM Website Operation" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7119,7 +7123,7 @@ msgstr "" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" +msgid "Backflush raw materials of subcontract based on" msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' @@ -7140,7 +7144,7 @@ msgstr "" msgid "Balance (Dr - Cr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "" @@ -7671,11 +7675,11 @@ msgstr "" msgid "Barcode Type" msgstr "" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "" @@ -8042,12 +8046,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -8120,7 +8124,7 @@ msgstr "" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" +msgid "Bill for rejected quantity in Purchase Invoice" msgstr "" #. Label of a Card Break in the Manufacturing Workspace @@ -8461,8 +8465,11 @@ msgstr "" msgid "Blanket Order Rate" msgstr "" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -8977,7 +8984,7 @@ msgstr "" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a Naming Series choose the 'Naming Series' option." msgstr "" @@ -9342,7 +9349,7 @@ msgstr "" msgid "Can only make payment against unbilled {0}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9398,9 +9405,9 @@ msgstr "" msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "" @@ -9428,7 +9435,7 @@ msgstr "" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "" @@ -9464,7 +9471,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9472,7 +9479,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "" -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "" @@ -9484,7 +9491,7 @@ msgstr "" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "" @@ -9512,11 +9519,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9542,7 +9549,7 @@ msgstr "" msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -9579,7 +9586,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9587,8 +9594,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "" @@ -9632,7 +9639,7 @@ msgstr "" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9650,8 +9657,8 @@ msgstr "" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9667,7 +9674,7 @@ msgstr "" msgid "Cannot set authorization on basis of Discount for {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "" @@ -10578,7 +10585,7 @@ msgstr "" msgid "Closing (Dr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "" @@ -11039,7 +11046,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11321,7 +11328,7 @@ msgstr "" msgid "Company Abbreviation" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11334,7 +11341,7 @@ msgstr "" msgid "Company Account" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "" @@ -11510,7 +11517,7 @@ msgstr "" msgid "Company is mandatory" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "" @@ -11781,7 +11788,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11794,7 +11801,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11812,13 +11821,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "" @@ -11996,7 +12005,7 @@ msgstr "" msgid "Consumed" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "" @@ -12040,7 +12049,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12213,10 +12222,6 @@ msgstr "" msgid "Contact:" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "" - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12394,7 +12399,7 @@ msgstr "" msgid "Conversion Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "" @@ -12666,7 +12671,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12761,7 +12766,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "" @@ -13099,7 +13104,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "" @@ -13472,7 +13477,7 @@ msgstr "" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "" @@ -13615,15 +13620,15 @@ msgstr "" msgid "Credit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "" @@ -13818,7 +13823,7 @@ msgstr "" msgid "Creditors" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14116,7 +14121,7 @@ msgstr "" msgid "Current Serial No" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14317,7 +14322,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15090,7 +15095,7 @@ msgstr "" msgid "Day Of Week" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15206,11 +15211,11 @@ msgstr "" msgid "Debit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "" @@ -15220,7 +15225,7 @@ msgstr "" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "" @@ -15331,7 +15336,7 @@ msgstr "" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15473,7 +15478,7 @@ msgstr "" msgid "Default BOM" msgstr "" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "" @@ -15830,15 +15835,15 @@ msgstr "" msgid "Default Unit of Measure" msgstr "" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "" -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "" @@ -16139,7 +16144,7 @@ msgstr "" msgid "Delivered" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "" @@ -16189,8 +16194,8 @@ msgstr "" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16201,11 +16206,11 @@ msgstr "" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16294,7 +16299,7 @@ msgstr "" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16819,7 +16824,7 @@ msgstr "" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "" @@ -16983,10 +16988,8 @@ msgstr "" msgid "Disable In Words" msgstr "" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' @@ -17028,6 +17031,12 @@ msgstr "" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17084,7 +17093,7 @@ msgstr "" msgid "Disassemble Order" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17609,6 +17618,12 @@ msgstr "" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17699,9 +17714,12 @@ msgstr "" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17719,6 +17737,10 @@ msgstr "" msgid "Document Type already used as a dimension" msgstr "" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18023,7 +18045,7 @@ msgstr "" msgid "Duplicate Sales Invoices found" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18143,8 +18165,8 @@ msgstr "" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18367,7 +18389,7 @@ msgstr "" msgid "Email Sent to Supplier {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18557,7 +18579,7 @@ msgstr "" msgid "Employee cannot report to himself." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18565,7 +18587,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18578,7 +18600,7 @@ msgstr "" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18621,7 +18643,7 @@ msgstr "" msgid "Enable Auto Email" msgstr "" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "" @@ -19223,7 +19245,7 @@ msgid "" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "" @@ -19269,7 +19291,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "" @@ -19299,7 +19321,7 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19658,7 +19680,7 @@ msgstr "" msgid "Expense" msgstr "" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "" @@ -19706,7 +19728,7 @@ msgstr "" msgid "Expense Account" msgstr "" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "" @@ -20169,7 +20191,7 @@ msgstr "" msgid "Filter by Reference Date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20499,7 +20521,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20594,7 +20616,7 @@ msgstr "" msgid "Fiscal Year" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20658,7 +20680,7 @@ msgstr "" msgid "Fixed Asset Defaults" msgstr "" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "" @@ -20808,7 +20830,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20839,7 +20861,7 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "" @@ -20923,6 +20945,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20944,7 +20972,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -20953,7 +20981,7 @@ msgstr "" msgid "For reference" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" @@ -20977,7 +21005,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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -20986,7 +21014,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -21599,7 +21627,7 @@ msgstr "" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21611,7 +21639,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "" @@ -22126,7 +22154,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -22309,7 +22337,7 @@ msgstr "" msgid "Grant Commission" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "" @@ -22950,10 +22978,10 @@ msgstr "" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23109,7 +23137,7 @@ msgstr "" msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23294,7 +23322,7 @@ msgstr "" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23466,11 +23494,11 @@ msgstr "" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "" @@ -23586,7 +23614,7 @@ msgstr "" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23638,7 +23666,7 @@ msgstr "" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "" @@ -23681,7 +23709,7 @@ msgstr "" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23695,6 +23723,7 @@ msgid "Implementation Partner" msgstr "" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24048,7 +24077,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24302,7 +24331,7 @@ msgstr "" msgid "Incorrect Batch Consumed" msgstr "" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" @@ -24310,7 +24339,7 @@ msgstr "" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "" @@ -24520,14 +24549,14 @@ msgstr "" msgid "Inspected By" msgstr "" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "" @@ -24544,7 +24573,7 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "" @@ -24626,8 +24655,8 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "" @@ -24847,7 +24876,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -24940,7 +24969,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -24970,7 +24999,7 @@ msgstr "" msgid "Invalid Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "" @@ -25056,12 +25085,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25098,7 +25127,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "" @@ -25227,7 +25256,6 @@ msgstr "" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "" @@ -25248,10 +25276,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25773,12 +25797,12 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' @@ -26051,7 +26075,7 @@ msgstr "" msgid "Issuing Date" msgstr "" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" @@ -26121,7 +26145,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26168,6 +26192,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26183,7 +26208,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26947,6 +26971,7 @@ msgstr "" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26957,7 +26982,6 @@ msgstr "" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27217,11 +27241,11 @@ msgstr "" msgid "Item Variant {0} already exists with same attributes" msgstr "" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "" @@ -27260,6 +27284,15 @@ msgstr "" msgid "Item Weight Details" msgstr "" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27289,7 +27322,7 @@ msgstr "" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27309,11 +27342,11 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "" @@ -27343,7 +27376,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27362,10 +27395,14 @@ msgstr "" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27379,7 +27416,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "" @@ -27387,7 +27424,7 @@ msgstr "" msgid "Item {0} does not exist in the system or has expired" msgstr "" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "" @@ -27403,15 +27440,15 @@ msgstr "" msgid "Item {0} has been disabled" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "" @@ -27423,19 +27460,23 @@ msgstr "" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "" @@ -27443,7 +27484,11 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -27459,7 +27504,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27475,7 +27520,7 @@ msgstr "" msgid "Item {0}: {1} qty produced. " msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "" @@ -27585,7 +27630,7 @@ msgstr "" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -28218,7 +28263,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28497,7 +28542,7 @@ msgstr "" msgid "Length (cm)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "" @@ -28638,7 +28683,7 @@ msgstr "" msgid "Linked Location" msgstr "" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "" @@ -29033,11 +29078,6 @@ msgstr "" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29049,6 +29089,11 @@ msgstr "" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29245,7 +29290,7 @@ msgid "Major/Optional Subjects" msgstr "" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29414,8 +29459,8 @@ msgstr "" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29474,8 +29519,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29624,7 +29669,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "" @@ -29900,7 +29945,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -29971,6 +30016,7 @@ msgstr "" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30077,11 +30123,11 @@ msgstr "" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "" @@ -30196,7 +30242,7 @@ msgstr "" msgid "Material Transferred for Manufacturing" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30325,11 +30371,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -30775,11 +30821,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "" @@ -30817,7 +30863,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "" @@ -30825,11 +30871,11 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30873,10 +30919,6 @@ msgstr "" msgid "Mixed Conditions" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "" - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31145,7 +31187,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:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31224,27 +31266,20 @@ msgstr "" msgid "Naming Series Prefix" msgstr "" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31292,16 +31327,16 @@ msgstr "" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "" @@ -31915,7 +31950,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "" @@ -31928,7 +31963,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "" @@ -31973,7 +32008,7 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "" @@ -31986,7 +32021,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "" @@ -31998,7 +32033,7 @@ msgstr "" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -32006,7 +32041,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32100,7 +32135,7 @@ msgstr "" msgid "No more children on Right" msgstr "" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32275,7 +32310,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32367,7 +32402,7 @@ msgstr "" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "" @@ -32471,7 +32506,7 @@ msgstr "" msgid "Not authorized to edit frozen Account {0}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32517,7 +32552,7 @@ msgstr "" msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "" -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -32994,7 +33029,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33146,7 +33181,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "" @@ -33305,16 +33340,16 @@ msgstr "" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33671,7 +33706,7 @@ msgstr "" msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33805,7 +33840,7 @@ msgstr "" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "" @@ -34013,7 +34048,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34071,7 +34106,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34089,7 +34124,7 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "" @@ -34332,7 +34367,6 @@ msgstr "" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "" @@ -34603,7 +34637,7 @@ msgstr "" msgid "Packed Items" msgstr "" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -35051,7 +35085,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35187,7 +35221,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35313,7 +35347,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35399,7 +35433,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35702,7 +35736,6 @@ msgstr "" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35960,7 +35993,7 @@ msgstr "" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36039,10 +36072,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37063,7 +37092,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "" @@ -37095,11 +37124,11 @@ msgstr "" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "" @@ -37119,7 +37148,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -37226,7 +37255,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "" @@ -37295,11 +37324,11 @@ msgstr "" msgid "Please enter Approving Role or Approving User" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "" @@ -37311,7 +37340,7 @@ msgstr "" msgid "Please enter Employee Id of this sales person" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "" @@ -37356,7 +37385,7 @@ msgstr "" msgid "Please enter Root Type for account- {0}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "" @@ -37433,7 +37462,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37547,12 +37576,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "" @@ -37568,13 +37597,13 @@ msgstr "" msgid "Please select Category first" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "" @@ -37583,7 +37612,7 @@ msgstr "" msgid "Please select Company and Posting Date to getting entries" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "" @@ -37632,7 +37661,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "" @@ -37640,11 +37669,11 @@ msgstr "" msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "" @@ -37697,7 +37726,7 @@ msgstr "" msgid "Please select a Supplier" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "" @@ -37758,7 +37787,7 @@ msgstr "" msgid "Please select a supplier for fetching payments." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37778,7 +37807,7 @@ msgstr "" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37885,7 +37914,7 @@ msgstr "" msgid "Please select weekly off day" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "" @@ -38025,7 +38054,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -38069,7 +38098,7 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" @@ -38188,7 +38217,7 @@ msgstr "" msgid "Please specify at least one attribute in the Attributes table" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "" @@ -38359,7 +38388,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38384,7 +38413,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38499,7 +38528,7 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "" @@ -38678,6 +38707,12 @@ msgstr "" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -38971,7 +39006,9 @@ msgstr "" msgid "Price per Unit (Stock UOM)" msgstr "" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40326,6 +40363,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40362,6 +40400,12 @@ msgstr "" msgid "Purchase Invoice Item" msgstr "" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40413,6 +40457,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40422,7 +40467,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40539,7 +40584,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "" @@ -40602,6 +40647,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40616,7 +40662,7 @@ msgstr "" msgid "Purchase Receipt" msgstr "" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40882,7 +40928,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41470,7 +41515,7 @@ msgstr "" msgid "Quality Review Objective" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41531,7 +41576,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41725,7 +41770,7 @@ msgstr "" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "" @@ -41780,7 +41825,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41943,7 +41988,6 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42353,8 +42397,8 @@ msgstr "" msgid "Raw SQL" msgstr "" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42762,11 +42806,10 @@ msgstr "" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43290,7 +43333,7 @@ msgstr "" msgid "Rejected Warehouse" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "" @@ -43340,7 +43383,7 @@ msgid "Remaining Balance" msgstr "" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43394,7 +43437,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43433,7 +43476,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "" @@ -43838,6 +43881,7 @@ msgstr "" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44111,7 +44155,7 @@ msgstr "" msgid "Reserved" msgstr "" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44724,7 +44768,7 @@ msgstr "" msgid "Reversal Of" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "" @@ -44873,10 +44917,7 @@ msgstr "" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "" @@ -44891,8 +44932,11 @@ msgstr "" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45093,8 +45137,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -45121,11 +45165,11 @@ msgstr "" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45151,7 +45195,7 @@ msgstr "" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "" @@ -45352,7 +45396,7 @@ msgstr "" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -45412,7 +45456,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45440,7 +45484,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "" @@ -45493,7 +45537,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "" @@ -45518,7 +45562,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "" @@ -45544,15 +45588,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45583,11 +45627,11 @@ msgstr "" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "" @@ -45631,7 +45675,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "" @@ -45679,11 +45723,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45736,11 +45780,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "" -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "" @@ -45768,7 +45812,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "" @@ -45804,23 +45848,23 @@ msgstr "" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45828,7 +45872,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45893,7 +45937,7 @@ msgstr "" msgid "Row #{}: {} {} does not exist." msgstr "" -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" @@ -45909,7 +45953,7 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -45941,7 +45985,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:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -46000,7 +46044,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "" @@ -46041,7 +46085,7 @@ msgstr "" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -46165,7 +46209,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "" @@ -46177,11 +46221,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:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -46205,7 +46249,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:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46258,7 +46302,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:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -46288,7 +46332,7 @@ msgstr "" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" @@ -46354,7 +46398,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46651,7 +46695,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46825,7 +46869,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46948,8 +46992,8 @@ msgstr "" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47360,7 +47404,7 @@ msgstr "" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "" @@ -47397,7 +47441,7 @@ msgstr "" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -47687,7 +47731,7 @@ msgstr "" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47832,7 +47876,7 @@ msgstr "" msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "" @@ -48528,7 +48572,7 @@ msgstr "" msgid "Serial No Reserved" msgstr "" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48589,7 +48633,7 @@ msgstr "" msgid "Serial No is mandatory for Item {0}" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "" @@ -48875,7 +48919,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48901,7 +48945,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49299,12 +49343,6 @@ msgstr "" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "" @@ -49410,6 +49448,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "" @@ -49908,7 +49952,7 @@ msgstr "" msgid "Show Barcode Field in Stock Transactions" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "" @@ -49916,7 +49960,7 @@ msgstr "" msgid "Show Completed" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -49999,7 +50043,7 @@ msgstr "" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "" @@ -50011,7 +50055,7 @@ msgstr "" msgid "Show Open" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "" @@ -50024,11 +50068,6 @@ msgstr "" msgid "Show Operations" msgstr "" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "" @@ -50044,7 +50083,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "" @@ -50111,6 +50150,11 @@ msgstr "" msgid "Show only the Immediate Upcoming Term" msgstr "" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "" @@ -50398,11 +50442,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50468,7 +50512,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "" @@ -50482,8 +50526,8 @@ msgid "Source of Funds (Liabilities)" msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "" @@ -50648,8 +50692,8 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "" @@ -50982,7 +51026,7 @@ msgstr "" msgid "Stock Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -51253,7 +51297,7 @@ msgstr "" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51265,7 +51309,7 @@ msgstr "" msgid "Stock Reconciliation Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "" @@ -51303,7 +51347,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51331,7 +51375,7 @@ msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "" @@ -51713,7 +51757,7 @@ msgstr "" #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "" @@ -51791,10 +51835,6 @@ msgstr "" msgid "Sub Procedure" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -52011,7 +52051,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52037,7 +52077,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "" @@ -52126,7 +52166,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "" @@ -52301,7 +52341,7 @@ msgstr "" msgid "Successfully Set Supplier" msgstr "" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "" @@ -52457,6 +52497,7 @@ msgstr "" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52498,8 +52539,8 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52547,6 +52588,12 @@ msgstr "" msgid "Supplier Contact" msgstr "" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52641,7 +52688,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "" @@ -52921,19 +52968,10 @@ msgstr "" msgid "Supplier {0} not found in {1}" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -52995,7 +53033,7 @@ msgstr "" msgid "Support Tickets" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53255,8 +53293,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "" @@ -53725,7 +53763,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "" @@ -53886,7 +53924,7 @@ msgstr "" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "" @@ -54076,7 +54114,6 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54268,7 +54305,7 @@ msgstr "" msgid "The BOM which will be replaced" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54312,7 +54349,7 @@ msgstr "" msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54328,7 +54365,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "" @@ -54364,7 +54401,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54470,7 +54507,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "" @@ -54515,15 +54552,15 @@ msgstr "" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54679,7 +54716,7 @@ msgstr "" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "" @@ -54701,11 +54738,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -54777,7 +54814,7 @@ msgstr "" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54830,7 +54867,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54874,7 +54911,7 @@ msgstr "" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54930,11 +54967,11 @@ msgstr "" msgid "This Month's Summary" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55735,7 +55772,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "" @@ -55770,7 +55807,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "" @@ -55921,7 +55958,7 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "" @@ -56344,7 +56381,7 @@ msgstr "" msgid "Total Payments" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56376,7 +56413,7 @@ msgstr "" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "" @@ -56762,7 +56799,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56773,7 +56810,7 @@ msgstr "" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "" @@ -57445,11 +57482,11 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57521,7 +57558,7 @@ msgstr "" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57597,7 +57634,7 @@ msgstr "" msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "" @@ -57716,7 +57753,7 @@ msgstr "" msgid "Unit of Measure (UOM)" msgstr "" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "" @@ -57836,10 +57873,9 @@ msgid "Unreconcile Transaction" msgstr "" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "" @@ -57862,10 +57898,6 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57911,7 +57943,7 @@ msgstr "" msgid "Unsecured Loans" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58126,12 +58158,6 @@ msgstr "" msgid "Update Type" msgstr "" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58172,7 +58198,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "" @@ -58630,12 +58656,6 @@ msgstr "" msgid "Validate Components and Quantities Per BOM" msgstr "" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58659,6 +58679,12 @@ msgstr "" msgid "Validate Stock on Save" msgstr "" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58765,11 +58791,11 @@ msgstr "" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "" -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "" @@ -58779,7 +58805,7 @@ msgstr "" msgid "Valuation and Total" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "" @@ -58929,7 +58955,7 @@ msgstr "" msgid "Variant" msgstr "" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "" @@ -58948,7 +58974,7 @@ msgstr "" msgid "Variant Based On" msgstr "" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "" @@ -58966,7 +58992,7 @@ msgstr "" msgid "Variant Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "" @@ -59347,7 +59373,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59387,7 +59413,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "" @@ -59419,7 +59445,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59654,7 +59680,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "" @@ -59701,7 +59727,7 @@ msgstr "" #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59757,6 +59783,12 @@ msgstr "" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" @@ -59940,7 +59972,7 @@ msgstr "" msgid "Website:" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60314,7 +60346,7 @@ msgstr "" msgid "Work Order Item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60376,11 +60408,11 @@ msgstr "" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "" @@ -60696,11 +60728,11 @@ msgstr "" msgid "Year Start Date" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60753,7 +60785,7 @@ msgstr "" msgid "You can also set default CWIP account in Company {}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60907,6 +60939,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60935,7 +60971,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60943,7 +60979,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "" @@ -61014,8 +61050,11 @@ msgstr "" msgid "Zero quantity" msgstr "" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61127,7 +61166,7 @@ msgstr "" msgid "fieldname" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61345,6 +61384,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "" @@ -61403,7 +61446,8 @@ msgstr "" msgid "{0} Digest" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61423,7 +61467,7 @@ msgstr "" msgid "{0} Request for {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "" @@ -61536,7 +61580,7 @@ msgid "{0} entered twice in Item Tax" msgstr "" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "" @@ -61704,7 +61748,7 @@ msgstr "" msgid "{0} payment entries can not be filtered by {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61717,7 +61761,7 @@ msgstr "" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" @@ -61919,7 +61963,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -62005,23 +62049,23 @@ msgstr "" msgid "{0}: {1} is a group account." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "" -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" From e13bd9eaa6cf5bbd07068162e289586982652883 Mon Sep 17 00:00:00 2001 From: sokumon Date: Mon, 18 May 2026 10:09:28 +0530 Subject: [PATCH 017/249] fix: remove parent page --- .../workspace/financial_reports/financial_reports.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/workspace/financial_reports/financial_reports.json b/erpnext/accounts/workspace/financial_reports/financial_reports.json index 3211845f5ea..5ce20bed642 100644 --- a/erpnext/accounts/workspace/financial_reports/financial_reports.json +++ b/erpnext/accounts/workspace/financial_reports/financial_reports.json @@ -14,7 +14,7 @@ "for_user": "", "hide_custom": 0, "icon": "table", - "idx": 0, + "idx": 1, "indicator_color": "", "is_hidden": 0, "label": "Financial Reports", @@ -266,13 +266,13 @@ "type": "Link" } ], - "modified": "2025-12-24 12:49:25.266357", + "modified": "2026-05-18 09:49:45.138296", "modified_by": "Administrator", "module": "Accounts", "name": "Financial Reports", "number_cards": [], "owner": "Administrator", - "parent_page": "Accounting", + "parent_page": "", "public": 1, "quick_lists": [], "restrict_to_domain": "", From ae9c632e3941149ca1aaa7132471359ee2403a56 Mon Sep 17 00:00:00 2001 From: Nishka Gosalia <58264710+nishkagosalia@users.noreply.github.com> Date: Mon, 18 May 2026 11:40:40 +0530 Subject: [PATCH 018/249] fix: toast message for item price insert (#55009) --- erpnext/stock/get_item_details.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index ed17078e750..69553153efa 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -1133,7 +1133,7 @@ def insert_item_price(ctx: ItemDetailsCtx): ) item_price.insert() frappe.msgprint( - _("Item Price Added for {0} in Price List {1}").format( + _("Item Price added for {0} in Price List - {1}").format( get_link_to_form("Item", ctx.item_code), ctx.price_list ), alert=True, @@ -1157,9 +1157,10 @@ def insert_item_price(ctx: ItemDetailsCtx): ) item_price.insert() frappe.msgprint( - _("Item Price added for {0} in Price List {1}").format( + _("Item Price added for {0} in Price List - {1}").format( get_link_to_form("Item", ctx.item_code), ctx.price_list - ) + ), + alert=True, ) From 63a7142b9b9ffaa3c469ff324f0cc0a53a92fcd4 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 18 May 2026 10:26:29 +0530 Subject: [PATCH 019/249] fix: remove sql procedure method from AR report --- .../accounts_settings/accounts_settings.js | 10 - .../accounts_settings/accounts_settings.json | 12 +- .../accounts_settings/accounts_settings.py | 9 +- .../accounts_receivable.py | 194 ------------------ erpnext/patches.txt | 3 +- ...clear_procedures_from_receivable_report.py | 12 ++ 6 files changed, 17 insertions(+), 223 deletions(-) create mode 100644 erpnext/patches/v16_0/clear_procedures_from_receivable_report.py diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.js b/erpnext/accounts/doctype/accounts_settings/accounts_settings.js index 2fda643640b..586db2d1566 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.js +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.js @@ -38,16 +38,6 @@ frappe.ui.form.on("Accounts Settings", { add_taxes_from_item_tax_template(frm) { toggle_tax_settings(frm, "add_taxes_from_item_tax_template"); }, - - drop_ar_procedures: function (frm) { - frm.call({ - doc: frm.doc, - method: "drop_ar_sql_procedures", - callback: function (r) { - frappe.show_alert(__("Procedures dropped"), 5); - }, - }); - }, }); function toggle_tax_settings(frm, field_name) { diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json index 322efd2b163..dab1c0c5d51 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -97,7 +97,6 @@ "receivable_payable_fetch_method", "default_ageing_range", "column_break_ntmi", - "drop_ar_procedures", "legacy_section", "ignore_is_opening_check_for_reporting", "tab_break_dpet", @@ -526,7 +525,7 @@ "fieldname": "receivable_payable_fetch_method", "fieldtype": "Select", "label": "Data Fetch Method", - "options": "Buffered Cursor\nUnBuffered Cursor\nRaw SQL" + "options": "Buffered Cursor\nUnBuffered Cursor" }, { "fieldname": "accounts_receivable_payable_tuning_section", @@ -595,13 +594,6 @@ "fieldname": "column_break_ntmi", "fieldtype": "Column Break" }, - { - "depends_on": "eval:doc.receivable_payable_fetch_method == \"Raw SQL\"", - "description": "Drops existing SQL Procedures and Function setup by Accounts Receivable report", - "fieldname": "drop_ar_procedures", - "fieldtype": "Button", - "label": "Drop Procedures" - }, { "default": "0", "fieldname": "fetch_valuation_rate_for_internal_transaction", @@ -749,7 +741,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2026-04-22 01:38:42.418238", + "modified": "2026-05-18 12:16:33.679345", "modified_by": "Administrator", "module": "Accounts", "name": "Accounts Settings", diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py index 0926934e32a..d408d1987e7 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py @@ -91,7 +91,7 @@ class AccountsSettings(Document): merge_similar_account_heads: DF.Check over_billing_allowance: DF.Currency preview_mode: DF.Check - receivable_payable_fetch_method: DF.Literal["Buffered Cursor", "UnBuffered Cursor", "Raw SQL"] + receivable_payable_fetch_method: DF.Literal["Buffered Cursor", "UnBuffered Cursor"] receivable_payable_remarks_length: DF.Int reconciliation_queue_size: DF.Int repost_allowed_types: DF.Table[RepostAllowedTypes] @@ -212,13 +212,6 @@ class AccountsSettings(Document): set_allow_on_submit_for_dimension_fields(doctypes) - @frappe.whitelist() - def drop_ar_sql_procedures(self): - from erpnext.accounts.report.accounts_receivable.accounts_receivable import InitSQLProceduresForAR - - frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.init_procedure_name}") - frappe.db.sql(f"drop procedure if exists {InitSQLProceduresForAR.allocate_procedure_name}") - def toggle_accounting_dimension_sections(hide): accounting_dimension_doctypes = frappe.get_hooks("accounting_dimension_doctypes") diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py index 4245cbdddfa..def03c4a492 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py @@ -131,8 +131,6 @@ class ReceivablePayableReport: self.fetch_ple_in_buffered_cursor() elif self.ple_fetch_method == "UnBuffered Cursor": self.fetch_ple_in_unbuffered_cursor() - elif self.ple_fetch_method == "Raw SQL": - self.fetch_ple_in_sql_procedures() # Build delivery note map against all sales invoices self.build_delivery_note_map() @@ -323,81 +321,6 @@ class ReceivablePayableReport: row.paid -= amount row.paid_in_account_currency -= amount_in_account_currency - def fetch_ple_in_sql_procedures(self): - self.proc = InitSQLProceduresForAR() - - build_balance = f""" - begin not atomic - declare done boolean default false; - declare rec1 row type of `{self.proc._row_def_table_name}`; - declare ple cursor for {self.ple_query.get_sql()}; - declare continue handler for not found set done = true; - - open ple; - fetch ple into rec1; - while not done do - call {self.proc.init_procedure_name}(rec1); - fetch ple into rec1; - end while; - close ple; - - set done = false; - open ple; - fetch ple into rec1; - while not done do - call {self.proc.allocate_procedure_name}(rec1); - fetch ple into rec1; - end while; - close ple; - end; - """ - frappe.db.sql(build_balance) - - balances = frappe.db.sql( - f"""select - name, - voucher_type, - voucher_no, - party, - party_account `account`, - posting_date, - account_currency, - cost_center, - project, - sum(invoiced) `invoiced`, - sum(paid) `paid`, - sum(credit_note) `credit_note`, - sum(invoiced) - sum(paid) - sum(credit_note) `outstanding`, - sum(invoiced_in_account_currency) `invoiced_in_account_currency`, - sum(paid_in_account_currency) `paid_in_account_currency`, - sum(credit_note_in_account_currency) `credit_note_in_account_currency`, - sum(invoiced_in_account_currency) - sum(paid_in_account_currency) - sum(credit_note_in_account_currency) `outstanding_in_account_currency` - from `{self.proc._voucher_balance_name}` group by name order by posting_date;""", - as_dict=True, - ) - for x in balances: - if self.filters.get("ignore_accounts"): - key = (x.voucher_type, x.voucher_no, x.party) - else: - key = (x.account, x.voucher_type, x.voucher_no, x.party) - - _d = self.build_voucher_dict(x) - for field in [ - "invoiced", - "paid", - "credit_note", - "outstanding", - "invoiced_in_account_currency", - "paid_in_account_currency", - "credit_note_in_account_currency", - "outstanding_in_account_currency", - "cost_center", - "project", - ]: - _d[field] = x.get(field) - - self.voucher_balance[key] = _d - def update_sub_total_row(self, row, party): total_row = self.total_row_map.get(party) @@ -1410,120 +1333,3 @@ def get_party_group_with_children(party, party_groups): frappe.throw(_("{0}: {1} does not exist").format(group_dtype, d)) return list(set(all_party_groups)) - - -class InitSQLProceduresForAR: - """ - Initialize SQL Procedures, Functions and Temporary tables to build Receivable / Payable report - """ - - _varchar_type = get_definition("Data") - _currency_type = get_definition("Currency") - # Temporary Tables - _voucher_balance_name = "_ar_voucher_balance" - _voucher_balance_definition = f""" - create temporary table `{_voucher_balance_name}`( - name {_varchar_type}, - voucher_type {_varchar_type}, - voucher_no {_varchar_type}, - party {_varchar_type}, - party_account {_varchar_type}, - posting_date date, - account_currency {_varchar_type}, - cost_center {_varchar_type}, - project {_varchar_type}, - invoiced {_currency_type}, - paid {_currency_type}, - credit_note {_currency_type}, - invoiced_in_account_currency {_currency_type}, - paid_in_account_currency {_currency_type}, - credit_note_in_account_currency {_currency_type}) engine=memory; - """ - - _row_def_table_name = "_ar_ple_row" - _row_def_table_definition = f""" - create temporary table `{_row_def_table_name}`( - name {_varchar_type}, - account {_varchar_type}, - voucher_type {_varchar_type}, - voucher_no {_varchar_type}, - against_voucher_type {_varchar_type}, - against_voucher_no {_varchar_type}, - party_type {_varchar_type}, - cost_center {_varchar_type}, - project {_varchar_type}, - party {_varchar_type}, - posting_date date, - due_date date, - account_currency {_varchar_type}, - amount {_currency_type}, - amount_in_account_currency {_currency_type}) engine=memory; - """ - - # Procedures - init_procedure_name = "ar_init_tmp_table" - init_procedure_sql = f""" - create procedure ar_init_tmp_table(in ple row type of `{_row_def_table_name}`) - begin - if not exists (select name from `{_voucher_balance_name}` where name = sha1(concat_ws(',', ple.account, ple.against_voucher_type, ple.against_voucher_no, ple.party))) - then - insert into `{_voucher_balance_name}` values (sha1(concat_ws(',', ple.account, ple.against_voucher_type, ple.against_voucher_no, ple.party)), ple.voucher_type, ple.voucher_no, ple.party, ple.account, ple.posting_date, ple.account_currency, ple.cost_center, ple.project, 0, 0, 0, 0, 0, 0); - end if; - end; - """ - - allocate_procedure_name = "ar_allocate_to_tmp_table" - allocate_procedure_sql = f""" - create procedure ar_allocate_to_tmp_table(in ple row type of `{_row_def_table_name}`) - begin - declare invoiced {_currency_type} default 0; - declare invoiced_in_account_currency {_currency_type} default 0; - declare paid {_currency_type} default 0; - declare paid_in_account_currency {_currency_type} default 0; - declare credit_note {_currency_type} default 0; - declare credit_note_in_account_currency {_currency_type} default 0; - - - if ple.amount > 0 then - if (ple.voucher_type in ("Journal Entry", "Payment Entry") and (ple.voucher_no != ple.against_voucher_no)) then - set paid = -1 * ple.amount; - set paid_in_account_currency = -1 * ple.amount_in_account_currency; - else - set invoiced = ple.amount; - set invoiced_in_account_currency = ple.amount_in_account_currency; - end if; - else - - if ple.voucher_type in ("Sales Invoice", "Purchase Invoice") then - if (ple.voucher_no = ple.against_voucher_no) then - set paid = -1 * ple.amount; - set paid_in_account_currency = -1 * ple.amount_in_account_currency; - else - set credit_note = -1 * ple.amount; - set credit_note_in_account_currency = -1 * ple.amount_in_account_currency; - end if; - else - set paid = -1 * ple.amount; - set paid_in_account_currency = -1 * ple.amount_in_account_currency; - end if; - - end if; - - insert into `{_voucher_balance_name}` values (sha1(concat_ws(',', ple.account, ple.voucher_type, ple.voucher_no, ple.party)), ple.against_voucher_type, ple.against_voucher_no, ple.party, ple.account, ple.posting_date, ple.account_currency,'', '', invoiced, paid, 0, invoiced_in_account_currency, paid_in_account_currency, 0); - end; - """ - - def __init__(self): - existing_procedures = frappe.db.get_routines() - - if self.init_procedure_name not in existing_procedures: - frappe.db.sql(self.init_procedure_sql) - - if self.allocate_procedure_name not in existing_procedures: - frappe.db.sql(self.allocate_procedure_sql) - - frappe.db.sql(f"drop table if exists `{self._voucher_balance_name}`") - frappe.db.sql(self._voucher_balance_definition) - - frappe.db.sql(f"drop table if exists `{self._row_def_table_name}`") - frappe.db.sql(self._row_def_table_definition) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 918d4a1b054..805876f2ccc 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -480,4 +480,5 @@ erpnext.patches.v16_0.merge_repost_settings_to_accounts_settings erpnext.patches.v16_0.set_root_type_in_account_categories erpnext.patches.v16_0.scr_inv_dimension erpnext.patches.v16_0.packed_item_inv_dimen -erpnext.patches.v16_0.set_not_applicable_on_german_item_tax_templates \ No newline at end of file +erpnext.patches.v16_0.set_not_applicable_on_german_item_tax_templates +erpnext.patches.v16_0.clear_procedures_from_receivable_report diff --git a/erpnext/patches/v16_0/clear_procedures_from_receivable_report.py b/erpnext/patches/v16_0/clear_procedures_from_receivable_report.py new file mode 100644 index 00000000000..5eaf0f14fc8 --- /dev/null +++ b/erpnext/patches/v16_0/clear_procedures_from_receivable_report.py @@ -0,0 +1,12 @@ +import frappe + + +def execute(): + if frappe.db.get_single_value("Accounts Settings", "receivable_payable_fetch_method") == "Raw SQL": + frappe.db.set_single_value( + "Accounts Settings", "receivable_payable_fetch_method", "UnBuffered Cursor" + ) + + frappe.db.sql("drop function if exists ar_genkey") + frappe.db.sql("drop procedure if exists ar_init_tmp_table") + frappe.db.sql("drop procedure if exists ar_allocate_to_tmp_table") From 21a9eedb5c48c5a4d0c1bae24341c7ca7ffd6a73 Mon Sep 17 00:00:00 2001 From: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com> Date: Mon, 18 May 2026 22:33:10 +0530 Subject: [PATCH 020/249] fix(stock): update buying amount calculation in gross profit report (#55020) --- .../report/gross_profit/gross_profit.py | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py index dfba16a77eb..71af2b9d211 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.py +++ b/erpnext/accounts/report/gross_profit/gross_profit.py @@ -812,19 +812,11 @@ class GrossProfitGenerator: return self.calculate_buying_amount_from_sle( row, my_sle, parenttype, parent, row.item_row, item_code ) - elif self.delivery_notes.get((row.parent, row.item_code), None): - # check if Invoice has delivery notes - dn = self.delivery_notes.get((row.parent, row.item_code)) - parenttype, parent, item_row, dn_warehouse = ( - "Delivery Note", - dn["delivery_note"], - dn["item_row"], - dn["warehouse"], - ) - my_sle = self.get_stock_ledger_entries(item_code, dn_warehouse) - return self.calculate_buying_amount_from_sle( - row, my_sle, parenttype, parent, item_row, item_code - ) + elif row.item_row and self.delivery_notes.get(row.item_row): + dn = self.delivery_notes[row.item_row] + if flt(dn.total_qty): + return flt(row.qty) * flt(dn.total_incoming_value) / flt(dn.total_qty) + return flt(row.qty) * self.get_average_buying_rate(row, item_code) elif row.sales_order and row.so_detail: incoming_amount = self.get_buying_amount_from_so_dn(row.sales_order, row.so_detail, item_code) if incoming_amount: @@ -1076,25 +1068,29 @@ class GrossProfitGenerator: def get_delivery_notes(self): self.delivery_notes = frappe._dict({}) if self.si_list: + from frappe.query_builder.functions import Sum + invoices = [x.parent for x in self.si_list] dni = qb.DocType("Delivery Note Item") delivery_notes = ( qb.from_(dni) .select( - dni.against_sales_invoice.as_("sales_invoice"), - dni.item_code, - dni.warehouse, - dni.parent.as_("delivery_note"), - dni.name.as_("item_row"), + dni.si_detail, + Sum(dni.stock_qty * dni.incoming_rate).as_("total_incoming_value"), + Sum(dni.stock_qty).as_("total_qty"), ) - .where((dni.docstatus == 1) & (dni.against_sales_invoice.isin(invoices))) - .groupby(dni.against_sales_invoice, dni.item_code) - .orderby(dni.creation, order=Order.desc) + .where( + (dni.docstatus == 1) + & (dni.against_sales_invoice.isin(invoices)) + & (dni.si_detail.isnotnull()) + & (dni.si_detail != "") + ) + .groupby(dni.si_detail) .run(as_dict=True) ) for entry in delivery_notes: - self.delivery_notes[(entry.sales_invoice, entry.item_code)] = entry + self.delivery_notes[entry.si_detail] = entry def group_items_by_invoice(self): """ From f99e331742c43d29c529d22970d2fb3d1214e671 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 18 May 2026 23:06:09 +0530 Subject: [PATCH 021/249] fix: prevent duplicate task execution and timestamp error in transaction deletion (#55021) --- erpnext/setup/doctype/company/company.py | 1 - .../test_transaction_deletion_record.py | 1 - .../transaction_deletion_record.py | 9 +++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index d30b082e557..d5e3c871af1 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -1087,7 +1087,6 @@ def create_transaction_deletion_request(company: str): tdr.reload() tdr.submit() - tdr.start_deletion_tasks() frappe.msgprint( _("Transaction Deletion Document {0} has been triggered for company {1}").format( diff --git a/erpnext/setup/doctype/transaction_deletion_record/test_transaction_deletion_record.py b/erpnext/setup/doctype/transaction_deletion_record/test_transaction_deletion_record.py index 5c716279b89..23683c3d6bb 100644 --- a/erpnext/setup/doctype/transaction_deletion_record/test_transaction_deletion_record.py +++ b/erpnext/setup/doctype/transaction_deletion_record/test_transaction_deletion_record.py @@ -396,7 +396,6 @@ def create_and_submit_transaction_deletion_doc(company): tdr.process_in_single_transaction = True tdr.submit() - tdr.start_deletion_tasks() return tdr diff --git a/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py b/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py index 9f68967392a..25f5d06d8b4 100644 --- a/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py +++ b/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py @@ -738,10 +738,11 @@ class TransactionDeletionRecord(Document): self.enqueue_task(task="Clear Notifications") return - company_obj = frappe.get_doc("Company", self.company) - company_obj.total_monthly_sales = 0 - company_obj.sales_monthly_history = None - company_obj.save() + frappe.db.set_value( + "Company", + self.company, + {"total_monthly_sales": 0, "sales_monthly_history": None}, + ) self.db_set("reset_company_default_values_status", "Completed") self.enqueue_task(task="Clear Notifications") From 94b95d6c2f9f6f8262ced0018d26d979aa17844c Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 19 May 2026 13:23:32 +0530 Subject: [PATCH 022/249] fix: stock balance showing incorrect value because of incorrect SLE --- erpnext/stock/stock_ledger.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index 4404ea7a44c..f0d622de19f 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -2433,7 +2433,9 @@ def get_stock_value_difference( ) if voucher_detail_no: - query = query.where(table.voucher_detail_no != voucher_detail_no) + query = query.where( + (table.voucher_detail_no != voucher_detail_no) | (table.voucher_detail_no.isnull()) + ) elif voucher_no: query = query.where(table.voucher_no != voucher_no) From 61d24ba55f33e0d12f9956bc3311bc6c6740249d Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 19 May 2026 16:12:25 +0530 Subject: [PATCH 023/249] fix(patch): drop dead procedures first before other changes --- .../v16_0/clear_procedures_from_receivable_report.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/patches/v16_0/clear_procedures_from_receivable_report.py b/erpnext/patches/v16_0/clear_procedures_from_receivable_report.py index 5eaf0f14fc8..c362d4ef605 100644 --- a/erpnext/patches/v16_0/clear_procedures_from_receivable_report.py +++ b/erpnext/patches/v16_0/clear_procedures_from_receivable_report.py @@ -2,11 +2,11 @@ import frappe def execute(): + frappe.db.sql("drop function if exists ar_genkey") + frappe.db.sql("drop procedure if exists ar_init_tmp_table") + frappe.db.sql("drop procedure if exists ar_allocate_to_tmp_table") + if frappe.db.get_single_value("Accounts Settings", "receivable_payable_fetch_method") == "Raw SQL": frappe.db.set_single_value( "Accounts Settings", "receivable_payable_fetch_method", "UnBuffered Cursor" ) - - frappe.db.sql("drop function if exists ar_genkey") - frappe.db.sql("drop procedure if exists ar_init_tmp_table") - frappe.db.sql("drop procedure if exists ar_allocate_to_tmp_table") From ad7ddae32f43d192da008cc6e977326a5b4decb6 Mon Sep 17 00:00:00 2001 From: Ravibharathi <131471282+ravibharathi656@users.noreply.github.com> Date: Tue, 19 May 2026 16:30:07 +0530 Subject: [PATCH 024/249] fix: validate company region in uae vat 201 (#54899) --- .../regional/report/uae_vat_201/test_uae_vat_201.py | 8 ++++++++ erpnext/regional/report/uae_vat_201/uae_vat_201.js | 7 +++++++ erpnext/regional/report/uae_vat_201/uae_vat_201.py | 12 ++++++++++++ 3 files changed, 27 insertions(+) diff --git a/erpnext/regional/report/uae_vat_201/test_uae_vat_201.py b/erpnext/regional/report/uae_vat_201/test_uae_vat_201.py index 0f2c4906e56..f45cc840fa8 100644 --- a/erpnext/regional/report/uae_vat_201/test_uae_vat_201.py +++ b/erpnext/regional/report/uae_vat_201/test_uae_vat_201.py @@ -4,6 +4,7 @@ import erpnext from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice from erpnext.regional.report.uae_vat_201.uae_vat_201 import ( + execute, get_exempt_total, get_standard_rated_expenses_tax, get_standard_rated_expenses_total, @@ -30,6 +31,13 @@ class TestUaeVat201(ERPNextTestSuite): make_item("_Test UAE VAT Zero Rated Item", properties={"is_zero_rated": 1, "is_exempt": 0}) make_item("_Test UAE VAT Exempt Item", properties={"is_zero_rated": 0, "is_exempt": 1}) + def test_validate_company_region(self): + self.assertRaises( + frappe.exceptions.ValidationError, + execute, + {"company": "_Test Company"}, + ) + def test_uae_vat_201_report(self): make_sales_invoices() create_purchase_invoices() diff --git a/erpnext/regional/report/uae_vat_201/uae_vat_201.js b/erpnext/regional/report/uae_vat_201/uae_vat_201.js index 49060fdf66a..e62d3395f20 100644 --- a/erpnext/regional/report/uae_vat_201/uae_vat_201.js +++ b/erpnext/regional/report/uae_vat_201/uae_vat_201.js @@ -10,6 +10,13 @@ frappe.query_reports["UAE VAT 201"] = { options: "Company", reqd: 1, default: frappe.defaults.get_user_default("Company"), + get_query: function () { + return { + filters: { + country: "United Arab Emirates", + }, + }; + }, }, { fieldname: "from_date", diff --git a/erpnext/regional/report/uae_vat_201/uae_vat_201.py b/erpnext/regional/report/uae_vat_201/uae_vat_201.py index fa4b2dc6693..4942bc4801f 100644 --- a/erpnext/regional/report/uae_vat_201/uae_vat_201.py +++ b/erpnext/regional/report/uae_vat_201/uae_vat_201.py @@ -5,13 +5,25 @@ import frappe from frappe import _ +from erpnext import get_region + def execute(filters=None): + validate_company_region(filters) columns = get_columns() data, emirates, amounts_by_emirate = get_data(filters) return columns, data +def validate_company_region(filters): + if filters.get("company") and get_region(filters.get("company")) != "United Arab Emirates": + frappe.throw( + _( + "The company {0} is not in United Arab Emirates. UAE VAT 201 report is only available for companies in United Arab Emirates." + ).format(frappe.bold(filters.get("company"))) + ) + + def get_columns(): """Creates a list of dictionaries that are used to generate column headers of the data table.""" return [ From e4b5e6bd1ebcf82b89c5150d89b46238e778de2f Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 18 May 2026 20:16:13 +0530 Subject: [PATCH 025/249] refactor: split stock_entry.py into multiple files for better readability --- .../controllers/subcontracting_controller.py | 2 +- erpnext/manufacturing/doctype/bom/bom.py | 2 +- .../doctype/job_card/job_card.py | 6 +- .../doctype/work_order/test_work_order.py | 5 +- .../doctype/work_order/work_order.py | 16 +- erpnext/projects/doctype/project/project.py | 34 + .../material_request/material_request.py | 1 - .../purchase_receipt/purchase_receipt.js | 4 +- .../stock/doctype/stock_entry/stock_entry.js | 6 +- .../doctype/stock_entry/stock_entry.json | 13 +- .../stock/doctype/stock_entry/stock_entry.py | 2834 +---------------- .../stock_entry_handler/__init__.py | 0 .../stock_entry_handler/disassemble.py | 535 ++++ .../stock_entry_handler/manufacturing.py | 1016 ++++++ .../material_receipt_issue.py | 90 + .../stock_entry_handler/material_transfer.py | 486 +++ .../stock_entry_handler/serial_batch.py | 370 +++ .../stock_entry_handler/subcontracting.py | 243 ++ .../doctype/stock_entry/test_stock_entry.py | 10 +- .../stock_entry_detail/stock_entry_detail.py | 187 +- .../stock_entry_type/stock_entry_type.py | 7 +- .../stock_reservation_entry.py | 29 + .../subcontracting_inward_order.py | 10 +- .../test_subcontracting_inward_order.py | 1 + 24 files changed, 3126 insertions(+), 2781 deletions(-) create mode 100644 erpnext/stock/doctype/stock_entry/stock_entry_handler/__init__.py create mode 100644 erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py create mode 100644 erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py create mode 100644 erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py create mode 100644 erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py create mode 100644 erpnext/stock/doctype/stock_entry/stock_entry_handler/serial_batch.py create mode 100644 erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py index 30f8469ff00..6e7254a9dc0 100644 --- a/erpnext/controllers/subcontracting_controller.py +++ b/erpnext/controllers/subcontracting_controller.py @@ -1426,7 +1426,7 @@ def make_rm_stock_entry( } } - target_doc.add_to_stock_entry_detail(items_dict) + target_doc.append("items", items_dict[rm_item_code]) stock_entry = get_mapped_doc( order_doctype, diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index 7c032be36e4..ce59cdf4d97 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -2002,7 +2002,7 @@ def get_secondary_items_from_sub_assemblies(bom_no, company, qty, secondary_item return secondary_items -def get_backflush_based_on(bom_no): +def get_backflush_based_on(bom_no=None): backflush_based_on = None if bom_no: backflush_based_on = frappe.get_cached_value("BOM", bom_no, "backflush_based_on") diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py index b3d4301addf..4e8fbfafcd4 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.py +++ b/erpnext/manufacturing/doctype/job_card/job_card.py @@ -1476,6 +1476,8 @@ class JobCard(Document): @frappe.whitelist() def make_stock_entry_for_semi_fg_item(self, auto_submit: bool = False): + from erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing import ManufactureStockEntry + def get_consumed_process_loss(): table = frappe.qb.DocType("Stock Entry") query = ( @@ -1511,9 +1513,7 @@ class JobCard(Document): ste.stock_entry.flags.ignore_mandatory = True wo_doc = frappe.get_doc("Work Order", self.work_order) add_additional_cost(ste.stock_entry, wo_doc, self) - - ste.stock_entry.pro_doc = frappe.get_doc("Work Order", self.work_order) - ste.stock_entry.set_secondary_items_from_job_card() + ManufactureStockEntry(ste.stock_entry).add_secondary_items_from_job_card() for row in ste.stock_entry.items: if (row.type or row.is_legacy_scrap_item) and not row.t_warehouse: row.t_warehouse = self.target_warehouse diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py index 4e48224032b..8a3dd1a46e3 100644 --- a/erpnext/manufacturing/doctype/work_order/test_work_order.py +++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py @@ -31,6 +31,7 @@ from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle ) from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos from erpnext.stock.doctype.stock_entry import test_stock_entry +from erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing import ManufactureStockEntry from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse from erpnext.stock.utils import get_bin from erpnext.tests.utils import ERPNextTestSuite @@ -1319,7 +1320,7 @@ class TestWorkOrder(ERPNextTestSuite): stock_entry = frappe.get_doc(make_stock_entry(wo_order.name, "Manufacture", 10)) stock_entry.set_work_order_details() - stock_entry.set_serial_no_batch_for_finished_good() + ManufactureStockEntry(stock_entry).set_serial_nos_for_finished_good() for row in stock_entry.items: if row.item_code == fg_item: self.assertTrue(row.serial_and_batch_bundle) @@ -1360,7 +1361,7 @@ class TestWorkOrder(ERPNextTestSuite): stock_entry = frappe.get_doc(make_stock_entry(wo_order.name, "Manufacture", 10)) stock_entry.set_work_order_details() - stock_entry.set_serial_no_batch_for_finished_good() + ManufactureStockEntry(stock_entry).set_serial_nos_for_finished_good() for row in stock_entry.items: if row.item_code == fg_item: self.assertTrue(row.serial_and_batch_bundle) diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py index 70d9863b876..785bdc36e64 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.py +++ b/erpnext/manufacturing/doctype/work_order/work_order.py @@ -2453,10 +2453,6 @@ def make_stock_entry( stock_entry.set_stock_entry_type() stock_entry.is_additional_transfer_entry = is_additional_transfer_entry stock_entry.get_items() - stock_entry.set_secondary_items_from_job_card() - - if purpose != "Disassemble": - stock_entry.set_serial_no_batch_for_finished_good() return stock_entry.as_dict() @@ -2817,11 +2813,9 @@ def get_reserved_qty_for_production( @frappe.whitelist() def make_stock_return_entry(work_order: str): - from erpnext.stock.doctype.stock_entry.stock_entry import get_available_materials - - non_consumed_items = get_available_materials(work_order) - if not non_consumed_items: - return + from erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing import ( + ManufactureStockEntry, + ) wo_doc = frappe.get_cached_doc("Work Order", work_order) @@ -2831,9 +2825,11 @@ def make_stock_return_entry(work_order: str): stock_entry.work_order = work_order stock_entry.purpose = "Material Transfer for Manufacture" stock_entry.bom_no = wo_doc.bom_no - stock_entry.add_transfered_raw_materials_in_items() stock_entry.set_stock_entry_type() + ste_cls = ManufactureStockEntry(stock_entry) + ste_cls.add_raw_materials_based_on_transfer() + ste_cls.return_available_materials_in_source_wh() return stock_entry diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index 92d677e6c60..490461d47f5 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -164,6 +164,40 @@ class Project(Document): self.check_depends_on_value(template_task, project_task, project_tasks) self.check_for_parent_tasks(template_task, project_task, project_tasks) + def set_consumed_material_cost(self): + parent_doc = frappe.qb.DocType("Stock Entry") + child_doc = frappe.qb.DocType("Stock Entry Detail") + lcv_doc = frappe.qb.DocType("Landed Cost Taxes and Charges") + + amount = ( + qb.from_(child_doc) + .select(Sum(child_doc.amount)) + .where( + (child_doc.project == self.name) + & (child_doc.docstatus == 1) + & ((child_doc.t_warehouse.isnull()) | (child_doc.t_warehouse == "")) + ) + ).run(as_list=1) + + amount = flt(amount[0][0]) if amount else 0 + + additional_costs = ( + qb.from_(parent_doc) + .join(lcv_doc) + .on(parent_doc.name == lcv_doc.parent) + .select(Sum(lcv_doc.base_amount)) + .where( + (parent_doc.project == self.name) + & (parent_doc.docstatus == 1) + & (parent_doc.purpose == "Manufacture") + ) + ).run(as_list=1) + + additional_cost_amt = flt(additional_costs[0][0]) if additional_costs else 0 + + amount += additional_cost_amt + self.total_consumed_material_cost = amount + def check_depends_on_value(self, template_task, project_task, project_tasks): if template_task.get("depends_on") and not project_task.get("depends_on"): project_template_map = {pt.template_task: pt for pt in project_tasks} diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index 2a0d85f66b4..8d8239626a1 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -768,7 +768,6 @@ def make_stock_entry(source_name: str, target_doc: str | Document | None = None) target.set_actual_qty() target.calculate_rate_and_amount(raise_error_if_no_rate=False) target.stock_entry_type = target.purpose - target.set_job_card_data() if source.job_card: job_card_details = frappe.get_all( diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js index 5ed90fca743..4e959229e15 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js @@ -342,7 +342,7 @@ erpnext.stock.PurchaseReceiptController = class PurchaseReceiptController extend make_retention_stock_entry() { frappe.call({ - method: "erpnext.stock.doctype.stock_entry.stock_entry.move_sample_to_retention_warehouse", + method: "erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing.move_sample_to_retention_warehouse", args: { company: cur_frm.doc.company, items: cur_frm.doc.items, @@ -455,7 +455,7 @@ var validate_sample_quantity = function (frm, cdt, cdn) { var d = locals[cdt][cdn]; if (d.sample_quantity && d.qty) { frappe.call({ - method: "erpnext.stock.doctype.stock_entry.stock_entry.validate_sample_quantity", + method: "erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing.validate_sample_quantity", args: { batch_no: d.batch_no, item_code: d.item_code, diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index c5db730fdfb..a6448505065 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -496,7 +496,7 @@ frappe.ui.form.on("Stock Entry", { __("Expired Batches"), function () { frappe.call({ - method: "erpnext.stock.doctype.stock_entry.stock_entry.get_expired_batch_items", + method: "erpnext.stock.doctype.stock_entry.stock_entry_handler.serial_batch.get_expired_batch_items", freeze: true, callback: function (r) { if (!r.exc && r.message) { @@ -670,7 +670,7 @@ frappe.ui.form.on("Stock Entry", { make_retention_stock_entry: function (frm) { frappe.call({ - method: "erpnext.stock.doctype.stock_entry.stock_entry.move_sample_to_retention_warehouse", + method: "erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing.move_sample_to_retention_warehouse", args: { company: frm.doc.company, items: frm.doc.items, @@ -1150,7 +1150,7 @@ var validate_sample_quantity = function (frm, cdt, cdn) { var d = locals[cdt][cdn]; if (d.sample_quantity && d.transfer_qty && frm.doc.purpose == "Material Receipt") { frappe.call({ - method: "erpnext.stock.doctype.stock_entry.stock_entry.validate_sample_quantity", + method: "erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing.validate_sample_quantity", args: { batch_no: d.batch_no, item_code: d.item_code, diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json index 81cbad37c24..f6f2d821cc8 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.json +++ b/erpnext/stock/doctype/stock_entry/stock_entry.json @@ -46,6 +46,7 @@ "target_address_display", "sb0", "scan_barcode", + "column_break_menu", "last_scanned_warehouse", "items_section", "items", @@ -369,6 +370,7 @@ { "fieldname": "sb0", "fieldtype": "Section Break", + "hide_border": 1, "options": "Simple" }, { @@ -646,7 +648,7 @@ "depends_on": "eval:in_list([\"Material Issue\", \"Manufacture\", \"Repack\", \"Send to Subcontractor\", \"Material Transfer for Manufacture\", \"Material Consumption for Manufacture\", \"Disassemble\"], doc.purpose)", "fieldname": "bom_info_section", "fieldtype": "Section Break", - "label": "BOM Info" + "label": "Bill of Materials" }, { "collapsible": 1, @@ -695,8 +697,7 @@ }, { "fieldname": "items_section", - "fieldtype": "Section Break", - "label": "Items" + "fieldtype": "Section Break" }, { "depends_on": "eval:doc.asset_repair", @@ -761,6 +762,10 @@ "fieldtype": "Link", "label": "Cost Center", "options": "Cost Center" + }, + { + "fieldname": "column_break_menu", + "fieldtype": "Column Break" } ], "grid_page_length": 50, @@ -769,7 +774,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2026-03-04 19:03:23.426082", + "modified": "2026-04-21 13:31:48.817309", "modified_by": "Administrator", "module": "Stock", "name": "Stock Entry", diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 2951b7272b3..e6afc5798d1 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -36,12 +36,8 @@ from erpnext.manufacturing.doctype.bom.bom import ( ) from erpnext.setup.doctype.brand.brand import get_brand_defaults from erpnext.setup.doctype.item_group.item_group import get_item_group_defaults -from erpnext.stock.doctype.batch.batch import get_batch_qty from erpnext.stock.doctype.item.item import get_item_defaults from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos -from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import ( - OpeningEntryAccountError, -) from erpnext.stock.get_item_details import ( ItemDetailsCtx, get_barcode_data, @@ -51,11 +47,27 @@ from erpnext.stock.get_item_details import ( ) from erpnext.stock.serial_batch_bundle import ( SerialBatchCreation, + get_batch_nos, get_empty_batches_based_work_order, get_serial_or_batch_items, ) -from erpnext.stock.stock_ledger import NegativeStockError, get_previous_sle, get_valuation_rate -from erpnext.stock.utils import get_bin, get_combine_datetime, get_incoming_rate +from erpnext.stock.stock_ledger import get_previous_sle, get_valuation_rate +from erpnext.stock.utils import get_incoming_rate + +from .stock_entry_handler.disassemble import DisassembleStockEntry +from .stock_entry_handler.manufacturing import ( + ManufactureStockEntry, + MaterialConsumptionForManufactureStockEntry, + RepackStockEntry, +) +from .stock_entry_handler.material_receipt_issue import MaterialIssueStockEntry, MaterialReceiptStockEntry +from .stock_entry_handler.material_transfer import ( + MaterialRequestStockEntry, + MaterialTransferForManufactureStockEntry, + MaterialTransferStockEntry, +) +from .stock_entry_handler.serial_batch import StockEntrySABB +from .stock_entry_handler.subcontracting import SendToSubcontractorStockEntry class FinishedGoodError(frappe.ValidationError): @@ -66,14 +78,6 @@ class IncorrectValuationRateError(frappe.ValidationError): pass -class DuplicateEntryForWorkOrderError(frappe.ValidationError): - pass - - -class OperationsNotCompleteError(frappe.ValidationError): - pass - - class MaxSampleAlreadyRetainedError(frappe.ValidationError): pass @@ -170,8 +174,15 @@ class StockEntry(StockController, SubcontractingInwardController): work_order: DF.Link | None # end: auto-generated types + def __setattr__(self, name, value): + super().__setattr__(name, value) + if name == "purpose": + self.initialize_class_object() + def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) + self.initialize_class_object() + if self.subcontracting_inward_order: self.subcontract_data = frappe._dict( { @@ -191,6 +202,36 @@ class StockEntry(StockController, SubcontractingInwardController): } ) + def initialize_class_object(self): + purpose_map = { + "Manufacture": ManufactureStockEntry, + "Repack": RepackStockEntry, + "Material Transfer": MaterialTransferStockEntry, + "Material Transfer for Manufacture": MaterialTransferForManufactureStockEntry, + "Material Consumption for Manufacture": MaterialConsumptionForManufactureStockEntry, + "Disassemble": DisassembleStockEntry, + "Send to Subcontractor": SendToSubcontractorStockEntry, + "Material Issue": MaterialIssueStockEntry, + "Material Receipt": MaterialReceiptStockEntry, + } + + self.se_handler_class = purpose_map.get(self.purpose) + + if self.purpose == "Material Transfer" and self.transfer_for_material_request(): + self.se_handler_class = MaterialRequestStockEntry + + def transfer_for_material_request(self): + if self.outgoing_stock_entry and frappe.get_all( + "Stock Entry Detail", + filters={"parent": self.outgoing_stock_entry, "material_request": ("is", "set")}, + pluck="name", + ): + return True + + for item in self.items: + if item.material_request: + return True + def onload(self): self.update_items_from_bin_details() @@ -211,6 +252,9 @@ class StockEntry(StockController, SubcontractingInwardController): def before_validate(self): from erpnext.stock.doctype.putaway_rule.putaway_rule import apply_putaway_rule + if self.se_handler_class and hasattr(self.se_handler_class, "before_validate"): + self.se_handler_class(self).before_validate() + apply_rule = self.apply_putaway_rule and (self.purpose in ["Material Transfer", "Material Receipt"]) if self.get("items") and apply_rule: @@ -225,20 +269,17 @@ class StockEntry(StockController, SubcontractingInwardController): item.project = self.project def validate(self): - self.pro_doc = frappe._dict() - if self.work_order: - self.pro_doc = frappe.get_doc("Work Order", self.work_order) + if self.se_handler_class: + self.se_handler_class(self).validate() self.validate_duplicate_serial_and_batch_bundle("items") self.validate_posting_time() - self.validate_purpose() self.validate_item() self.validate_customer_provided_item() self.set_transfer_qty() self.validate_uom_is_integer("uom", "qty") self.validate_uom_is_integer("stock_uom", "transfer_qty") self.validate_warehouse_of_sabb() - self.validate_work_order() self.validate_source_stock_entry() self.validate_bom() self.set_process_loss_qty() @@ -251,201 +292,38 @@ class StockEntry(StockController, SubcontractingInwardController): else: self.validate_job_card_fg_item() - self.validate_warehouse() - self.validate_with_material_request() self.validate_batch() self.validate_inspection() self.validate_fg_completed_qty() self.validate_difference_account() - self.set_job_card_data() self.validate_job_card_item() self.set_purpose_for_stock_entry() self.clean_serial_nos() - self.validate_repack_entry() - - if not self.from_bom: - self.fg_completed_qty = 0.0 - - self.make_serial_and_batch_bundle_for_outward() + self.remove_fg_completed_qty() self.validate_serialized_batch() self.calculate_rate_and_amount() self.validate_putaway_capacity() - self.validate_component_and_quantities() - - if self.get("purpose") != "Manufacture": - # ignore other item wh difference and empty source/target wh - # in Manufacture Entry - self.reset_default_field_value("from_warehouse", "items", "s_warehouse") - self.reset_default_field_value("to_warehouse", "items", "t_warehouse") - - self.validate_same_source_target_warehouse_during_material_transfer() - self.validate_closed_subcontracting_order() - self.validate_subcontract_order() - self.validate_raw_materials_exists() - super().validate_subcontracting_inward() - def validate_repack_entry(self): - if self.purpose != "Repack": - return + def remove_fg_completed_qty(self): + if not self.from_bom and self.fg_completed_qty: + self.fg_completed_qty = 0.0 - fg_items = {row.item_code: row for row in self.items if row.is_finished_item} - - if len(fg_items) > 1 and not all(row.set_basic_rate_manually for row in fg_items.values()): - frappe.throw( - _( - "When there are multiple finished goods ({0}) in a Repack stock entry, the basic rate for all finished goods must be set manually. To set rate manually, enable the checkbox 'Set Basic Rate Manually' in the respective finished good row." - ).format(", ".join(fg_items)), - title=_("Set Basic Rate Manually"), - ) - - def validate_raw_materials_exists(self): - if self.purpose not in ["Manufacture", "Repack", "Disassemble"]: - return - - if frappe.db.get_single_value("Manufacturing Settings", "material_consumption"): - return - - raw_materials = [] - for row in self.items: - if row.s_warehouse: - raw_materials.append(row.item_code) - - if not raw_materials: - frappe.throw( - _( - "At least one raw material item must be present in the stock entry for the type {0}" - ).format(bold(self.purpose)), - title=_("Raw Materials Missing"), - ) - - def set_serial_batch_for_disassembly(self): - if self.purpose != "Disassemble": - return - - if self.get("source_stock_entry"): - self._set_serial_batch_for_disassembly_from_stock_entry() - else: - self._set_serial_batch_for_disassembly_from_available_materials() - - def _set_serial_batch_for_disassembly_from_stock_entry(self): - from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import ( - get_voucher_wise_serial_batch_from_bundle, - ) - - source_fg_qty = flt(frappe.db.get_value("Stock Entry", self.source_stock_entry, "fg_completed_qty")) - scale_factor = flt(self.fg_completed_qty) / source_fg_qty if source_fg_qty else 0 - - bundle_data = get_voucher_wise_serial_batch_from_bundle(voucher_no=[self.source_stock_entry]) - source_rows_by_name = {r.name: r for r in self.get_items_from_manufacture_stock_entry()} - - for row in self.items: - if not row.ste_detail: - continue - - source_row = source_rows_by_name.get(row.ste_detail) - if not source_row: - continue - - source_warehouse = source_row.s_warehouse or source_row.t_warehouse - key = (source_row.item_code, source_warehouse, self.source_stock_entry) - source_bundle = bundle_data.get(key, {}) - - batches = defaultdict(float) - serial_nos = [] - - if source_bundle.get("batch_nos"): - qty_remaining = row.transfer_qty - for batch_no, batch_qty in source_bundle["batch_nos"].items(): - if qty_remaining <= 0: - break - alloc = min(abs(flt(batch_qty)) * scale_factor, qty_remaining) - batches[batch_no] = alloc - qty_remaining -= alloc - elif source_row.batch_no: - batches[source_row.batch_no] = row.transfer_qty - - if source_bundle.get("serial_nos"): - serial_nos = get_serial_nos(source_bundle["serial_nos"])[: int(row.transfer_qty)] - elif source_row.serial_no: - serial_nos = get_serial_nos(source_row.serial_no)[: int(row.transfer_qty)] - - self._set_serial_batch_bundle_for_disassembly_row(row, serial_nos, batches) - - def _set_serial_batch_for_disassembly_from_available_materials(self): - available_materials = get_available_materials(self.work_order, self) - for row in self.items: - if row.serial_no or row.batch_no or row.serial_and_batch_bundle: - continue - - warehouse = row.s_warehouse or row.t_warehouse - materials = available_materials.get((row.item_code, warehouse)) - if not materials: - continue - - batches = defaultdict(float) - serial_nos = [] - qty = row.transfer_qty - for batch_no, batch_qty in materials.batch_details.items(): - if qty <= 0: - break - - batch_qty = abs(batch_qty) - if batch_qty <= qty: - batches[batch_no] = batch_qty - qty -= batch_qty - else: - batches[batch_no] = qty - qty = 0 - - if materials.serial_nos: - serial_nos = materials.serial_nos[: int(row.transfer_qty)] - - self._set_serial_batch_bundle_for_disassembly_row(row, serial_nos, batches) - - def _set_serial_batch_bundle_for_disassembly_row(self, row, serial_nos, batches): - if not serial_nos and not batches: - return - - warehouse = row.s_warehouse or row.t_warehouse - bundle_doc = SerialBatchCreation( - { - "item_code": row.item_code, - "warehouse": warehouse, - "posting_datetime": get_combine_datetime(self.posting_date, self.posting_time), - "voucher_type": self.doctype, - "voucher_no": self.name, - "voucher_detail_no": row.name, - "qty": row.transfer_qty, - "type_of_transaction": "Inward" if row.t_warehouse else "Outward", - "company": self.company, - "do_not_submit": True, - } - ).make_serial_and_batch_bundle(serial_nos=serial_nos, batch_nos=batches) - - row.serial_and_batch_bundle = bundle_doc.name - row.use_serial_batch_fields = 0 - - row.db_set( - { - "serial_and_batch_bundle": bundle_doc.name, - "use_serial_batch_fields": 0, - } - ) + def before_submit(self): + StockEntrySABB(self).make_serial_and_batch_bundle_for_outward() def on_submit(self): - self.set_serial_batch_for_disassembly() + if self.se_handler_class and hasattr(self.se_handler_class, "on_submit"): + self.se_handler_class(self).on_submit() + self.make_bundle_using_old_serial_batch_fields() - self.update_work_order() self.update_disassembled_order() self.adjust_stock_reservation_entries_for_return() self.update_stock_reservation_entries() self.update_stock_ledger() self.make_stock_reserve_for_wip_and_fg() self.reserve_stock_for_subcontracting() - - self.update_subcontract_order_supplied_items() self.update_subcontracting_order_status() self.update_pick_list_status() @@ -453,27 +331,21 @@ class StockEntry(StockController, SubcontractingInwardController): self.repost_future_sle_and_gle() self.update_cost_in_project() - self.update_transferred_qty() self.update_quality_inspection() - - if self.purpose == "Material Transfer" and self.add_to_transit: - self.set_material_request_transfer_status("In Transit") - if self.purpose == "Material Transfer" and self.outgoing_stock_entry: - self.set_material_request_transfer_status("Completed") - super().on_submit_subcontracting_inward() def on_cancel(self): + if self.se_handler_class and hasattr(self.se_handler_class, "on_cancel"): + self.se_handler_class(self).on_cancel() + self.delink_asset_repair_sabb() self.validate_closed_subcontracting_order() - self.update_subcontract_order_supplied_items() self.update_subcontracting_order_status() self.cancel_stock_reserve_for_wip_and_fg() if self.work_order and self.purpose == "Material Consumption for Manufacture": self.validate_work_order_status() - self.update_work_order() self.update_disassembled_order() self.cancel_stock_reservation_entries_for_inward() self.update_stock_ledger() @@ -488,34 +360,17 @@ class StockEntry(StockController, SubcontractingInwardController): self.make_gl_entries_on_cancel() self.repost_future_sle_and_gle() self.update_cost_in_project() - self.update_transferred_qty() self.update_quality_inspection() self.adjust_stock_reservation_entries_for_return() self.update_stock_reservation_entries() self.delete_auto_created_batches() self.delete_linked_stock_entry() - - if self.purpose == "Material Transfer" and self.add_to_transit: - self.set_material_request_transfer_status("Not Started") - if self.purpose == "Material Transfer" and self.outgoing_stock_entry: - self.set_material_request_transfer_status("In Transit") - super().on_cancel_subcontracting_inward() def on_update(self): super().on_update() self.set_serial_and_batch_bundle() - def set_job_card_data(self): - if self.job_card and not self.work_order: - data = frappe.db.get_value( - "Job Card", self.job_card, ["for_quantity", "work_order", "bom_no", "semi_fg_bom"], as_dict=1 - ) - self.fg_completed_qty = data.for_quantity - self.work_order = data.work_order - self.from_bom = 1 - self.bom_no = data.semi_fg_bom or data.bom_no - def validate_job_card_fg_item(self): if not self.job_card: return @@ -526,9 +381,7 @@ class StockEntry(StockController, SubcontractingInwardController): for row in self.items: if row.is_finished_item and row.item_code != job_card.finished_good: - frappe.throw( - _("Row #{0}: Finished Good must be {1}").format(row.idx, job_card.fininshed_good) - ) + frappe.throw(_("Row #{0}: Finished Good must be {1}").format(row.idx, job_card.finished_good)) def validate_job_card_item(self): if not self.job_card or self.purpose == "Manufacture": @@ -553,28 +406,6 @@ class StockEntry(StockController, SubcontractingInwardController): if pro_doc.status == "Completed": frappe.throw(_("Cannot cancel transaction for Completed Work Order.")) - def validate_purpose(self): - valid_purposes = [ - "Material Issue", - "Material Receipt", - "Material Transfer", - "Material Transfer for Manufacture", - "Manufacture", - "Repack", - "Send to Subcontractor", - "Material Consumption for Manufacture", - "Disassemble", - "Receive from Customer", - "Return Raw Material to Customer", - "Subcontracting Delivery", - "Subcontracting Return", - ] - - if self.purpose not in valid_purposes: - frappe.throw(_("Purpose must be one of {0}").format(comma_or(valid_purposes))) - - super().validate_purpose() - def delete_linked_stock_entry(self): if self.purpose == "Send to Warehouse": for d in frappe.get_all( @@ -592,34 +423,12 @@ class StockEntry(StockController, SubcontractingInwardController): return for row in self.items: - if row.serial_and_batch_bundle: - voucher_detail_no = frappe.db.get_value( - "Asset Repair Consumed Item", - {"parent": self.asset_repair, "serial_and_batch_bundle": row.serial_and_batch_bundle}, - "name", - ) - - doc = frappe.get_doc("Serial and Batch Bundle", row.serial_and_batch_bundle) - doc.db_set( - { - "voucher_type": "Asset Repair", - "voucher_no": self.asset_repair, - "voucher_detail_no": voucher_detail_no, - } - ) + row.delink_asset_repair_sabb(self.asset_repair) def set_transfer_qty(self): self.validate_qty_is_not_zero() for item in self.get("items"): - if not flt(item.conversion_factor): - frappe.throw(_("Row {0}: UOM Conversion Factor is mandatory").format(item.idx)) - item.transfer_qty = flt( - flt(item.qty) * flt(item.conversion_factor), self.precision("transfer_qty", item) - ) - if not flt(item.transfer_qty): - frappe.throw( - _("Row {0}: Qty in Stock UOM can not be zero.").format(item.idx), title=_("Zero quantity") - ) + item.set_transfer_qty() def update_cost_in_project(self): if self.work_order and not frappe.db.get_value( @@ -629,49 +438,12 @@ class StockEntry(StockController, SubcontractingInwardController): projects = set(item.project for item in self.items if item.project) for project in projects: - amount = frappe.db.sql( - """ select ifnull(sum(amount), 0) - from - `tabStock Entry Detail` - where - docstatus = 1 and project = %s - and (t_warehouse is null or t_warehouse = '')""", - project, - as_list=1, - ) - - amount = amount[0][0] if amount else 0 - additional_costs = frappe.db.sql( - """ select ifnull(sum(sed.base_amount), 0) - from - `tabStock Entry` se, `tabLanded Cost Taxes and Charges` sed - where - se.docstatus = 1 and se.project = %s and sed.parent = se.name - and se.purpose = 'Manufacture'""", - project, - as_list=1, - ) - - additional_cost_amt = additional_costs[0][0] if additional_costs else 0 - - amount += additional_cost_amt - project = frappe.get_doc("Project", project) - project.total_consumed_material_cost = amount - project.save() + project_doc = frappe.get_doc("Project", project) + project_doc.set_consumed_material_cost() + project_doc.save() def validate_item(self): - stock_items = self.get_stock_items() for item in self.get("items"): - if flt(item.qty) and flt(item.qty) < 0: - frappe.throw( - _("Row {0}: The item {1}, quantity must be positive number").format( - item.idx, frappe.bold(item.item_code) - ) - ) - - if item.item_code not in stock_items: - frappe.throw(_("{0} is not a stock Item").format(item.item_code)) - item_details = self.get_item_details( frappe._dict( { @@ -686,32 +458,7 @@ class StockEntry(StockController, SubcontractingInwardController): for_update=True, ) - reset_fields = ("stock_uom", "item_name") - for field in reset_fields: - item.set(field, item_details.get(field)) - - update_fields = ( - "uom", - "description", - "expense_account", - "cost_center", - "conversion_factor", - "barcode", - ) - - for field in update_fields: - if not item.get(field): - item.set(field, item_details.get(field)) - if field == "conversion_factor" and item.uom == item_details.get("stock_uom"): - item.set(field, item_details.get(field)) - - if not item.transfer_qty and item.qty: - item.transfer_qty = flt( - flt(item.qty) * flt(item.conversion_factor), self.precision("transfer_qty", item) - ) - - if self.purpose == "Subcontracting Delivery": - item.expense_account = frappe.get_value("Company", self.company, "default_expense_account") + item.validate_and_update_item_details(item_details, self.company, self.purpose) def validate_fg_completed_qty(self): if self.purpose != "Manufacture" or not self.from_bom: @@ -752,149 +499,7 @@ class StockEntry(StockController, SubcontractingInwardController): return for d in self.get("items"): - if not d.expense_account: - frappe.throw( - _( - "Please enter Difference Account or set default Stock Adjustment Account for company {0}" - ).format(frappe.bold(self.company)) - ) - - acc_details = frappe.get_cached_value( - "Account", - d.expense_account, - ["account_type", "report_type"], - as_dict=True, - ) - - if self.is_opening == "Yes" and acc_details.report_type == "Profit and Loss": - frappe.throw( - _( - "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" - ), - OpeningEntryAccountError, - ) - - if acc_details.account_type == "Stock": - frappe.throw( - _( - "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" - ).format(d.idx, get_link_to_form("Account", d.expense_account)), - title=_("Difference Account in Items Table"), - ) - - if ( - self.purpose not in ["Material Issue", "Subcontracting Delivery"] - and acc_details.account_type == "Cost of Goods Sold" - ): - frappe.msgprint( - _( - "At row #{0}: you have selected the Difference Account {1}, which is a Cost of Goods Sold type account. Please select a different account" - ).format(d.idx, bold(get_link_to_form("Account", d.expense_account))), - title=_("Cost of Goods Sold Account in Items Table"), - indicator="orange", - alert=1, - ) - - def validate_warehouse(self): - """perform various (sometimes conditional) validations on warehouse""" - - source_mandatory = [ - "Material Issue", - "Material Transfer", - "Send to Subcontractor", - "Material Transfer for Manufacture", - "Material Consumption for Manufacture", - "Return Raw Material to Customer", - "Subcontracting Delivery", - ] - - target_mandatory = [ - "Material Receipt", - "Material Transfer", - "Send to Subcontractor", - "Material Transfer for Manufacture", - "Receive from Customer", - "Subcontracting Return", - ] - - has_bom = any([d.bom_no for d in self.get("items")]) - - if self.purpose in source_mandatory and self.purpose not in target_mandatory: - self.to_warehouse = None - for d in self.get("items"): - d.t_warehouse = None - elif self.purpose in target_mandatory and self.purpose not in source_mandatory: - self.from_warehouse = None - for d in self.get("items"): - d.s_warehouse = None - - for d in self.get("items"): - if not d.s_warehouse and not d.t_warehouse: - d.s_warehouse = self.from_warehouse - d.t_warehouse = self.to_warehouse - - if self.purpose in source_mandatory and not d.s_warehouse: - if self.from_warehouse: - d.s_warehouse = self.from_warehouse - else: - frappe.throw(_("Source warehouse is mandatory for row {0}").format(d.idx)) - - if self.purpose in target_mandatory and not d.t_warehouse: - if self.to_warehouse: - d.t_warehouse = self.to_warehouse - else: - frappe.throw(_("Target warehouse is mandatory for row {0}").format(d.idx)) - - if self.purpose in ["Manufacture", "Repack"]: - if d.is_finished_item or d.type or d.is_legacy_scrap_item: - d.s_warehouse = None - if not d.t_warehouse: - frappe.throw(_("Target warehouse is mandatory for row {0}").format(d.idx)) - else: - d.t_warehouse = None - if not d.s_warehouse: - frappe.throw(_("Source warehouse is mandatory for row {0}").format(d.idx)) - - if self.purpose == "Disassemble": - if has_bom: - if d.is_finished_item or d.type or d.is_legacy_scrap_item: - d.t_warehouse = None - if not d.s_warehouse: - frappe.throw(_("Source warehouse is mandatory for row {0}").format(d.idx)) - else: - d.s_warehouse = None - if not d.t_warehouse: - frappe.throw(_("Target warehouse is mandatory for row {0}").format(d.idx)) - - if cstr(d.s_warehouse) == cstr(d.t_warehouse) and self.purpose not in [ - "Material Transfer for Manufacture", - "Material Transfer", - ]: - frappe.throw(_("Source and target warehouse cannot be same for row {0}").format(d.idx)) - - if not (d.s_warehouse or d.t_warehouse): - frappe.throw(_("At least one warehouse is mandatory")) - - def validate_work_order(self): - if self.purpose in ( - "Manufacture", - "Material Transfer for Manufacture", - "Material Consumption for Manufacture", - "Disassemble", - ): - # check if work order is entered - - if ( - (self.purpose == "Manufacture" or self.purpose == "Material Consumption for Manufacture") - and self.work_order - and frappe.get_cached_value("Work Order", self.work_order, "track_semi_finished_goods") != 1 - ): - if not self.fg_completed_qty: - frappe.throw(_("For Quantity (Manufactured Qty) is mandatory")) - self.check_if_operations_completed() - self.check_duplicate_entry_for_work_order() - elif self.purpose != "Material Transfer": - self.work_order = None + d.validate_expense_account(self.is_opening, self.purpose) def validate_source_stock_entry(self): if not self.get("source_stock_entry"): @@ -910,261 +515,12 @@ class StockEntry(StockController, SubcontractingInwardController): title=_("Work Order Mismatch"), ) - from erpnext.manufacturing.doctype.work_order.work_order import get_disassembly_available_qty - - available_qty = get_disassembly_available_qty(self.source_stock_entry, self.name) - - if flt(self.fg_completed_qty) > available_qty: - frappe.throw( - _( - "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." - ).format( - self.fg_completed_qty, - self.source_stock_entry, - available_qty, - ), - title=_("Excess Disassembly"), - ) - - def check_if_operations_completed(self): - """Check if Time Sheets are completed against before manufacturing to capture operating costs.""" - prod_order = frappe.get_doc("Work Order", self.work_order) - allowance_percentage = flt( - frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order") - ) - - for d in prod_order.get("operations"): - total_completed_qty = flt(self.fg_completed_qty) + flt(prod_order.produced_qty) - completed_qty = ( - d.completed_qty + d.process_loss_qty + (allowance_percentage / 100 * d.completed_qty) - ) - if flt(total_completed_qty, self.precision("fg_completed_qty")) > flt( - completed_qty, self.precision("fg_completed_qty") - ): - job_card = frappe.db.get_value("Job Card", {"operation_id": d.name}, "name") - if not job_card: - frappe.throw( - _("Work Order {0}: Job Card not found for the operation {1}").format( - self.work_order, d.operation - ) - ) - - work_order_link = get_link_to_form("Work Order", self.work_order) - job_card_link = get_link_to_form("Job Card", job_card) - frappe.throw( - _( - "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}." - ).format( - d.idx, - frappe.bold(d.operation), - frappe.bold(total_completed_qty), - work_order_link, - job_card_link, - ), - OperationsNotCompleteError, - ) - - def check_duplicate_entry_for_work_order(self): - other_ste = [ - t[0] - for t in frappe.db.get_values( - "Stock Entry", - { - "work_order": self.work_order, - "purpose": self.purpose, - "docstatus": ["!=", 2], - "name": ["!=", self.name], - }, - "name", - ) - ] - - if other_ste: - production_item, qty = frappe.db.get_value( - "Work Order", self.work_order, ["production_item", "qty"] - ) - args = [*other_ste, production_item] - fg_qty_already_entered = frappe.db.sql( - """select sum(transfer_qty) - from `tabStock Entry Detail` - where parent in ({}) - and item_code = {} - and ifnull(s_warehouse,'')='' """.format(", ".join(["%s" * len(other_ste)]), "%s"), - args, - )[0][0] - if fg_qty_already_entered and fg_qty_already_entered >= qty: - frappe.throw( - _("Stock Entries already created for Work Order {0}: {1}").format( - self.work_order, ", ".join(other_ste) - ), - DuplicateEntryForWorkOrderError, - ) - def set_actual_qty(self): - from erpnext.stock.stock_ledger import is_negative_stock_allowed - for d in self.get("items"): - allow_negative_stock = is_negative_stock_allowed(item_code=d.item_code) - previous_sle = get_previous_sle( - { - "item_code": d.item_code, - "warehouse": d.s_warehouse or d.t_warehouse, - "posting_date": self.posting_date, - "posting_time": self.posting_time, - } - ) - - # get actual stock at source warehouse - d.actual_qty = previous_sle.get("qty_after_transaction") or 0 - - # validate qty during submit - if ( - d.docstatus == 1 - and d.s_warehouse - and not allow_negative_stock - and flt(d.actual_qty, d.precision("actual_qty")) - < flt(d.transfer_qty, d.precision("actual_qty")) - ): - frappe.throw( - _( - "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" - ).format( - d.idx, - frappe.bold(d.s_warehouse), - formatdate(self.posting_date), - format_time(self.posting_time), - frappe.bold(d.item_code), - ) - + "

" - + _("Available quantity is {0}, you need {1}").format( - frappe.bold(flt(d.actual_qty, d.precision("actual_qty"))), frappe.bold(d.transfer_qty) - ), - NegativeStockError, - title=_("Insufficient Stock"), - ) - - def validate_component_and_quantities(self): - if self.purpose not in ["Manufacture", "Material Transfer for Manufacture"]: - return - - if not frappe.db.get_single_value("Manufacturing Settings", "validate_components_quantities_per_bom"): - return - - if not self.fg_completed_qty: - return - - raw_materials = self.get_bom_raw_materials(self.fg_completed_qty) - - precision = frappe.get_precision("Stock Entry Detail", "qty") - for item_code, details in raw_materials.items(): - item_code = item_code[0] if type(item_code) == tuple else item_code - if matched_item := self.get_matched_items(item_code): - if flt(details.get("qty"), precision) != flt(matched_item.qty, precision): - frappe.throw( - _( - "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." - ).format( - frappe.bold(item_code), - flt(details.get("qty")), - get_link_to_form("BOM", self.bom_no), - ), - title=_("Incorrect Component Quantity"), - ) - else: - frappe.throw( - _("According to the BOM {0}, the Item '{1}' is missing in the stock entry.").format( - get_link_to_form("BOM", self.bom_no), frappe.bold(item_code) - ), - title=_("Missing Item"), - ) - - def validate_same_source_target_warehouse_during_material_transfer(self): - """ - Validate Material Transfer entries where source and target warehouses are identical. - - For Material Transfer purpose, if an item has the same source and target warehouse, - require that at least one inventory dimension (if configured) differs between source - and target to ensure a meaningful transfer is occurring. - - Raises: - frappe.ValidationError: If warehouses are same and no inventory dimensions differ - """ - - if frappe.get_single_value("Stock Settings", "validate_material_transfer_warehouses"): - from erpnext.stock.doctype.inventory_dimension.inventory_dimension import get_inventory_dimensions - - inventory_dimensions = get_inventory_dimensions() - if self.purpose == "Material Transfer": - for item in self.items: - if cstr(item.s_warehouse) == cstr(item.t_warehouse): - if not inventory_dimensions: - frappe.throw( - _( - "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" - ).format(item.idx), - title=_("Invalid Source and Target Warehouse"), - ) - else: - difference_found = False - for dimension in inventory_dimensions: - fieldname = ( - dimension.source_fieldname - if dimension.source_fieldname.startswith("to_") - else f"to_{dimension.source_fieldname}" - ) - if ( - item.get(dimension.source_fieldname) - and item.get(fieldname) - and item.get(dimension.source_fieldname) != item.get(fieldname) - ): - difference_found = True - break - if not difference_found: - frappe.throw( - _( - "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" - ).format(item.idx), - title=_("Invalid Source and Target Warehouse"), - ) - - def get_matched_items(self, item_code): - items = [item for item in self.items if item.s_warehouse] - for row in items or self.get_consumed_items(): - if row.item_code == item_code or row.original_item == item_code: - return row - - return {} - - def get_consumed_items(self): - """Get all raw materials consumed through consumption entries""" - parent = frappe.qb.DocType("Stock Entry") - child = frappe.qb.DocType("Stock Entry Detail") - - query = ( - frappe.qb.from_(parent) - .join(child) - .on(parent.name == child.parent) - .select( - child.item_code, - Sum(child.qty).as_("qty"), - child.original_item, - ) - .where( - (parent.docstatus == 1) - & (parent.purpose == "Material Consumption for Manufacture") - & (parent.work_order == self.work_order) - ) - .groupby(child.item_code, child.original_item) - ) - - return query.run(as_dict=True) + d.set_actual_qty(self.posting_date, self.posting_time) @frappe.whitelist() def get_stock_and_rate(self): - """ - Updates rate and availability of all the items. - Called from Update Rate and Availability button. - """ self.set_work_order_details() self.set_transfer_qty() self.set_actual_qty() @@ -1421,266 +777,6 @@ class StockEntry(StockController, SubcontractingInwardController): if self.stock_entry_type and not self.purpose: self.purpose = frappe.get_cached_value("Stock Entry Type", self.stock_entry_type, "purpose") - def make_serial_and_batch_bundle_for_outward(self): - serial_or_batch_items = get_serial_or_batch_items(self.items) - if not serial_or_batch_items: - return - - serial_nos, batch_nos = self.set_serial_batch_fields_for_subcontracting_inward() - - if self.docstatus == 0: - return - - already_picked_serial_nos = [] - - for row in self.items: - if row.use_serial_batch_fields: - continue - - if not row.s_warehouse: - continue - - if row.item_code not in serial_or_batch_items: - continue - - bundle_doc = None - if row.serial_and_batch_bundle and abs(row.transfer_qty) != abs( - frappe.get_cached_value("Serial and Batch Bundle", row.serial_and_batch_bundle, "total_qty") - ): - bundle_doc = SerialBatchCreation( - { - "item_code": row.item_code, - "warehouse": row.s_warehouse, - "serial_and_batch_bundle": row.serial_and_batch_bundle, - "type_of_transaction": "Outward", - "ignore_serial_nos": already_picked_serial_nos, - "qty": row.transfer_qty * -1, - } - ).update_serial_and_batch_entries( - serial_nos=serial_nos.get(row.name), batch_nos=batch_nos.get(row.name) - ) - elif not row.serial_and_batch_bundle and frappe.get_single_value( - "Stock Settings", "auto_create_serial_and_batch_bundle_for_outward" - ): - bundle_doc = SerialBatchCreation( - { - "item_code": row.item_code, - "warehouse": row.s_warehouse, - "posting_datetime": get_combine_datetime(self.posting_date, self.posting_time), - "voucher_type": self.doctype, - "voucher_detail_no": row.name, - "qty": row.transfer_qty * -1, - "ignore_serial_nos": already_picked_serial_nos, - "type_of_transaction": "Outward", - "company": self.company, - "do_not_submit": True, - } - ).make_serial_and_batch_bundle( - serial_nos=serial_nos.get(row.name), batch_nos=batch_nos.get(row.name) - ) - - if not bundle_doc: - continue - - for entry in bundle_doc.entries: - if not entry.serial_no: - continue - - already_picked_serial_nos.append(entry.serial_no) - - row.serial_and_batch_bundle = bundle_doc.name - - def set_serial_batch_fields_for_subcontracting_inward(self): - serial_nos, batch_nos = frappe._dict(), frappe._dict() - for row in self.items: - if self.purpose in [ - "Return Raw Material to Customer", - "Subcontracting Delivery", - "Subcontracting Return", - ]: - if not row.serial_and_batch_bundle: - serial_nos_list, batch_nos_list = self.get_serial_nos_and_batches_from_sres( - row.scio_detail, only_pending=self.purpose != "Subcontracting Return" - ) - - if len(batch_nos_list) > 1: - row.use_serial_batch_fields = 0 - - if row.use_serial_batch_fields: - if serial_nos_list and not row.serial_no: - row.serial_no = "\n".join(serial_nos_list) - if batch_nos_list and not row.batch_no: - row.batch_no = next(iter(batch_nos_list.keys())) - - serial_nos[row.name], batch_nos[row.name] = serial_nos_list, batch_nos_list - - return serial_nos, batch_nos - - def validate_subcontract_order(self): - """Throw exception if more raw material is transferred against Subcontract Order than in - the raw materials supplied table""" - backflush_raw_materials_based_on = frappe.db.get_single_value( - "Buying Settings", "backflush_raw_materials_of_subcontract_based_on" - ) - - qty_allowance = flt(frappe.db.get_single_value("Buying Settings", "over_transfer_allowance")) - - if not (self.purpose == "Send to Subcontractor" and self.get(self.subcontract_data.order_field)): - return - - if backflush_raw_materials_based_on == "BOM": - subcontract_order = frappe.get_doc( - self.subcontract_data.order_doctype, self.get(self.subcontract_data.order_field) - ) - for se_item in self.items: - item_code = se_item.original_item or se_item.item_code - precision = cint(frappe.db.get_default("float_precision")) or 3 - required_qty = sum( - [ - flt(d.required_qty) - for d in subcontract_order.supplied_items - if d.rm_item_code == item_code - ] - ) - - total_allowed = required_qty + (required_qty * (qty_allowance / 100)) - - if not required_qty: - frappe.db.get_value( - f"{self.subcontract_data.order_doctype} Item", - { - "parent": self.get(self.subcontract_data.order_field), - "item_code": se_item.subcontracted_item, - }, - "bom", - ) - - if se_item.allow_alternative_item: - original_item_code = frappe.get_value( - "Item Alternative", {"alternative_item_code": item_code}, "item_code" - ) - - required_qty = sum( - [ - flt(d.required_qty) - for d in subcontract_order.supplied_items - if d.rm_item_code == original_item_code - ] - ) - - total_allowed = required_qty + (required_qty * (qty_allowance / 100)) - - if not required_qty: - frappe.throw( - _("Item {0} not found in 'Raw Materials Supplied' table in {1} {2}").format( - se_item.item_code, - self.subcontract_data.order_doctype, - self.get(self.subcontract_data.order_field), - ) - ) - - se = frappe.qb.DocType("Stock Entry") - se_detail = frappe.qb.DocType("Stock Entry Detail") - - total_supplied = ( - frappe.qb.from_(se) - .inner_join(se_detail) - .on(se.name == se_detail.parent) - .select(Sum(se_detail.transfer_qty)) - .where( - (se.purpose == "Send to Subcontractor") - & (se.docstatus == 1) - & (se_detail.item_code == se_item.item_code) - & ( - ( - (se.purchase_order == self.purchase_order) - & (se_detail.po_detail == se_item.po_detail) - ) - if self.subcontract_data.order_doctype == "Purchase Order" - else ( - (se.subcontracting_order == self.subcontracting_order) - & (se_detail.sco_rm_detail == se_item.sco_rm_detail) - ) - ) - ) - ).run()[0][0] or 0 - - total_returned = 0 - if self.subcontract_data.order_doctype == "Subcontracting Order": - total_returned = ( - frappe.qb.from_(se) - .inner_join(se_detail) - .on(se.name == se_detail.parent) - .select(Sum(se_detail.transfer_qty)) - .where( - (se.purpose == "Material Transfer") - & (se.docstatus == 1) - & (se.is_return == 1) - & (se_detail.item_code == se_item.item_code) - & (se_detail.sco_rm_detail == se_item.sco_rm_detail) - & (se.subcontracting_order == self.subcontracting_order) - ) - ).run()[0][0] or 0 - - if flt(total_supplied + se_item.transfer_qty - total_returned, precision) > flt( - total_allowed, precision - ): - frappe.throw( - _("Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}").format( - se_item.idx, - se_item.item_code, - total_allowed, - self.subcontract_data.order_doctype, - self.get(self.subcontract_data.order_field), - ) - ) - elif not se_item.get(self.subcontract_data.rm_detail_field): - filters = { - "parent": self.get(self.subcontract_data.order_field), - "docstatus": 1, - "rm_item_code": se_item.item_code, - "main_item_code": se_item.subcontracted_item, - } - - order_rm_detail = frappe.db.get_value( - self.subcontract_data.order_supplied_items_field, filters, "name" - ) - if order_rm_detail: - se_item.db_set(self.subcontract_data.rm_detail_field, order_rm_detail) - else: - if not se_item.allow_alternative_item: - frappe.throw( - _( - "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" - ).format( - se_item.idx, - se_item.item_code, - self.subcontract_data.order_doctype, - self.get(self.subcontract_data.order_field), - ) - ) - elif backflush_raw_materials_based_on == "Material Transferred for Subcontract": - for row in self.items: - if not row.subcontracted_item: - frappe.throw( - _("Row {0}: Subcontracted Item is mandatory for the raw material {1}").format( - row.idx, frappe.bold(row.item_code) - ) - ) - elif not row.get(self.subcontract_data.rm_detail_field): - filters = { - "parent": self.get(self.subcontract_data.order_field), - "docstatus": 1, - "rm_item_code": row.item_code, - "main_item_code": row.subcontracted_item, - } - - order_rm_detail = frappe.db.get_value( - self.subcontract_data.order_supplied_items_field, filters, "name" - ) - if order_rm_detail: - row.db_set(self.subcontract_data.rm_detail_field, order_rm_detail) - def validate_bom(self): for d in self.get("items"): if d.bom_no and d.is_finished_item: @@ -2064,45 +1160,12 @@ class StockEntry(StockController, SubcontractingInwardController): ) ) - def update_work_order(self): - def _validate_work_order(pro_doc): - msg, title = "", "" - if flt(pro_doc.docstatus) != 1: - msg = f"Work Order {self.work_order} must be submitted" - - if pro_doc.status == "Stopped": - msg = f"Transaction not allowed against stopped Work Order {self.work_order}" - - if msg: - frappe.throw(_(msg), title=title) - - if self.job_card: - job_doc = frappe.get_doc("Job Card", self.job_card) - if self.purpose != "Manufacture": - job_doc.set_transferred_qty(update_status=True) - job_doc.set_transferred_qty_in_job_card_item(self) - else: - job_doc.set_consumed_qty_in_job_card_item(self) - job_doc.set_manufactured_qty() - job_doc.update_work_order() - - if self.work_order: - pro_doc = frappe.get_doc("Work Order", self.work_order) - _validate_work_order(pro_doc) - - if self.fg_completed_qty: - if self.docstatus == 1: - pro_doc.add_additional_items(self) - else: - pro_doc.remove_additional_items(self) - - pro_doc.run_method("update_work_order_qty") - if self.purpose == "Manufacture": - pro_doc.run_method("update_planned_qty") - - pro_doc.run_method("update_status") - if not pro_doc.operations: - pro_doc.set_actual_dates() + @property + def pro_doc(self): + if not getattr(self, "_wo_doc", None): + if self.work_order: + self._wo_doc = frappe.get_doc("Work Order", self.work_order) + return getattr(self, "_wo_doc", None) def update_disassembled_order(self): if not self.work_order: @@ -2185,6 +1248,7 @@ class StockEntry(StockController, SubcontractingInwardController): item.stock_uom, item.description, item.image, + item.is_stock_item, item.item_name, item.item_group, item.has_batch_no, @@ -2234,6 +1298,7 @@ class StockEntry(StockController, SubcontractingInwardController): "has_batch_no": item.has_batch_no, "sample_quantity": item.sample_quantity, "expense_account": item.expense_account or item_group_defaults.get("expense_account"), + "is_stock_item": item.is_stock_item, } ) @@ -2313,475 +1378,19 @@ class StockEntry(StockController, SubcontractingInwardController): }, ) - def get_items_for_disassembly(self): - """Get items for Disassembly Order. - - Priority: - 1. From a specific Manufacture Stock Entry (exact reversal) - 2. From Work Order Manufacture Stock Entries (averaged reversal) - 3. From BOM (standalone disassembly) - """ - - # Auto-set source_stock_entry if WO has exactly one manufacture entry - if not self.get("source_stock_entry") and self.work_order: - manufacture_entries = frappe.get_all( - "Stock Entry", - filters={ - "work_order": self.work_order, - "purpose": "Manufacture", - "docstatus": 1, - }, - pluck="name", - limit_page_length=2, - ) - if len(manufacture_entries) == 1: - self.source_stock_entry = manufacture_entries[0] - - if self.get("source_stock_entry"): - return self._add_items_for_disassembly_from_stock_entry() - - if self.work_order: - return self._add_items_for_disassembly_from_work_order() - - return self._add_items_for_disassembly_from_bom() - - def _add_items_for_disassembly_from_stock_entry(self): - source_fg_qty = frappe.db.get_value("Stock Entry", self.source_stock_entry, "fg_completed_qty") - if not source_fg_qty: - frappe.throw( - _("Source Stock Entry {0} has no finished goods quantity").format(self.source_stock_entry) - ) - - disassemble_qty = flt(self.fg_completed_qty) - scale_factor = disassemble_qty / flt(source_fg_qty) - - self._append_disassembly_row_from_source( - disassemble_qty=disassemble_qty, - scale_factor=scale_factor, - ) - - def _add_items_for_disassembly_from_work_order(self): - wo_produced_qty = frappe.db.get_value("Work Order", self.work_order, "produced_qty") - - wo_produced_qty = flt(wo_produced_qty) - if wo_produced_qty <= 0: - frappe.throw(_("Work Order {0} has no produced qty").format(self.work_order)) - - disassemble_qty = flt(self.fg_completed_qty) - if disassemble_qty <= 0: - frappe.throw(_("Disassemble Qty cannot be less than or equal to 0.")) - - scale_factor = disassemble_qty / wo_produced_qty - - self._append_disassembly_row_from_source( - disassemble_qty=disassemble_qty, - scale_factor=scale_factor, - ) - - def _append_disassembly_row_from_source(self, disassemble_qty, scale_factor): - for source_row in self.get_items_from_manufacture_stock_entry(): - if source_row.is_finished_item: - qty = disassemble_qty - s_warehouse = self.from_warehouse or source_row.t_warehouse - t_warehouse = "" - elif source_row.s_warehouse: - # RM: was consumed FROM s_warehouse -> return TO s_warehouse - qty = flt(source_row.qty * scale_factor) - s_warehouse = "" - t_warehouse = self.to_warehouse or source_row.s_warehouse - else: - # Scrap/secondary: was produced TO t_warehouse -> take FROM t_warehouse - qty = flt(source_row.qty * scale_factor) - s_warehouse = source_row.t_warehouse - t_warehouse = "" - - item = { - "item_code": source_row.item_code, - "item_name": source_row.item_name, - "description": source_row.description, - "stock_uom": source_row.stock_uom, - "uom": source_row.uom, - "conversion_factor": source_row.conversion_factor, - "basic_rate": source_row.basic_rate, - "qty": qty, - "s_warehouse": s_warehouse, - "t_warehouse": t_warehouse, - "is_finished_item": source_row.is_finished_item, - "type": source_row.type, - "is_legacy_scrap_item": source_row.is_legacy_scrap_item, - "bom_secondary_item": source_row.bom_secondary_item, - "bom_no": source_row.bom_no, - # batch and serial bundles built on submit - "use_serial_batch_fields": 1 if (source_row.batch_no or source_row.serial_no) else 0, - } - - if self.source_stock_entry: - item.update( - { - "against_stock_entry": self.source_stock_entry, - "ste_detail": source_row.name, - } - ) - - self.append("items", item) - - def _add_items_for_disassembly_from_bom(self): - if not self.bom_no or not self.fg_completed_qty: - frappe.throw(_("BOM and Finished Good Quantity is mandatory for Disassembly")) - - # Raw Materials - item_dict = self.get_bom_raw_materials(self.fg_completed_qty) - - for item_row in item_dict.values(): - item_row["to_warehouse"] = self.to_warehouse - item_row["from_warehouse"] = "" - item_row["is_finished_item"] = 0 - - self.add_to_stock_entry_detail(item_dict) - - # Secondary/Scrap items (reverse of what set_secondary_items does for Manufacture) - secondary_items = self.get_secondary_items(self.fg_completed_qty) - if secondary_items: - scrap_warehouse = self.from_warehouse - if self.work_order: - wo_values = frappe.db.get_value( - "Work Order", self.work_order, ["scrap_warehouse", "fg_warehouse"], as_dict=True - ) - scrap_warehouse = wo_values.scrap_warehouse or scrap_warehouse or wo_values.fg_warehouse - - for item in secondary_items.values(): - item["from_warehouse"] = scrap_warehouse - item["to_warehouse"] = "" - item["is_finished_item"] = 0 - - if item.get("process_loss_per"): - item["qty"] -= flt( - item["qty"] * (item["process_loss_per"] / 100), - self.precision("fg_completed_qty"), - ) - - self.add_to_stock_entry_detail(secondary_items, bom_no=self.bom_no) - - # Finished goods - self.load_items_from_bom() - - def get_items_from_manufacture_stock_entry(self): - SE = frappe.qb.DocType("Stock Entry") - SED = frappe.qb.DocType("Stock Entry Detail") - query = frappe.qb.from_(SED).join(SE).on(SED.parent == SE.name).where(SE.docstatus == 1) - - common_fields = [ - SED.item_code, - SED.item_name, - SED.description, - SED.stock_uom, - SED.uom, - SED.basic_rate, - SED.conversion_factor, - SED.is_finished_item, - SED.type, - SED.is_legacy_scrap_item, - SED.bom_secondary_item, - SED.batch_no, - SED.serial_no, - SED.use_serial_batch_fields, - SED.s_warehouse, - SED.t_warehouse, - SED.bom_no, - ] - - if self.source_stock_entry: - return ( - query.select(SED.name, SED.qty, SED.transfer_qty, *common_fields) - .where(SE.name == self.source_stock_entry) - .orderby(SED.idx) - .run(as_dict=True) - ) - - return ( - query.select(Sum(SED.qty).as_("qty"), Sum(SED.transfer_qty).as_("transfer_qty"), *common_fields) - .where(SE.purpose == "Manufacture") - .where(SE.work_order == self.work_order) - .groupby(SED.item_code) - .orderby(SED.idx) - .run(as_dict=True) - ) - @frappe.whitelist() def get_items(self): self.set("items", []) - self.validate_work_order() - - if self.purpose == "Disassemble": - return self.get_items_for_disassembly() - - if not self.posting_date or not self.posting_time: - frappe.throw(_("Posting date and posting time is mandatory")) - - self.set_work_order_details() - backflush_based_on = frappe.db.get_single_value( - "Manufacturing Settings", "backflush_raw_materials_based_on" - ) - - if self.bom_no: - backflush_based_on = self.get_backflush_based_on() - - if self.purpose in [ - "Material Issue", - "Material Transfer", - "Manufacture", - "Repack", - "Send to Subcontractor", - "Material Transfer for Manufacture", - "Material Consumption for Manufacture", - ]: - if self.work_order and self.purpose == "Material Transfer for Manufacture": - item_dict = self.get_pending_raw_materials(backflush_based_on) - if self.to_warehouse and self.pro_doc: - for item in item_dict.values(): - item["to_warehouse"] = self.pro_doc.wip_warehouse - self.add_to_stock_entry_detail(item_dict) - - elif ( - self.work_order - and ( - self.purpose == "Manufacture" - or self.purpose == "Material Consumption for Manufacture" - ) - and not self.pro_doc.skip_transfer - and backflush_based_on == "Material Transferred for Manufacture" - ): - self.add_transfered_raw_materials_in_items() - - elif ( - self.work_order - and ( - self.purpose == "Manufacture" - or self.purpose == "Material Consumption for Manufacture" - ) - and backflush_based_on == "BOM" - and frappe.db.get_single_value("Manufacturing Settings", "material_consumption") == 1 - ): - self.get_unconsumed_raw_materials() - - else: - if not self.fg_completed_qty: - frappe.throw(_("Manufacturing Quantity is mandatory")) - - item_dict = self.get_bom_raw_materials(self.fg_completed_qty) - - # Get Subcontract Order Supplied Items Details - if ( - self.get(self.subcontract_data.order_field) - and self.purpose == "Send to Subcontractor" - ): - # Get Subcontract Order Supplied Items Details - parent = frappe.qb.DocType(self.subcontract_data.order_doctype) - child = frappe.qb.DocType(self.subcontract_data.order_supplied_items_field) - - item_wh = ( - frappe.qb.from_(parent) - .inner_join(child) - .on(parent.name == child.parent) - .select(child.rm_item_code, child.reserve_warehouse) - .where(parent.name == self.get(self.subcontract_data.order_field)) - ).run(as_list=True) - - item_wh = frappe._dict(item_wh) - - for original_item, item in item_dict.items(): - if self.pro_doc and cint(self.pro_doc.from_wip_warehouse): - item["from_warehouse"] = self.pro_doc.wip_warehouse - # Get Reserve Warehouse from Subcontract Order - if ( - self.get(self.subcontract_data.order_field) - and self.purpose == "Send to Subcontractor" - ): - item["from_warehouse"] = item_wh.get(item.item_code) - item["to_warehouse"] = ( - self.to_warehouse if self.purpose == "Send to Subcontractor" else "" - ) - - if isinstance(original_item, str) and original_item != item.get("item_code"): - item["original_item"] = original_item - - self.add_to_stock_entry_detail(item_dict) - - # fetch the serial_no of the first stock entry for the second stock entry - if self.work_order and self.purpose == "Manufacture": - work_order = frappe.get_doc("Work Order", self.work_order) - add_additional_cost(self, work_order) - - # add finished goods item - if self.purpose in ("Manufacture", "Repack"): - self.set_process_loss_qty() - self.load_items_from_bom() + if self.se_handler_class and hasattr(self.se_handler_class, "add_items"): + self.se_handler_class(self).add_items() self.set_serial_batch_from_reserved_entry() - self.set_secondary_items() self.set_actual_qty() self.validate_customer_provided_item() self.calculate_rate_and_amount(raise_error_if_no_rate=False) def set_serial_batch_from_reserved_entry(self): - if self.work_order and frappe.get_cached_value("Work Order", self.work_order, "reserve_stock"): - skip_transfer = frappe.get_cached_value("Work Order", self.work_order, "skip_transfer") - - if ( - self.purpose not in ["Material Transfer for Manufacture"] - and self.get_backflush_based_on() != "BOM" - and not skip_transfer - ): - return - - reservation_entries = self.get_available_reserved_materials() - if not reservation_entries: - return - - new_items_to_add = [] - for d in self.items: - if d.serial_and_batch_bundle or d.serial_no or d.batch_no: - continue - - key = (d.item_code, d.s_warehouse) - if details := reservation_entries.get(key): - original_qty = d.qty - if batches := details.get("batch_no"): - for batch_no, qty in batches.items(): - if original_qty <= 0: - break - - if qty <= 0: - continue - - if d.batch_no and original_qty > 0: - new_row = frappe.copy_doc(d) - new_row.name = None - new_row.batch_no = batch_no - new_row.qty = qty - new_row.idx = d.idx + 1 - if new_row.batch_no and details.get("batchwise_sn"): - new_row.serial_no = "\n".join( - details.get("batchwise_sn")[new_row.batch_no][: cint(new_row.qty)] - ) - - new_items_to_add.append(new_row) - original_qty -= qty - batches[batch_no] -= qty - - if qty >= d.qty and not d.batch_no: - d.batch_no = batch_no - batches[batch_no] -= d.qty - if d.batch_no and details.get("batchwise_sn"): - d.serial_no = "\n".join( - details.get("batchwise_sn")[d.batch_no][: cint(d.qty)] - ) - elif not d.batch_no: - d.batch_no = batch_no - d.qty = qty - original_qty -= qty - batches[batch_no] = 0 - - if d.batch_no and details.get("batchwise_sn"): - d.serial_no = "\n".join( - details.get("batchwise_sn")[d.batch_no][: cint(d.qty)] - ) - - if details.get("serial_no"): - d.serial_no = "\n".join(details.get("serial_no")[: cint(d.qty)]) - - d.use_serial_batch_fields = 1 - - for new_row in new_items_to_add: - self.append("items", new_row) - - sorted_items = sorted(self.items, key=lambda x: x.item_code) - if self.purpose == "Manufacture": - # ensure finished item at last - sorted_items = sorted(sorted_items, key=lambda x: x.t_warehouse) - - idx = 0 - for row in sorted_items: - idx += 1 - row.idx = idx - self.set("items", sorted_items) - - def get_backflush_based_on(self): - from erpnext.manufacturing.doctype.bom.bom import get_backflush_based_on - - return get_backflush_based_on(self.bom_no) - - def get_available_reserved_materials(self): - reserved_entries = self.get_reserved_materials() - if not reserved_entries: - return {} - - itemwise_serial_batch_qty = frappe._dict() - - for d in reserved_entries: - key = (d.item_code, d.warehouse) - if key not in itemwise_serial_batch_qty: - itemwise_serial_batch_qty[key] = frappe._dict( - { - "serial_no": [], - "batch_no": defaultdict(float), - "batchwise_sn": defaultdict(list), - } - ) - - details = itemwise_serial_batch_qty[key] - if d.batch_no: - details.batch_no[d.batch_no] += d.qty - if d.serial_no: - details.batchwise_sn[d.batch_no].extend(d.serial_no.split("\n")) - elif d.serial_no: - details.serial_no.append(d.serial_no) - - return itemwise_serial_batch_qty - - def get_reserved_materials(self): - doctype = frappe.qb.DocType("Stock Reservation Entry") - serial_batch_doc = frappe.qb.DocType("Serial and Batch Entry") - - query = ( - frappe.qb.from_(doctype) - .inner_join(serial_batch_doc) - .on(doctype.name == serial_batch_doc.parent) - .select( - serial_batch_doc.serial_no, - serial_batch_doc.batch_no, - serial_batch_doc.qty, - doctype.item_code, - doctype.warehouse, - doctype.name, - doctype.transferred_qty, - doctype.consumed_qty, - ) - .where( - (doctype.docstatus == 1) - & (doctype.voucher_no == (self.work_order or self.subcontracting_order)) - & (serial_batch_doc.delivered_qty < serial_batch_doc.qty) - ) - .orderby(serial_batch_doc.idx) - ) - - return query.run(as_dict=True) - - def set_secondary_items(self): - if self.purpose in ["Manufacture", "Repack"]: - secondary_items_dict = self.get_secondary_items(self.fg_completed_qty) - for item in secondary_items_dict.values(): - if self.pro_doc and item.type: - if self.pro_doc.scrap_warehouse and item.type == "Scrap": - item["to_warehouse"] = self.pro_doc.scrap_warehouse - - if item.process_loss_per: - item["qty"] -= flt( - item["qty"] * (item.process_loss_per / 100), - self.precision("fg_completed_qty"), - ) - - self.add_to_stock_entry_detail(secondary_items_dict, bom_no=self.bom_no) + StockEntrySABB(self).set_serial_batch_based_on_reservation() def set_process_loss_qty(self): if self.purpose not in ("Manufacture", "Repack"): @@ -2819,108 +1428,14 @@ class StockEntry(StockController, SubcontractingInwardController): ) def set_work_order_details(self): - if not getattr(self, "pro_doc", None): - self.pro_doc = frappe._dict() - if self.work_order: # common validations - if not self.pro_doc: - self.pro_doc = frappe.get_doc("Work Order", self.work_order) - if self.pro_doc and not self.pro_doc.track_semi_finished_goods: self.bom_no = self.pro_doc.bom_no else: # invalid work order self.work_order = None - def load_items_from_bom(self): - if self.work_order: - item_code = self.pro_doc.production_item - to_warehouse = self.pro_doc.fg_warehouse - else: - item_code = frappe.db.get_value("BOM", self.bom_no, "item") - to_warehouse = self.to_warehouse - - item = get_item_defaults(item_code, self.company) - - if not self.work_order and not to_warehouse: - # in case of BOM - to_warehouse = item.get("default_warehouse") - - expense_account = item.get("expense_account") - if not expense_account: - expense_account = frappe.get_cached_value("Company", self.company, "stock_adjustment_account") - - args = { - "to_warehouse": to_warehouse, - "from_warehouse": "", - "qty": flt(self.fg_completed_qty) - flt(self.process_loss_qty), - "item_name": item.item_name, - "description": item.description, - "stock_uom": item.stock_uom, - "expense_account": expense_account, - "cost_center": item.get("buying_cost_center"), - "is_finished_item": 1, - "sample_quantity": item.get("sample_quantity"), - } - - if self.purpose == "Disassemble": - args.update( - { - "from_warehouse": self.from_warehouse, - "to_warehouse": "", - "qty": flt(self.fg_completed_qty), - } - ) - - if ( - self.work_order - and self.pro_doc.has_batch_no - and not self.pro_doc.has_serial_no - and cint( - frappe.db.get_single_value( - "Manufacturing Settings", "make_serial_no_batch_from_work_order", cache=True - ) - ) - ): - self.set_batchwise_finished_goods(args, item) - else: - self.add_finished_goods(args, item) - - def set_batchwise_finished_goods(self, args, item): - batches = get_empty_batches_based_work_order(self.work_order, self.pro_doc.production_item) - - if not batches: - self.add_finished_goods(args, item) - else: - self.add_batchwise_finished_good(batches, args, item) - - def add_batchwise_finished_good(self, batches, args, item): - qty = flt(self.fg_completed_qty) - row = frappe._dict({"batches_to_be_consume": defaultdict(float)}) - - self.update_batches_to_be_consume(batches, row, qty) - - if not row.batches_to_be_consume: - return - - id = create_serial_and_batch_bundle( - self, - row, - frappe._dict( - { - "item_code": self.pro_doc.production_item, - "warehouse": args.get("to_warehouse"), - } - ), - ) - - args["serial_and_batch_bundle"] = id - self.add_finished_goods(args, item) - - def add_finished_goods(self, args, item): - self.add_to_stock_entry_detail({item.name: args}, bom_no=self.bom_no) - def get_bom_raw_materials(self, qty): from erpnext.manufacturing.doctype.bom.bom import get_bom_items_as_dict @@ -2969,522 +1484,6 @@ class StockEntry(StockController, SubcontractingInwardController): return item_dict - def get_secondary_items(self, qty): - from erpnext.manufacturing.doctype.bom.bom import get_bom_items_as_dict - - if ( - frappe.db.get_single_value( - "Manufacturing Settings", "set_op_cost_and_secondary_items_from_sub_assemblies" - ) - and self.work_order - and frappe.get_cached_value("Work Order", self.work_order, "use_multi_level_bom") - ): - item_dict = get_secondary_items_from_sub_assemblies(self.bom_no, self.company, qty) - else: - # item dict = { item_code: {qty, description, stock_uom} } - item_dict = ( - get_bom_items_as_dict( - self.bom_no, self.company, qty=qty, fetch_exploded=0, fetch_secondary_items=1 - ) - or {} - ) - - for item in item_dict.values(): - item.from_warehouse = "" - - return item_dict - - def set_secondary_items_from_job_card(self): - if self.purpose not in ["Manufacture", "Repack"]: - return - - item_dict = {} - for row in self.get_secondary_items_from_job_card(): - if row.stock_qty <= 0: - continue - - item_dict[row.item_code] = frappe._dict( - { - "uom": row.stock_uom, - "from_warehouse": "", - "qty": row.stock_qty, - "conversion_factor": 1, - "type": row.type, - "item_name": row.item_name, - "description": row.description, - "bom_secondary_item": row.bom_secondary_item, - } - ) - - for item in item_dict.values(): - item.from_warehouse = "" - - self.add_to_stock_entry_detail(item_dict) - - def get_secondary_items_from_job_card(self): - if not hasattr(self, "pro_doc"): - self.pro_doc = None - - if not self.pro_doc: - self.set_work_order_details() - - if not self.pro_doc.operations: - return [] - - job_card = frappe.qb.DocType("Job Card") - job_card_secondary_item = frappe.qb.DocType("Job Card Secondary Item") - - other = ( - frappe.qb.from_(job_card) - .select( - Sum(job_card_secondary_item.stock_qty).as_("stock_qty"), - job_card_secondary_item.item_code, - job_card_secondary_item.item_name, - job_card_secondary_item.description, - job_card_secondary_item.stock_uom, - job_card_secondary_item.type, - job_card_secondary_item.bom_secondary_item, - ) - .join(job_card_secondary_item) - .on(job_card_secondary_item.parent == job_card.name) - .where( - (job_card_secondary_item.item_code.isnotnull()) - & (job_card.work_order == self.work_order) - & (job_card.docstatus == 1) - ) - .groupby(job_card_secondary_item.item_code, job_card_secondary_item.type) - .orderby(job_card_secondary_item.idx) - ) - - if self.job_card: - other = other.where(job_card.name == self.job_card) - - other = other.run(as_dict=1) - - if self.job_card: - pending_qty = flt(self.fg_completed_qty) - else: - pending_qty = flt(self.get_completed_job_card_qty()) - flt(self.pro_doc.produced_qty) - - used_secondary_items = self.get_used_secondary_items() - for row in other: - row.stock_qty -= flt(used_secondary_items.get(row.item_code)) - row.stock_qty = (row.stock_qty) * flt(self.fg_completed_qty) / flt(pending_qty) - - if used_secondary_items.get(row.item_code): - used_secondary_items[row.item_code] -= row.stock_qty - - if cint(frappe.get_cached_value("UOM", row.stock_uom, "must_be_whole_number")): - row.stock_qty = frappe.utils.ceil(row.stock_qty) - - return other - - def get_completed_job_card_qty(self): - return flt(min([d.completed_qty for d in self.pro_doc.operations])) - - def get_used_secondary_items(self): - used_secondary_items = defaultdict(float) - - StockEntry = frappe.qb.DocType("Stock Entry") - StockEntryDetail = frappe.qb.DocType("Stock Entry Detail") - data = ( - frappe.qb.from_(StockEntry) - .inner_join(StockEntryDetail) - .on(StockEntryDetail.parent == StockEntry.name) - .select(StockEntryDetail.item_code, StockEntryDetail.qty) - .where( - (StockEntry.work_order == self.work_order) - & ((StockEntryDetail.type.isnotnull()) | (StockEntryDetail.is_legacy_scrap_item == 1)) - & (StockEntry.docstatus == 1) - & (StockEntry.purpose.isin(["Repack", "Manufacture"])) - ) - ).run(as_dict=1) - - for row in data: - used_secondary_items[row.item_code] += row.qty - - return used_secondary_items - - def get_unconsumed_raw_materials(self): - wo = frappe.get_doc("Work Order", self.work_order) - wo_items = frappe.get_all( - "Work Order Item", - filters={"parent": self.work_order}, - fields=["item_code", "source_warehouse", "required_qty", "consumed_qty", "transferred_qty"], - ) - - work_order_qty = wo.material_transferred_for_manufacturing or wo.qty - for item in wo_items: - item_account_details = get_item_defaults(item.item_code, self.company) - # Take into account consumption if there are any. - - wo_item_qty = item.transferred_qty or item.required_qty - - wo_qty_unconsumed = flt(wo_item_qty) - flt(item.consumed_qty) - wo_qty_to_produce = flt(work_order_qty) - flt(wo.produced_qty) - bom_qty_per_unit = item.required_qty / wo.qty # per-unit BOM qty - - req_qty_each = (wo_qty_unconsumed) / (wo_qty_to_produce or 1) - req_qty_each = min(req_qty_each, bom_qty_per_unit) - - qty = req_qty_each * flt(self.fg_completed_qty) - - if qty > 0: - self.add_to_stock_entry_detail( - { - item.item_code: { - "from_warehouse": wo.wip_warehouse or item.source_warehouse, - "to_warehouse": "", - "qty": qty, - "item_name": item.item_name, - "description": item.description, - "stock_uom": item_account_details.stock_uom, - "expense_account": item_account_details.get("expense_account"), - "cost_center": item_account_details.get("buying_cost_center"), - } - } - ) - - def add_transfered_raw_materials_in_items(self) -> None: - available_materials = get_available_materials(self.work_order) - wo_data = frappe.db.get_value( - "Work Order", - self.work_order, - ["qty", "produced_qty", "material_transferred_for_manufacturing as trans_qty"], - as_dict=1, - ) - - precision = frappe.get_precision("Stock Entry Detail", "qty") - for _key, row in available_materials.items(): - remaining_qty_to_produce = flt(wo_data.trans_qty) - flt(wo_data.produced_qty) - if remaining_qty_to_produce <= 0 and not self.is_return: - continue - - qty = flt(row.qty) - if not self.is_return: - qty = (flt(row.qty) * flt(self.fg_completed_qty)) / remaining_qty_to_produce - - item = row.item_details - if cint(frappe.get_cached_value("UOM", item.stock_uom, "must_be_whole_number")): - qty = frappe.utils.ceil(qty) - - if row.batch_details: - row.batches_to_be_consume = defaultdict(float) - batches = row.batch_details - self.update_batches_to_be_consume(batches, row, qty) - - elif row.serial_nos: - serial_nos = row.serial_nos[0 : cint(qty)] - row.serial_nos = serial_nos - - if flt(qty, precision) != 0.0: - self.update_item_in_stock_entry_detail(row, item, qty) - - def update_batches_to_be_consume(self, batches, row, qty): - qty_to_be_consumed = qty - batches = sorted(batches.items(), key=lambda x: x[0]) - - for batch_no, batch_qty in batches: - if qty_to_be_consumed <= 0 or batch_qty <= 0: - continue - - if batch_qty > qty_to_be_consumed: - batch_qty = qty_to_be_consumed - - row.batches_to_be_consume[batch_no] += batch_qty - - if batch_no and row.serial_nos: - serial_nos = self.get_serial_nos_based_on_transferred_batch(batch_no, row.serial_nos) - serial_nos = serial_nos[0 : cint(batch_qty)] - - # remove consumed serial nos from list - for sn in serial_nos: - row.serial_nos.remove(sn) - - if "batch_details" in row: - row.batch_details[batch_no] -= batch_qty - - qty_to_be_consumed -= batch_qty - - def update_item_in_stock_entry_detail(self, row, item, qty) -> None: - if not qty: - return - - use_serial_batch_fields = frappe.get_single_value("Stock Settings", "use_serial_batch_fields") - - ste_item_details = { - "from_warehouse": item.warehouse, - "to_warehouse": "", - "qty": qty, - "item_name": item.item_name, - "serial_and_batch_bundle": create_serial_and_batch_bundle(self, row, item, "Outward") - if not use_serial_batch_fields - else "", - "description": item.description, - "stock_uom": item.stock_uom, - "expense_account": item.expense_account, - "cost_center": item.buying_cost_center, - "original_item": item.original_item, - "serial_no": "\n".join(row.serial_nos) - if row.serial_nos and not row.batches_to_be_consume - else "", - "use_serial_batch_fields": use_serial_batch_fields, - } - - if self.is_return: - ste_item_details["to_warehouse"] = item.s_warehouse - - if use_serial_batch_fields and not row.serial_no and row.batches_to_be_consume: - for batch_no, batch_qty in row.batches_to_be_consume.items(): - ste_item_details.update( - { - "batch_no": batch_no, - "qty": batch_qty, - } - ) - - if row.serial_nos: - serial_nos = row.serial_nos[0 : cint(batch_qty)] - ste_item_details["serial_no"] = "\n".join(serial_nos) - - row.serial_nos = [sn for sn in row.serial_nos if sn not in serial_nos] - - self.add_to_stock_entry_detail({item.item_code: ste_item_details}) - else: - self.add_to_stock_entry_detail({item.item_code: ste_item_details}) - - @staticmethod - def get_serial_nos_based_on_transferred_batch(batch_no, serial_nos) -> list: - serial_nos = frappe.get_all( - "Serial No", - filters={"batch_no": batch_no, "name": ("in", serial_nos), "warehouse": ("is", "not set")}, - order_by="creation", - ) - - return [d.name for d in serial_nos] - - def get_pending_raw_materials(self, backflush_based_on=None): - """ - issue (item quantity) that is pending to issue or desire to transfer, - whichever is less - """ - item_dict = self.get_pro_order_required_items(backflush_based_on) - - max_qty = flt(self.pro_doc.qty) - - allow_overproduction = False - overproduction_percentage = flt( - frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order") - ) - - transfer_extra_materials_percentage = flt( - frappe.db.get_single_value("Manufacturing Settings", "transfer_extra_materials_percentage") - ) - - to_transfer_qty = flt(self.pro_doc.material_transferred_for_manufacturing) + flt( - self.fg_completed_qty - ) - transfer_limit_qty = max_qty + ((max_qty * overproduction_percentage) / 100) - if transfer_extra_materials_percentage: - transfer_limit_qty = max_qty + ((max_qty * transfer_extra_materials_percentage) / 100) - - if transfer_limit_qty >= to_transfer_qty: - allow_overproduction = True - - for item, item_details in item_dict.items(): - pending_to_issue = flt(item_details.required_qty) - flt(item_details.transferred_qty) - desire_to_transfer = flt(self.fg_completed_qty) * flt(item_details.required_qty) / max_qty - - if ( - desire_to_transfer <= pending_to_issue - or (desire_to_transfer > 0 and backflush_based_on == "Material Transferred for Manufacture") - or allow_overproduction - ): - # "No need for transfer but qty still pending to transfer" case can occur - # when transferring multiple RM in different Stock Entries - item_dict[item]["qty"] = desire_to_transfer if (desire_to_transfer > 0) else pending_to_issue - elif pending_to_issue > 0: - item_dict[item]["qty"] = pending_to_issue - else: - item_dict[item]["qty"] = 0 - - # delete items with 0 qty - list_of_items = list(item_dict.keys()) - for item in list_of_items: - if not item_dict[item]["qty"]: - del item_dict[item] - - # show some message - if not len(item_dict): - frappe.msgprint(_("""All items have already been transferred for this Work Order.""")) - - return item_dict - - def get_pro_order_required_items(self, backflush_based_on=None): - """ - Gets Work Order Required Items only if Stock Entry purpose is **Material Transferred for Manufacture**. - """ - item_dict, job_card_items = frappe._dict(), [] - work_order = frappe.get_doc("Work Order", self.work_order) - - consider_job_card = work_order.transfer_material_against == "Job Card" and self.get("job_card") - if consider_job_card: - job_card_items = self.get_job_card_item_codes(self.get("job_card")) - - if not frappe.db.get_value("Warehouse", work_order.wip_warehouse, "is_group"): - wip_warehouse = work_order.wip_warehouse - else: - wip_warehouse = None - - transfer_extra_materials_percentage = flt( - frappe.db.get_single_value("Manufacturing Settings", "transfer_extra_materials_percentage") - ) - - for d in work_order.get("required_items"): - if consider_job_card and (d.item_code not in job_card_items): - continue - - additional_qty = 0.0 - if transfer_extra_materials_percentage: - additional_qty = transfer_extra_materials_percentage * flt(d.required_qty) / 100 - - transfer_pending = flt(d.required_qty) > flt(d.transferred_qty) - if additional_qty: - transfer_pending = (flt(d.required_qty) + additional_qty) > flt(d.transferred_qty) - - can_transfer = transfer_pending or (backflush_based_on == "Material Transferred for Manufacture") - - if not can_transfer: - continue - - if d.include_item_in_manufacturing: - item_row = d.as_dict() - item_row["idx"] = len(item_dict) + 1 - - if consider_job_card: - job_card_item = frappe.db.get_value( - "Job Card Item", {"item_code": d.item_code, "parent": self.get("job_card")} - ) - item_row["job_card_item"] = job_card_item or None - - if d.source_warehouse and not frappe.db.get_value( - "Warehouse", d.source_warehouse, "is_group" - ): - item_row["from_warehouse"] = d.source_warehouse - - item_row["to_warehouse"] = wip_warehouse - if item_row["allow_alternative_item"]: - item_row["allow_alternative_item"] = work_order.allow_alternative_item - - item_dict.setdefault(d.item_code, item_row) - - return item_dict - - def get_job_card_item_codes(self, job_card=None): - if not job_card: - return [] - - job_card_items = frappe.get_all( - "Job Card Item", filters={"parent": job_card}, fields=["item_code"], distinct=True - ) - return [d.item_code for d in job_card_items] - - def add_to_stock_entry_detail(self, item_dict, bom_no=None): - precision = frappe.get_precision("Stock Entry Detail", "qty") - for d in item_dict: - item_row = item_dict[d] - - child_qty = flt(item_row["qty"], precision) - if ( - not self.is_return - and child_qty <= 0 - and not item_row.get("type") - and not item_row.get("is_legacy_scrap_item") - ): - if self.purpose not in ["Receive from Customer", "Send to Subcontractor"]: - continue - - se_child = self.append("items") - stock_uom = item_row.get("stock_uom") or frappe.db.get_value("Item", d, "stock_uom") - se_child.s_warehouse = item_row.get("from_warehouse") - se_child.t_warehouse = item_row.get("to_warehouse") - se_child.item_code = item_row.get("item_code") or cstr(d) - se_child.uom = item_row["uom"] if item_row.get("uom") else stock_uom - se_child.stock_uom = stock_uom - se_child.qty = child_qty if child_qty > 0 else 0 - se_child.allow_alternative_item = item_row.get("allow_alternative_item", 0) - se_child.subcontracted_item = item_row.get("main_item_code") - se_child.cost_center = item_row.get("cost_center") or get_default_cost_center( - item_row, company=self.company - ) - se_child.is_finished_item = item_row.get("is_finished_item", 0) - se_child.po_detail = item_row.get("po_detail") - se_child.sco_rm_detail = item_row.get("sco_rm_detail") - se_child.scio_detail = item_row.get("scio_detail") - se_child.sample_quantity = item_row.get("sample_quantity", 0) - se_child.type = item_row.get("type") - se_child.is_legacy_scrap_item = item_row.get("is_legacy") - se_child.bom_secondary_item = item_row.get("name") or item_row.get("bom_secondary_item") - - for field in [ - self.subcontract_data.rm_detail_field, - "original_item", - "expense_account", - "description", - "item_name", - "serial_and_batch_bundle", - "allow_zero_valuation_rate", - "use_serial_batch_fields", - "batch_no", - "serial_no", - ]: - if item_row.get(field): - se_child.set(field, item_row.get(field)) - - if se_child.s_warehouse is None: - se_child.s_warehouse = self.from_warehouse - if se_child.t_warehouse is None: - se_child.t_warehouse = self.to_warehouse - - # in stock uom - se_child.conversion_factor = flt(item_row.get("conversion_factor")) or 1 - se_child.transfer_qty = flt( - item_row["qty"] * se_child.conversion_factor, se_child.precision("qty") - ) - - se_child.bom_no = bom_no # to be assigned for finished item - se_child.job_card_item = item_row.get("job_card_item") if self.get("job_card") else None - - def validate_with_material_request(self): - for item in self.get("items"): - material_request = item.material_request or None - material_request_item = item.material_request_item or None - if self.purpose == "Material Transfer" and self.outgoing_stock_entry: - parent_se = frappe.get_value( - "Stock Entry Detail", - item.ste_detail, - ["material_request", "material_request_item"], - as_dict=True, - ) - if parent_se: - material_request = parent_se.material_request - material_request_item = parent_se.material_request_item - - if material_request: - mreq_item = frappe.db.get_value( - "Material Request Item", - {"name": material_request_item, "parent": material_request}, - ["item_code", "warehouse", "idx"], - as_dict=True, - ) - if mreq_item.item_code != item.item_code: - frappe.throw( - _("Item for row {0} does not match Material Request").format(item.idx), - frappe.MappingMismatchError, - ) - elif self.purpose == "Material Transfer" and self.add_to_transit: - continue - def validate_batch(self): if self.purpose in [ "Material Transfer for Manufacture", @@ -3493,133 +1492,7 @@ class StockEntry(StockController, SubcontractingInwardController): "Send to Subcontractor", ]: for item in self.get("items"): - if item.batch_no: - disabled = frappe.db.get_value("Batch", item.batch_no, "disabled") - if disabled == 0: - expiry_date = frappe.db.get_value("Batch", item.batch_no, "expiry_date") - if expiry_date: - if getdate(self.posting_date) > getdate(expiry_date): - frappe.throw( - _("Batch {0} of Item {1} has expired.").format( - item.batch_no, item.item_code - ) - ) - else: - frappe.throw( - _("Batch {0} of Item {1} is disabled.").format(item.batch_no, item.item_code) - ) - - def update_subcontract_order_supplied_items(self): - if self.get(self.subcontract_data.order_field) and ( - self.purpose in ["Send to Subcontractor", "Material Transfer"] or self.is_return - ): - # Get Subcontract Order Supplied Items Details - order_supplied_items = frappe.db.get_all( - self.subcontract_data.order_supplied_items_field, - filters={"parent": self.get(self.subcontract_data.order_field)}, - fields=["name", "rm_item_code", "reserve_warehouse"], - ) - - # Get Items Supplied in Stock Entries against Subcontract Order - supplied_items = get_supplied_items( - self.get(self.subcontract_data.order_field), - self.subcontract_data.rm_detail_field, - self.subcontract_data.order_field, - ) - - for row in order_supplied_items: - key, item = row.name, {} - if not supplied_items.get(key): - # no stock transferred against Subcontract Order Supplied Items row - item = {"supplied_qty": 0, "returned_qty": 0, "total_supplied_qty": 0} - else: - item = supplied_items.get(key) - - frappe.db.set_value(self.subcontract_data.order_supplied_items_field, row.name, item) - - # RM Item-Reserve Warehouse Dict - item_wh = {x.get("rm_item_code"): x.get("reserve_warehouse") for x in order_supplied_items} - - for d in self.get("items"): - # Update reserved sub contracted quantity in bin based on Supplied Item Details and - item_code = d.get("original_item") or d.get("item_code") - reserve_warehouse = item_wh.get(item_code) - if not (reserve_warehouse and item_code): - continue - stock_bin = get_bin(item_code, reserve_warehouse) - stock_bin.update_reserved_qty_for_sub_contracting() - - def update_transferred_qty(self): - if self.purpose == "Material Transfer" and self.outgoing_stock_entry: - stock_entries = {} - stock_entries_child_list = [] - for d in self.items: - if not (d.against_stock_entry and d.ste_detail): - continue - - stock_entries_child_list.append(d.ste_detail) - transferred_qty = frappe.get_all( - "Stock Entry Detail", - fields=[{"SUM": "transfer_qty", "as": "qty"}], - filters={ - "against_stock_entry": d.against_stock_entry, - "ste_detail": d.ste_detail, - "docstatus": 1, - }, - ) - - if d.docstatus == 1: - transfer_qty = frappe.get_value("Stock Entry Detail", d.ste_detail, "transfer_qty") - - if transferred_qty and transferred_qty[0]: - if transferred_qty[0].qty > transfer_qty: - frappe.throw( - _( - "Row {0}: Transferred quantity cannot be greater than the requested quantity." - ).format(d.idx) - ) - - stock_entries[(d.against_stock_entry, d.ste_detail)] = ( - transferred_qty[0].qty if transferred_qty and transferred_qty[0] else 0.0 - ) or 0.0 - - if not stock_entries: - return None - - cond = "" - for data, transferred_qty in stock_entries.items(): - cond += """ WHEN (parent = {} and name = {}) THEN {} - """.format( - frappe.db.escape(data[0]), - frappe.db.escape(data[1]), - transferred_qty, - ) - - if stock_entries_child_list: - frappe.db.sql( - """ UPDATE `tabStock Entry Detail` - SET - transferred_qty = CASE {cond} END - WHERE - name in ({ste_details}) """.format( - cond=cond, ste_details=",".join(["%s"] * len(stock_entries_child_list)) - ), - tuple(stock_entries_child_list), - ) - - args = { - "source_dt": "Stock Entry Detail", - "target_field": "transferred_qty", - "target_ref_field": "qty", - "target_dt": "Stock Entry Detail", - "join_field": "ste_detail", - "target_parent_dt": "Stock Entry", - "target_parent_field": "per_transferred", - "source_field": "qty", - "percent_join_field": "against_stock_entry", - } - - self._update_percent_field_in_targets(args, update_modified=True) + item.validate_batch() def update_quality_inspection(self): if self.inspection_required: @@ -3636,78 +1509,6 @@ class StockEntry(StockController, SubcontractingInwardController): {"reference_type": reference_type, "reference_name": reference_name}, ) - def set_material_request_transfer_status(self, status): - material_requests = [] - if self.outgoing_stock_entry: - parent_se = frappe.get_value("Stock Entry", self.outgoing_stock_entry, "add_to_transit") - - for item in self.items: - material_request = item.get("material_request") - if self.purpose == "Material Transfer" and material_request not in material_requests: - if self.outgoing_stock_entry and parent_se: - material_request = frappe.get_value( - "Stock Entry Detail", item.ste_detail, "material_request" - ) - - if material_request and material_request not in material_requests: - material_requests.append(material_request) - if status == "Completed": - qty = get_transferred_qty(material_request) - if qty.get("transfer_qty") > qty.get("transferred_qty"): - status = "In Transit" - - frappe.db.set_value("Material Request", material_request, "transfer_status", status) - - def set_serial_no_batch_for_finished_good(self): - if not ( - (self.pro_doc.has_serial_no or self.pro_doc.has_batch_no) - and frappe.db.get_single_value("Manufacturing Settings", "make_serial_no_batch_from_work_order") - ): - return - - for d in self.items: - if ( - d.is_finished_item - and d.item_code == self.pro_doc.production_item - and not d.serial_and_batch_bundle - ): - serial_nos = self.get_available_serial_nos() - if serial_nos: - row = frappe._dict({"serial_nos": serial_nos[0 : cint(d.qty)]}) - - id = create_serial_and_batch_bundle( - self, - row, - frappe._dict( - { - "item_code": d.item_code, - "warehouse": d.t_warehouse, - } - ), - ) - - d.serial_and_batch_bundle = id - d.use_serial_batch_fields = 0 - - def get_available_serial_nos(self) -> list[str]: - serial_nos = [] - data = frappe.get_all( - "Serial No", - filters={ - "item_code": self.pro_doc.production_item, - "warehouse": ("is", "not set"), - "status": "Inactive", - "work_order": self.pro_doc.name, - }, - fields=["name"], - order_by="creation asc", - ) - - for row in data: - serial_nos.append(row.name) - - return serial_nos - def update_subcontracting_order_status(self): if self.subcontracting_order and self.purpose in ["Send to Subcontractor", "Material Transfer"]: from erpnext.subcontracting.doctype.subcontracting_order.subcontracting_order import ( @@ -3728,87 +1529,6 @@ class StockEntry(StockController, SubcontractingInwardController): self.calculate_rate_and_amount() -@frappe.whitelist() -def move_sample_to_retention_warehouse(company: str, items: str | list): - from erpnext.stock.serial_batch_bundle import ( - SerialBatchCreation, - get_batch_nos, - ) - - if isinstance(items, str): - items = json.loads(items) - - retention_warehouse = frappe.get_single_value("Stock Settings", "sample_retention_warehouse") - stock_entry = frappe.new_doc("Stock Entry") - stock_entry.company = company - stock_entry.purpose = "Material Transfer" - stock_entry.set_stock_entry_type() - for item in items: - if item.get("sample_quantity") and item.get("serial_and_batch_bundle"): - warehouse = item.get("t_warehouse") or item.get("warehouse") - total_qty = 0 - cls_obj = SerialBatchCreation( - { - "type_of_transaction": "Outward", - "serial_and_batch_bundle": item.get("serial_and_batch_bundle"), - "item_code": item.get("item_code"), - "warehouse": warehouse, - "do_not_save": True, - } - ) - sabb = cls_obj.duplicate_package() - batches = get_batch_nos(item.get("serial_and_batch_bundle")) - sabe_list = [] - for batch_no in batches.keys(): - sample_quantity = validate_sample_quantity( - item.get("item_code"), - item.get("sample_quantity"), - item.get("transfer_qty") or item.get("qty"), - batch_no, - ) - - sabe = next(item for item in sabb.entries if item.batch_no == batch_no) - if sample_quantity: - if sabb.has_serial_no: - new_sabe = [ - entry - for entry in sabb.entries - if entry.batch_no == batch_no - and frappe.db.exists( - "Serial No", {"name": entry.serial_no, "warehouse": warehouse} - ) - ][: int(sample_quantity)] - sabe_list.extend(new_sabe) - total_qty += len(new_sabe) - else: - total_qty += sample_quantity - sabe.qty = sample_quantity - else: - sabb.entries.remove(sabe) - - if total_qty: - if sabe_list: - sabb.entries = sabe_list - sabb.save() - - stock_entry.append( - "items", - { - "item_code": item.get("item_code"), - "s_warehouse": warehouse, - "t_warehouse": retention_warehouse, - "qty": total_qty, - "basic_rate": item.get("valuation_rate"), - "uom": item.get("uom"), - "stock_uom": item.get("stock_uom"), - "conversion_factor": item.get("conversion_factor") or 1.0, - "serial_and_batch_bundle": sabb.name, - }, - ) - if stock_entry.get("items"): - return stock_entry.as_dict() - - @frappe.whitelist() def make_stock_in_entry(source_name: str, target_doc: str | Document | None = None): def set_missing_values(source, target): @@ -3961,27 +1681,6 @@ def get_used_alternative_items( return used_alternative_items -def get_valuation_rate_for_finished_good_entry(work_order): - work_order_qty = flt( - frappe.get_cached_value("Work Order", work_order, "material_transferred_for_manufacturing") - ) - - field = "(SUM(total_outgoing_value) / %s) as valuation_rate" % (work_order_qty) - - stock_data = frappe.get_all( - "Stock Entry", - fields=field, - filters={ - "docstatus": 1, - "purpose": "Material Transfer for Manufacture", - "work_order": work_order, - }, - ) - - if stock_data: - return stock_data[0].valuation_rate - - @frappe.whitelist() def get_uom_details(item_code: str, uom: str, qty: float | None): """Returns dict `{"conversion_factor": [value], "transfer_qty": qty * [value]}` @@ -3999,48 +1698,6 @@ def get_uom_details(item_code: str, uom: str, qty: float | None): return ret -@frappe.whitelist() -def get_expired_batch_items(): - from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import get_auto_batch_nos - - expired_batches = get_expired_batches() - if not expired_batches: - return [] - - expired_batches_stock = get_auto_batch_nos( - frappe._dict( - { - "batch_no": list(expired_batches.keys()), - "for_stock_levels": True, - } - ) - ) - - for row in expired_batches_stock: - row.update(expired_batches.get(row.batch_no)) - - return expired_batches_stock - - -def get_expired_batches(): - batch = frappe.qb.DocType("Batch") - - data = ( - frappe.qb.from_(batch) - .select(batch.item, batch.name.as_("batch_no"), batch.stock_uom) - .where((batch.expiry_date <= nowdate()) & (batch.expiry_date.isnotnull())) - ).run(as_dict=True) - - if not data: - return [] - - expired_batches = frappe._dict() - for row in data: - expired_batches[row.batch_no] = row - - return expired_batches - - @frappe.whitelist() def get_warehouse_details(args: str | dict): if isinstance(args, str): @@ -4063,75 +1720,6 @@ def get_warehouse_details(args: str | dict): return ret -@frappe.whitelist() -def validate_sample_quantity(item_code: str, sample_quantity: int, qty: float, batch_no: str | None = None): - if cint(qty) < cint(sample_quantity): - frappe.throw( - _("Sample quantity {0} cannot be more than received quantity {1}").format(sample_quantity, qty) - ) - retention_warehouse = frappe.get_single_value("Stock Settings", "sample_retention_warehouse") - retainted_qty = 0 - if batch_no: - retainted_qty = get_batch_qty(batch_no, retention_warehouse, item_code) - max_retain_qty = frappe.get_value("Item", item_code, "sample_quantity") - if retainted_qty >= max_retain_qty: - frappe.msgprint( - _( - "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." - ).format(retainted_qty, batch_no, item_code, batch_no), - alert=True, - ) - sample_quantity = 0 - qty_diff = max_retain_qty - retainted_qty - if cint(sample_quantity) > cint(qty_diff): - frappe.msgprint( - _("Maximum Samples - {0} can be retained for Batch {1} and Item {2}.").format( - max_retain_qty, batch_no, item_code - ), - alert=True, - ) - sample_quantity = qty_diff - return sample_quantity - - -def get_supplied_items( - subcontract_order, rm_detail_field="sco_rm_detail", subcontract_order_field="subcontracting_order" -): - fields = [ - "`tabStock Entry Detail`.`transfer_qty`", - "`tabStock Entry`.`is_return`", - f"`tabStock Entry Detail`.`{rm_detail_field}`", - "`tabStock Entry Detail`.`item_code`", - ] - - filters = [ - ["Stock Entry", "docstatus", "=", 1], - ["Stock Entry", subcontract_order_field, "=", subcontract_order], - ] - - supplied_item_details = {} - for row in frappe.get_all("Stock Entry", fields=fields, filters=filters): - if not row.get(rm_detail_field): - continue - - key = row.get(rm_detail_field) - if key not in supplied_item_details: - supplied_item_details.setdefault( - key, frappe._dict({"supplied_qty": 0, "returned_qty": 0, "total_supplied_qty": 0}) - ) - - supplied_item = supplied_item_details[key] - - if row.is_return: - supplied_item.returned_qty += row.transfer_qty - else: - supplied_item.supplied_qty += row.transfer_qty - - supplied_item.total_supplied_qty = flt(supplied_item.supplied_qty) - flt(supplied_item.returned_qty) - - return supplied_item_details - - @frappe.whitelist() def get_items_from_subcontract_order(source_name: str, target_doc: str | Document | None = None): from erpnext.controllers.subcontracting_controller import make_rm_stock_entry @@ -4145,239 +1733,3 @@ def get_items_from_subcontract_order(source_name: str, target_doc: str | Documen ) return target_doc - - -def get_available_materials(work_order, stock_entry_doc=None) -> dict: - data = get_stock_entry_data(work_order, stock_entry_doc=stock_entry_doc) - - available_materials = {} - for row in data: - key = (row.item_code, row.warehouse) - if row.purpose != "Material Transfer for Manufacture": - key = (row.item_code, row.s_warehouse) - - if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": - key = (row.item_code, row.s_warehouse or row.warehouse) - - if key not in available_materials: - available_materials.setdefault( - key, - frappe._dict( - {"item_details": row, "batch_details": defaultdict(float), "qty": 0, "serial_nos": []} - ), - ) - - item_data = available_materials[key] - - if row.purpose == "Material Transfer for Manufacture" or ( - stock_entry_doc and stock_entry_doc.purpose == "Disassemble" and row.purpose == "Manufacture" - ): - item_data.qty += row.qty - if row.batch_no: - item_data.batch_details[row.batch_no] += row.qty - - elif row.batch_nos: - for batch_no, qty in row.batch_nos.items(): - item_data.batch_details[batch_no] += qty - - if row.serial_no: - item_data.serial_nos.extend(get_serial_nos(row.serial_no)) - item_data.serial_nos.sort() - - elif row.serial_nos: - item_data.serial_nos.extend(get_serial_nos(row.serial_nos)) - item_data.serial_nos.sort() - else: - # Consume raw material qty in case of 'Manufacture' or 'Material Consumption for Manufacture' - - item_data.qty -= row.qty - if row.batch_no: - item_data.batch_details[row.batch_no] -= row.qty - - elif row.batch_nos: - for batch_no, qty in row.batch_nos.items(): - item_data.batch_details[batch_no] += qty - - if row.serial_no: - for serial_no in get_serial_nos(row.serial_no): - if serial_no in item_data.serial_nos: - item_data.serial_nos.remove(serial_no) - - elif row.serial_nos: - for serial_no in get_serial_nos(row.serial_nos): - if serial_no in item_data.serial_nos: - item_data.serial_nos.remove(serial_no) - - return available_materials - - -def get_stock_entry_data(work_order, stock_entry_doc=None): - from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import ( - get_voucher_wise_serial_batch_from_bundle, - ) - - stock_entry = frappe.qb.DocType("Stock Entry") - stock_entry_detail = frappe.qb.DocType("Stock Entry Detail") - - data = ( - frappe.qb.from_(stock_entry) - .from_(stock_entry_detail) - .select( - stock_entry_detail.item_name, - stock_entry_detail.original_item, - stock_entry_detail.item_code, - stock_entry_detail.qty, - (stock_entry_detail.t_warehouse).as_("warehouse"), - (stock_entry_detail.s_warehouse).as_("s_warehouse"), - stock_entry_detail.description, - stock_entry_detail.stock_uom, - stock_entry_detail.expense_account, - stock_entry_detail.cost_center, - stock_entry_detail.serial_and_batch_bundle, - stock_entry_detail.batch_no, - stock_entry_detail.serial_no, - stock_entry.purpose, - stock_entry.name, - ) - .where( - (stock_entry.name == stock_entry_detail.parent) - & (stock_entry.work_order == work_order) - & (stock_entry.docstatus == 1) - ) - .orderby(stock_entry.creation, stock_entry_detail.item_code, stock_entry_detail.idx) - ) - - if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": - data = data.where( - stock_entry.purpose.isin( - [ - "Disassemble", - "Manufacture", - ] - ) - ) - - data = data.where(stock_entry.name != stock_entry_doc.name) - else: - data = data.where( - stock_entry.purpose.isin( - [ - "Manufacture", - "Material Consumption for Manufacture", - "Material Transfer for Manufacture", - ] - ) - ) - - data = data.where(stock_entry_detail.s_warehouse.isnotnull()) - - data = data.run(as_dict=1) - - if not data: - return [] - - voucher_nos = [row.get("name") for row in data if row.get("name")] - if voucher_nos: - bundle_data = get_voucher_wise_serial_batch_from_bundle(voucher_no=voucher_nos) - for row in data: - key = (row.item_code, row.warehouse, row.name) - if row.purpose != "Material Transfer for Manufacture": - key = (row.item_code, row.s_warehouse, row.name) - - if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": - key = (row.item_code, row.s_warehouse or row.warehouse, row.name) - - if bundle_data.get(key): - row.update(bundle_data.get(key)) - - return data - - -def create_serial_and_batch_bundle(parent_doc, row, child, type_of_transaction=None): - item_details = frappe.get_cached_value( - "Item", child.item_code, ["has_serial_no", "has_batch_no"], as_dict=1 - ) - - if not (item_details.has_serial_no or item_details.has_batch_no): - return - - if not type_of_transaction: - type_of_transaction = "Inward" - - doc = frappe.get_doc( - { - "doctype": "Serial and Batch Bundle", - "voucher_type": "Stock Entry", - "item_code": child.item_code, - "warehouse": child.warehouse, - "type_of_transaction": type_of_transaction, - "posting_date": parent_doc.posting_date, - "posting_time": parent_doc.posting_time, - } - ) - - precision = frappe.get_precision("Stock Entry Detail", "qty") - if row.serial_nos and row.batches_to_be_consume: - doc.has_serial_no = 1 - doc.has_batch_no = 1 - batchwise_serial_nos = get_batchwise_serial_nos(child.item_code, row) - for batch_no, qty in row.batches_to_be_consume.items(): - while flt(qty, precision) > 0: - qty -= 1 - doc.append( - "entries", - { - "batch_no": batch_no, - "serial_no": batchwise_serial_nos.get(batch_no).pop(0), - "warehouse": row.warehouse, - "qty": -1, - }, - ) - - elif row.serial_nos: - doc.has_serial_no = 1 - for serial_no in row.serial_nos: - doc.append("entries", {"serial_no": serial_no, "warehouse": row.warehouse, "qty": -1}) - - elif row.batches_to_be_consume: - precision = frappe.get_precision("Serial and Batch Entry", "qty") - doc.has_batch_no = 1 - for batch_no, qty in row.batches_to_be_consume.items(): - if flt(qty, precision) > 0: - qty = flt(qty, precision) - doc.append("entries", {"batch_no": batch_no, "warehouse": row.warehouse, "qty": qty * -1}) - - if not doc.entries: - return None - - return doc.insert(ignore_permissions=True).name - - -def get_batchwise_serial_nos(item_code, row): - batchwise_serial_nos = {} - - for batch_no in row.batches_to_be_consume: - serial_nos = frappe.get_all( - "Serial No", - filters={"item_code": item_code, "batch_no": batch_no, "name": ("in", row.serial_nos)}, - ) - - if serial_nos: - batchwise_serial_nos[batch_no] = sorted([serial_no.name for serial_no in serial_nos]) - - return batchwise_serial_nos - - -def get_transferred_qty(material_request): - sed = DocType("Stock Entry Detail") - - query = ( - frappe.qb.from_(sed) - .select( - Sum(sed.transfer_qty).as_("transfer_qty"), - Sum(sed.transferred_qty).as_("transferred_qty"), - ) - .where((sed.material_request == material_request) & (sed.docstatus == 1)) - ).run(as_dict=True) - - return query[0] diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/__init__.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py new file mode 100644 index 00000000000..699e66ec368 --- /dev/null +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py @@ -0,0 +1,535 @@ +from collections import defaultdict + +import frappe +from frappe import _ +from frappe.query_builder.functions import Sum +from frappe.utils import flt + +from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos +from erpnext.stock.serial_batch_bundle import SerialBatchCreation +from erpnext.stock.utils import get_combine_datetime + +from .manufacturing import ceil_qty_if_uom_has_whole_number, get_bom_items, get_secondary_items + + +class DisassembleStockEntry: + def __init__(self, se_doc): + self.doc = se_doc + + def validate(self): + self.validate_warehouse() + + def validate_warehouse(self): + for row in self.doc.items: + if not row.s_warehouse and not row.t_warehouse: + frappe.throw(_("Source or Target Warehouse is required for item {0}").format(row.item_code)) + + def validate_fg_completed_qty(self): + if not self.doc.source_stock_entry: + return + + from erpnext.manufacturing.doctype.work_order.work_order import get_disassembly_available_qty + + available_qty = get_disassembly_available_qty(self.doc.source_stock_entry, self.doc.name) + + if flt(self.doc.fg_completed_qty) > available_qty: + frappe.throw( + _( + "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." + ).format( + self.doc.fg_completed_qty, + self.doc.source_stock_entry, + available_qty, + ), + title=_("Excess Disassembly"), + ) + + def add_items(self): + """ + Priority: + 1. From a specific Manufacture Stock Entry (exact reversal) + 2. From Work Order Manufacture Stock Entries (averaged reversal) + 3. From BOM (standalone disassembly) + """ + + # Auto-set source_stock_entry if WO has exactly one manufacture entry + if not self.doc.get("source_stock_entry") and self.doc.work_order: + manufacture_entries = frappe.get_all( + "Stock Entry", + filters={ + "work_order": self.doc.work_order, + "purpose": "Manufacture", + "docstatus": 1, + }, + pluck="name", + limit_page_length=2, + ) + if len(manufacture_entries) == 1: + self.doc.source_stock_entry = manufacture_entries[0] + + if self.doc.get("source_stock_entry"): + return self._add_items_for_disassembly_from_stock_entry() + + if self.doc.work_order: + return self._add_items_for_disassembly_from_work_order() + + return self._add_items_for_disassembly_from_bom() + + def _add_items_for_disassembly_from_stock_entry(self): + source_fg_qty = frappe.db.get_value("Stock Entry", self.doc.source_stock_entry, "fg_completed_qty") + if not source_fg_qty: + frappe.throw( + _("Source Stock Entry {0} has no finished goods quantity").format(self.doc.source_stock_entry) + ) + + disassemble_qty = flt(self.doc.fg_completed_qty) + scale_factor = disassemble_qty / flt(source_fg_qty) + + self._append_disassembly_row_from_source( + disassemble_qty=disassemble_qty, + scale_factor=scale_factor, + ) + + def _add_items_for_disassembly_from_work_order(self): + wo_produced_qty = frappe.db.get_value("Work Order", self.doc.work_order, "produced_qty") + + wo_produced_qty = flt(wo_produced_qty) + if wo_produced_qty <= 0: + frappe.throw(_("Work Order {0} has no produced qty").format(self.doc.work_order)) + + disassemble_qty = flt(self.doc.fg_completed_qty) + if disassemble_qty <= 0: + frappe.throw(_("Disassemble Qty cannot be less than or equal to 0.")) + + scale_factor = disassemble_qty / wo_produced_qty + + self._append_disassembly_row_from_source( + disassemble_qty=disassemble_qty, + scale_factor=scale_factor, + ) + + def _append_disassembly_row_from_source(self, disassemble_qty, scale_factor): + for source_row in self.get_items_from_manufacture_stock_entry(): + if source_row.is_finished_item: + qty = disassemble_qty + s_warehouse = self.doc.from_warehouse or source_row.t_warehouse + t_warehouse = "" + elif source_row.s_warehouse: + # RM: was consumed FROM s_warehouse -> return TO s_warehouse + qty = flt(source_row.qty * scale_factor) + s_warehouse = "" + t_warehouse = self.doc.to_warehouse or source_row.s_warehouse + else: + # Scrap/secondary: was produced TO t_warehouse -> take FROM t_warehouse + qty = flt(source_row.qty * scale_factor) + s_warehouse = source_row.t_warehouse + t_warehouse = "" + + item = { + "item_code": source_row.item_code, + "item_name": source_row.item_name, + "description": source_row.description, + "stock_uom": source_row.stock_uom, + "uom": source_row.uom, + "conversion_factor": source_row.conversion_factor, + "basic_rate": source_row.basic_rate, + "qty": qty, + "s_warehouse": s_warehouse, + "t_warehouse": t_warehouse, + "is_finished_item": source_row.is_finished_item, + "type": source_row.type, + "is_legacy_scrap_item": source_row.is_legacy_scrap_item, + "bom_secondary_item": source_row.bom_secondary_item, + "bom_no": source_row.bom_no, + # batch and serial bundles built on submit + "use_serial_batch_fields": 1 if (source_row.batch_no or source_row.serial_no) else 0, + } + + if self.doc.source_stock_entry: + item.update( + { + "against_stock_entry": self.doc.source_stock_entry, + "ste_detail": source_row.name, + } + ) + + self.doc.append("items", item) + + def _add_items_for_disassembly_from_bom(self): + if not self.doc.bom_no or not self.doc.fg_completed_qty: + frappe.throw(_("BOM and Finished Good Quantity is mandatory for Disassembly")) + + self.add_raw_materials() + self.add_secondary_items() + self.add_finished_goods() + + def add_raw_materials(self): + # Raw materials will be available after disassembly in target warehouse + items = get_bom_items(self.doc.bom_no, self.doc.use_multi_level_bom) + + for row in items: + row["t_warehouse"] = self.doc.to_warehouse + row["from_warehouse"] = "" + row["is_finished_item"] = 0 + row["qty"] = flt(row["qty"]) * flt(self.doc.fg_completed_qty) + row["uom"] = row.get("uom") or row.get("stock_uom") + self.doc.append("items", row) + + def add_secondary_items(self): + # Secondary items will be removed from source warehouse + + secondary_items = get_secondary_items(self.doc.bom_no, self.doc.work_order) + for row in secondary_items: + item_args = {} + fields = [ + "item_code", + "item_name", + "uom", + "stock_uom", + "conversion_factor", + "item_group", + "description", + "type", + ] + for field in fields: + item_args[field] = row.get(field) + + item_args["is_legacy_scrap_item"] = row.get("is_legacy") + item_args["s_warehouse"] = self.doc.from_warehouse + item_args["uom"] = item_args.get("uom") or item_args.get("stock_uom") + item_args["bom_secondary_item"] = row.get("name") + + row.qty = row.qty * self.doc.fg_completed_qty + item_args["qty"] = ceil_qty_if_uom_has_whole_number(row.qty, item_args["uom"]) + + self.doc.append("items", item_args) + + def get_production_item_details(self): + if self.doc.work_order: + production_item = frappe.get_cached_value("Work Order", self.doc.work_order, "production_item") + else: + production_item = frappe.get_cached_value("BOM", self.doc.bom_no, "item") + + item_details = frappe.get_cached_value( + "Item", + production_item, + ["item_name", "item_group", "description", "stock_uom", "name"], + as_dict=1, + ) + + return item_details + + def add_finished_goods(self): + # Fininshed good will be removed from source warehouse + + item_details = self.get_production_item_details() + + item_details.update( + { + "conversion_factor": 1, + "uom": item_details.stock_uom, + "qty": self.doc.fg_completed_qty, + "t_warehouse": None, + "s_warehouse": self.doc.from_warehouse, + "is_finished_item": 1, + } + ) + + item_details["item_code"] = item_details["name"] + del item_details["name"] + + self.doc.append("items", item_details) + + def get_items_from_manufacture_stock_entry(self): + SE = frappe.qb.DocType("Stock Entry") + SED = frappe.qb.DocType("Stock Entry Detail") + query = frappe.qb.from_(SED).join(SE).on(SED.parent == SE.name).where(SE.docstatus == 1) + + common_fields = [ + SED.item_code, + SED.item_name, + SED.description, + SED.stock_uom, + SED.uom, + SED.basic_rate, + SED.conversion_factor, + SED.is_finished_item, + SED.type, + SED.is_legacy_scrap_item, + SED.bom_secondary_item, + SED.batch_no, + SED.serial_no, + SED.use_serial_batch_fields, + SED.s_warehouse, + SED.t_warehouse, + SED.bom_no, + ] + + if self.doc.source_stock_entry: + return ( + query.select(SED.name, SED.qty, SED.transfer_qty, *common_fields) + .where(SE.name == self.doc.source_stock_entry) + .orderby(SED.idx) + .run(as_dict=True) + ) + + return ( + query.select(Sum(SED.qty).as_("qty"), Sum(SED.transfer_qty).as_("transfer_qty"), *common_fields) + .where(SE.purpose == "Manufacture") + .where(SE.work_order == self.doc.work_order) + .groupby(SED.item_code) + .orderby(SED.idx) + .run(as_dict=True) + ) + + def on_submit(self): + self.set_serial_batch_for_disassembly() + + def set_serial_batch_for_disassembly(self): + if self.doc.get("source_stock_entry"): + self._set_serial_batch_for_disassembly_from_stock_entry() + else: + self._set_serial_batch_for_disassembly_from_available_materials() + + def _set_serial_batch_for_disassembly_from_stock_entry(self): + from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import ( + get_voucher_wise_serial_batch_from_bundle, + ) + + source_fg_qty = flt( + frappe.db.get_value("Stock Entry", self.doc.source_stock_entry, "fg_completed_qty") + ) + scale_factor = flt(self.doc.fg_completed_qty) / source_fg_qty if source_fg_qty else 0 + + bundle_data = get_voucher_wise_serial_batch_from_bundle(voucher_no=[self.doc.source_stock_entry]) + source_rows_by_name = {r.name: r for r in self.get_items_from_manufacture_stock_entry()} + + for row in self.doc.items: + if not row.ste_detail: + continue + + source_row = source_rows_by_name.get(row.ste_detail) + if not source_row: + continue + + source_warehouse = source_row.s_warehouse or source_row.t_warehouse + key = (source_row.item_code, source_warehouse, self.doc.source_stock_entry) + source_bundle = bundle_data.get(key, {}) + + batches = defaultdict(float) + serial_nos = [] + + if source_bundle.get("batch_nos"): + qty_remaining = row.transfer_qty + for batch_no, batch_qty in source_bundle["batch_nos"].items(): + if qty_remaining <= 0: + break + alloc = min(abs(flt(batch_qty)) * scale_factor, qty_remaining) + batches[batch_no] = alloc + qty_remaining -= alloc + elif source_row.batch_no: + batches[source_row.batch_no] = row.transfer_qty + + if source_bundle.get("serial_nos"): + serial_nos = get_serial_nos(source_bundle["serial_nos"])[: int(row.transfer_qty)] + elif source_row.serial_no: + serial_nos = get_serial_nos(source_row.serial_no)[: int(row.transfer_qty)] + + self._set_serial_batch_bundle_for_disassembly_row(row, serial_nos, batches) + + def _set_serial_batch_for_disassembly_from_available_materials(self): + available_materials = get_available_materials(self.doc.work_order, self.doc) + for row in self.doc.items: + warehouse = row.s_warehouse or row.t_warehouse + materials = available_materials.get((row.item_code, warehouse)) + if not materials: + continue + + batches = defaultdict(float) + serial_nos = [] + qty = row.transfer_qty + for batch_no, batch_qty in materials.batch_details.items(): + if qty <= 0: + break + + batch_qty = abs(batch_qty) + if batch_qty <= qty: + batches[batch_no] = batch_qty + qty -= batch_qty + else: + batches[batch_no] = qty + qty = 0 + + if materials.serial_nos: + serial_nos = materials.serial_nos[: int(row.transfer_qty)] + + self._set_serial_batch_bundle_for_disassembly_row(row, serial_nos, batches) + + def _set_serial_batch_bundle_for_disassembly_row(self, row, serial_nos, batches): + if not serial_nos and not batches: + return + + warehouse = row.s_warehouse or row.t_warehouse + bundle_doc = SerialBatchCreation( + { + "item_code": row.item_code, + "warehouse": warehouse, + "posting_datetime": get_combine_datetime(self.doc.posting_date, self.doc.posting_time), + "voucher_type": self.doc.doctype, + "voucher_no": self.doc.name, + "voucher_detail_no": row.name, + "qty": row.transfer_qty, + "type_of_transaction": "Inward" if row.t_warehouse else "Outward", + "company": self.doc.company, + "do_not_submit": True, + } + ).make_serial_and_batch_bundle(serial_nos=serial_nos, batch_nos=batches) + + row.serial_and_batch_bundle = bundle_doc.name + row.use_serial_batch_fields = 0 + + +def get_available_materials(work_order, stock_entry_doc=None) -> dict: + data = get_stock_entry_data(work_order, stock_entry_doc=stock_entry_doc) + + available_materials = {} + for row in data: + key = (row.item_code, row.warehouse) + if row.purpose != "Material Transfer for Manufacture": + key = (row.item_code, row.s_warehouse) + + if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": + key = (row.item_code, row.s_warehouse or row.warehouse) + + if key not in available_materials: + available_materials.setdefault( + key, + frappe._dict( + {"item_details": row, "batch_details": defaultdict(float), "qty": 0, "serial_nos": []} + ), + ) + + item_data = available_materials[key] + + if row.purpose == "Material Transfer for Manufacture" or ( + stock_entry_doc and stock_entry_doc.purpose == "Disassemble" and row.purpose == "Manufacture" + ): + item_data.qty += row.qty + if row.batch_no: + item_data.batch_details[row.batch_no] += row.qty + + elif row.batch_nos: + for batch_no, qty in row.batch_nos.items(): + item_data.batch_details[batch_no] += qty + + if row.serial_no: + item_data.serial_nos.extend(get_serial_nos(row.serial_no)) + item_data.serial_nos.sort() + + elif row.serial_nos: + item_data.serial_nos.extend(get_serial_nos(row.serial_nos)) + item_data.serial_nos.sort() + else: + # Consume raw material qty in case of 'Manufacture' or 'Material Consumption for Manufacture' + + item_data.qty -= row.qty + if row.batch_no: + item_data.batch_details[row.batch_no] -= row.qty + + elif row.batch_nos: + for batch_no, qty in row.batch_nos.items(): + item_data.batch_details[batch_no] += qty + + if row.serial_no: + for serial_no in get_serial_nos(row.serial_no): + if serial_no in item_data.serial_nos: + item_data.serial_nos.remove(serial_no) + + elif row.serial_nos: + for serial_no in get_serial_nos(row.serial_nos): + if serial_no in item_data.serial_nos: + item_data.serial_nos.remove(serial_no) + + return available_materials + + +def get_stock_entry_data(work_order, stock_entry_doc=None): + from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import ( + get_voucher_wise_serial_batch_from_bundle, + ) + + stock_entry = frappe.qb.DocType("Stock Entry") + stock_entry_detail = frappe.qb.DocType("Stock Entry Detail") + + data = ( + frappe.qb.from_(stock_entry) + .from_(stock_entry_detail) + .select( + stock_entry_detail.item_name, + stock_entry_detail.original_item, + stock_entry_detail.item_code, + stock_entry_detail.qty, + (stock_entry_detail.t_warehouse).as_("warehouse"), + (stock_entry_detail.s_warehouse).as_("s_warehouse"), + stock_entry_detail.description, + stock_entry_detail.stock_uom, + stock_entry_detail.expense_account, + stock_entry_detail.cost_center, + stock_entry_detail.serial_and_batch_bundle, + stock_entry_detail.batch_no, + stock_entry_detail.serial_no, + stock_entry.purpose, + stock_entry.name, + ) + .where( + (stock_entry.name == stock_entry_detail.parent) + & (stock_entry.work_order == work_order) + & (stock_entry.docstatus == 1) + ) + .orderby(stock_entry.creation, stock_entry_detail.item_code, stock_entry_detail.idx) + ) + + if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": + data = data.where( + stock_entry.purpose.isin( + [ + "Disassemble", + "Manufacture", + ] + ) + ) + + data = data.where(stock_entry.name != stock_entry_doc.name) + else: + data = data.where( + stock_entry.purpose.isin( + [ + "Manufacture", + "Material Consumption for Manufacture", + "Material Transfer for Manufacture", + ] + ) + ) + + data = data.where(stock_entry_detail.s_warehouse.isnotnull()) + + data = data.run(as_dict=1) + + if not data: + return [] + + voucher_nos = [row.get("name") for row in data if row.get("name")] + if voucher_nos: + bundle_data = get_voucher_wise_serial_batch_from_bundle(voucher_no=voucher_nos) + for row in data: + key = (row.item_code, row.warehouse, row.name) + if row.purpose != "Material Transfer for Manufacture": + key = (row.item_code, row.s_warehouse, row.name) + + if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": + key = (row.item_code, row.s_warehouse or row.warehouse, row.name) + + if bundle_data.get(key): + row.update(bundle_data.get(key)) + + return data diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py new file mode 100644 index 00000000000..95d12a883ad --- /dev/null +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py @@ -0,0 +1,1016 @@ +import json +from collections import defaultdict + +import frappe +from frappe import _, bold +from frappe.query_builder.functions import Sum +from frappe.utils import ceil, cint, flt, get_link_to_form + +from erpnext.manufacturing.doctype.bom.bom import add_additional_cost, get_backflush_based_on +from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos +from erpnext.stock.serial_batch_bundle import ( + SerialBatchCreation, + get_batch_nos, + get_empty_batches_based_work_order, + get_serial_or_batch_items, +) + +from .serial_batch import create_serial_and_batch_bundle + + +class BaseManufactureStockEntry: + def __init__(self, se_doc): + self.doc = se_doc + + def set_default_warehouse(self): + for row in self.doc.items: + if ( + not row.s_warehouse + and self.doc.from_warehouse + and not row.is_finished_item + and not row.is_legacy_scrap_item + and not row.type + ): + row.s_warehouse = self.doc.from_warehouse + row.t_warehouse = None + + elif ( + not row.t_warehouse + and self.doc.to_warehouse + and (row.is_finished_item or row.is_legacy_scrap_item or row.type) + ): + row.t_warehouse = self.doc.to_warehouse + row.s_warehouse = None + + def validate_warehouse(self): + for row in self.doc.items: + if not row.s_warehouse and not row.t_warehouse: + frappe.throw(_("Source or Target Warehouse is required for item {0}").format(row.item_code)) + + def validate_raw_materials_exists(self): + if frappe.db.get_single_value("Manufacturing Settings", "material_consumption"): + return + + raw_materials = [] + for row in self.doc.items: + if row.s_warehouse: + raw_materials.append(row.item_code) + + if not raw_materials: + frappe.throw( + _( + "At least one raw material item must be present in the stock entry for the type {0}" + ).format(bold(self.doc.purpose)), + title=_("Raw Materials Missing"), + ) + + @property + def wo_doc(self): + if not getattr(self, "_wo_doc", None): + if self.doc.work_order: + self._wo_doc = frappe.get_doc("Work Order", self.doc.work_order) + return getattr(self, "_wo_doc", None) + + @property + def backflush_based_on(self): + return get_backflush_based_on(self.doc.bom_no) + + def get_item_dict(self, row): + item_args = {} + fields = [ + "item_code", + "item_name", + "item_group", + "description", + "uom", + "stock_uom", + "conversion_factor", + "allow_alternative_item", + ] + for field in fields: + if row.get(field): + item_args[field] = row.get(field) + + return item_args + + def add_secondary_items(self): + secondary_items = get_secondary_items(self.doc.bom_no, self.doc.work_order) + for row in secondary_items: + item_args = self.get_item_dict(row) + item_args["is_legacy_scrap_item"] = row.get("is_legacy") and row.type == "Scrap" + item_args["type"] = row.type + item_args["bom_secondary_item"] = row.name + item_args["t_warehouse"] = self.doc.to_warehouse + + row.qty = row.qty * self.doc.fg_completed_qty + if row.get("process_loss_per"): + row.qty -= flt( + row.qty * row.get("process_loss_per") / 100, self.doc.precision("fg_completed_qty") + ) + + item_args["qty"] = ceil_qty_if_uom_has_whole_number(row.qty, row.uom) + item_args["transfer_qty"] = item_args["qty"] + self.doc.append("items", item_args) + + def set_process_loss_qty(self): + precision = self.doc.precision("process_loss_qty") + if self.doc.work_order: + data = frappe.get_all( + "Work Order Operation", + filters={"parent": self.doc.work_order}, + fields=[{"MAX": "process_loss_qty", "as": "process_loss_qty"}], + ) + + if data and data[0].process_loss_qty: + process_loss_qty = data[0].process_loss_qty + if flt(self.doc.process_loss_qty, precision) != flt(process_loss_qty, precision): + self.doc.process_loss_qty = flt(process_loss_qty, precision) + + frappe.msgprint( + _("The Process Loss Qty has reset as per job cards Process Loss Qty"), alert=True + ) + + if not self.doc.process_loss_percentage and not self.doc.process_loss_qty: + self.doc.process_loss_percentage = frappe.get_cached_value( + "BOM", self.doc.bom_no, "process_loss_percentage" + ) + + if self.doc.process_loss_percentage and not self.doc.process_loss_qty: + self.doc.process_loss_qty = flt( + (flt(self.doc.fg_completed_qty) * flt(self.doc.process_loss_percentage)) / 100 + ) + elif self.doc.process_loss_qty and not self.doc.process_loss_percentage: + self.doc.process_loss_percentage = flt( + (flt(self.doc.process_loss_qty) / flt(self.doc.fg_completed_qty)) * 100 + ) + + def get_production_item_details(self): + if self.doc.work_order: + production_item = frappe.get_cached_value("Work Order", self.doc.work_order, "production_item") + else: + production_item = frappe.get_cached_value("BOM", self.doc.bom_no, "item") + + item_details = frappe.get_cached_value( + "Item", + production_item, + ["item_name", "item_group", "description", "stock_uom", "name"], + as_dict=1, + ) + + return item_details + + def add_finished_goods(self): + item_details = self.get_production_item_details() + fg_item_qty = flt(self.doc.fg_completed_qty) - flt(self.doc.process_loss_qty) + + item_details.update( + { + "conversion_factor": 1, + "uom": item_details.stock_uom, + "qty": ceil_qty_if_uom_has_whole_number(fg_item_qty, item_details.stock_uom), + "t_warehouse": self.doc.to_warehouse, + "s_warehouse": None, + "is_finished_item": 1, + } + ) + + item_details["item_code"] = item_details["name"] + del item_details["name"] + + item_details["transfer_qty"] = item_details["qty"] + + if self.wo_doc and cint( + frappe.db.get_single_value( + "Manufacturing Settings", "make_serial_no_batch_from_work_order", cache=True + ) + ): + if self.wo_doc.has_serial_no: + self.set_serial_nos_for_finished_good(item_details) + elif self.wo_doc.has_batch_no: + self.set_batchwise_finished_goods(item_details) + else: + self.doc.append("items", item_details) + + def set_serial_nos_for_finished_good(self, item_details): + serial_nos = self.get_available_serial_nos_for_fg(item_details.item_code) + if serial_nos: + row = frappe._dict({"serial_nos": serial_nos[0 : cint(item_details.qty)]}) + + _id = create_serial_and_batch_bundle( + self.se_doc, + row, + frappe._dict( + { + "item_code": item_details.item_code, + "warehouse": item_details.t_warehouse, + } + ), + ) + + item_details.serial_and_batch_bundle = _id + item_details.use_serial_batch_fields = 0 + + self.doc.append("items", item_details) + + def get_available_serial_nos_for_fg(self, item_code) -> list[str]: + return frappe.get_all( + "Serial No", + filters={ + "item_code": item_code, + "warehouse": ("is", "not set"), + "status": "Inactive", + "work_order": self.wo_doc.name, + }, + pluck="name", + order_by="creation asc", + ) + + def set_batchwise_finished_goods(self, item_details): + batches = get_empty_batches_based_work_order(self.doc.work_order, self.doc.pro_doc.production_item) + + if not batches: + self.doc.append("items", item_details) + else: + self.add_batchwise_finished_good(batches, item_details) + + def add_batchwise_finished_good(self, batches, item_details): + qty = flt(self.doc.fg_completed_qty) + row = frappe._dict({"batches_to_be_consume": defaultdict(float)}) + + self.update_batches_to_be_consume(batches, row, qty) + + if not row.batches_to_be_consume: + return + + _id = create_serial_and_batch_bundle( + self.doc, + row, + frappe._dict( + { + "item_code": self.wo_doc.production_item, + "warehouse": item_details.get("t_warehouse"), + } + ), + ) + + item_details["serial_and_batch_bundle"] = _id + self.doc.append("items", item_details) + + def update_batches_to_be_consume(self, batches, row, qty): + qty_to_be_consumed = qty + batches = sorted(batches.items(), key=lambda x: x[0]) + + for batch_no, batch_qty in batches: + if qty_to_be_consumed <= 0 or batch_qty <= 0: + continue + + if batch_qty > qty_to_be_consumed: + batch_qty = qty_to_be_consumed + + row.batches_to_be_consume[batch_no] += batch_qty + + if batch_no and row.serial_nos: + serial_nos = self.get_serial_nos_based_on_transferred_batch(batch_no, row.serial_nos) + serial_nos = serial_nos[0 : cint(batch_qty)] + + # remove consumed serial nos from list + for sn in serial_nos: + row.serial_nos.remove(sn) + + if "batch_details" in row: + row.batch_details[batch_no] -= batch_qty + + qty_to_be_consumed -= batch_qty + + +class ManufactureStockEntry(BaseManufactureStockEntry): + def before_validate(self): + self.set_default_warehouse() + self.set_job_card_data() + + def validate(self): + self.validate_warehouse() + self.validate_raw_materials_exists() + self.validate_component_and_quantities() + + def set_job_card_data(self): + if self.doc.job_card and not self.doc.work_order: + data = frappe.db.get_value( + "Job Card", + self.doc.job_card, + ["for_quantity", "work_order", "bom_no", "semi_fg_bom"], + as_dict=1, + ) + self.doc.fg_completed_qty = data.for_quantity + self.doc.work_order = data.work_order + self.doc.from_bom = 1 + self.doc.bom_no = data.semi_fg_bom or data.bom_no + + def validate_component_and_quantities(self): + if not frappe.db.get_single_value("Manufacturing Settings", "validate_components_quantities_per_bom"): + return + + if not self.doc.fg_completed_qty: + return + + rm_items = [item for item in self.doc.items if item.s_warehouse] + if not rm_items: + return + + precision = frappe.get_precision("Stock Entry Detail", "qty") + bom_items = get_bom_items(self.doc.bom_no, self.doc.use_multi_level_bom) + + for row in bom_items: + row.qty = row.qty * self.doc.fg_completed_qty + if matched_item := self.get_matched_items(row.item_code): + if flt(row.qty, precision) != flt(matched_item.qty, precision): + frappe.throw( + _( + "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." + ).format( + bold(row.item_code), + flt(row.qty), + get_link_to_form("BOM", self.doc.bom_no), + ), + title=_("Incorrect Component Quantity"), + ) + else: + frappe.throw( + _("According to the BOM {0}, the Item '{1}' is missing in the stock entry.").format( + get_link_to_form("BOM", self.doc.bom_no), bold(row.item_code) + ), + title=_("Missing Item"), + ) + + def get_matched_items(self, item_code): + items = [item for item in self.doc.items if item.s_warehouse] + for row in items: + if row.item_code == item_code or row.original_item == item_code: + return row + + return {} + + def validate_work_order(self): + if not self.doc.work_order: + frappe.throw(_("Work Order is mandatory")) + + def add_items(self): + self.add_raw_materials() + self.set_process_loss_qty() + self.add_finished_goods() + self.add_secondary_items() + self.add_additional_cost() + self.add_secondary_items_from_job_card() + + def add_raw_materials(self): + if not frappe.db.get_single_value("Manufacturing Settings", "material_consumption"): + if self.backflush_based_on == "BOM" or self.wo_doc.skip_transfer: + self.add_raw_materials_based_on_work_order() + else: + self.add_raw_materials_based_on_transfer() + elif self.backflush_based_on == "BOM": + self.add_unconsumed_raw_materials() + else: + self.add_raw_materials_based_on_transfer() + + def add_unconsumed_raw_materials(self): + wo = self.wo_doc + if not wo: + return + + work_order_qty = flt(wo.material_transferred_for_manufacturing) or flt(wo.qty) + wo_qty_to_produce = work_order_qty - flt(wo.produced_qty) + + for item in wo.get("required_items"): + wo_item_qty = flt(item.transferred_qty) or flt(item.required_qty) + wo_qty_unconsumed = wo_item_qty - flt(item.consumed_qty) + bom_qty_per_unit = flt(item.required_qty) / flt(wo.qty) + + req_qty_each = wo_qty_unconsumed / (wo_qty_to_produce or 1) + req_qty_each = min(req_qty_each, bom_qty_per_unit) + + qty = req_qty_each * flt(self.doc.fg_completed_qty) + if qty <= 0: + continue + + item_args = self.get_item_dict(item) + item_args.update( + { + "conversion_factor": 1, + "s_warehouse": wo.wip_warehouse or item.source_warehouse, + "uom": item.stock_uom, + "qty": ceil_qty_if_uom_has_whole_number(qty, item.stock_uom), + } + ) + item_args["transfer_qty"] = item_args["qty"] + self.doc.append("items", item_args) + + def add_raw_materials_based_on_work_order(self): + bom_items = ( + self.wo_doc.get("required_items") + if self.wo_doc + else get_bom_items(self.doc.bom_no, self.doc.use_multi_level_bom) + ) + alternative_items = self.get_alternative_items(bom_items) + + for row in bom_items: + item_args = self.get_item_dict(row) + warehouse = self.doc.from_warehouse + if not warehouse: + if self.wo_doc.from_wip_warehouse: + warehouse = self.wo_doc.wip_warehouse + else: + warehouse = row.get("source_warehouse") + + item_args.update( + { + "conversion_factor": 1, + "item_group": row.get("item_group"), + "s_warehouse": warehouse, + "uom": row.stock_uom, + } + ) + + if self.wo_doc: + qty = (row.required_qty / self.wo_doc.qty) * self.doc.fg_completed_qty + else: + qty = flt(row.qty) * self.doc.fg_completed_qty + + item_args["qty"] = ceil_qty_if_uom_has_whole_number(qty, row.stock_uom) + item_args["transfer_qty"] = item_args["qty"] + + if alternative_item_details := alternative_items.get(row.item_code): + self.set_alternative_item_details(item_args, alternative_item_details) + + self.doc.append("items", item_args) + + def get_alternative_items(self, bom_items): + doctype = frappe.qb.DocType("Stock Entry") + child_doc = frappe.qb.DocType("Stock Entry Detail") + + query = ( + frappe.qb.from_(child_doc) + .inner_join(doctype) + .on(child_doc.parent == doctype.name) + .select( + child_doc.item_code, + child_doc.uom, + child_doc.stock_uom, + child_doc.conversion_factor, + child_doc.item_name, + child_doc.item_group, + child_doc.description, + child_doc.original_item, + ) + .where( + (doctype.work_order == self.doc.work_order) + & (doctype.purpose == "Material Transfer for Manufacture") + & (doctype.docstatus == 1) + ) + ) + + item_codes_in_bom = [row.item_code for row in bom_items] + if item_codes_in_bom: + query = query.where(child_doc.original_item.isin(item_codes_in_bom)) + + data = query.run(as_dict=1) + if not data: + return frappe._dict() + + alternative_items = frappe._dict() + for row in data: + alternative_items[row.original_item] = row + alternative_items[row.original_item].original_item = None + + return alternative_items + + def set_alternative_item_details(self, row, alternative_item_details): + if self.doc.work_order: + row.allow_alternative_item = self.wo_doc.allow_alternative_item + + if row.allow_alternative_item: + row.update(alternative_item_details) + + def add_raw_materials_based_on_transfer(self): + self.prepare_available_materials_based_on_transfer() + + pending_qty_to_mfg = flt(self.wo_doc.material_transferred_for_manufacturing) - flt( + self.wo_doc.produced_qty + ) + + if pending_qty_to_mfg <= 0 and not self.doc.get("is_return"): + return + + for row in self.available_materials: + row = self.available_materials[row] + item_args = self.get_item_dict(row) + qty = (flt(row.qty) * flt(self.doc.fg_completed_qty)) / pending_qty_to_mfg + item_args["qty"] = ceil_qty_if_uom_has_whole_number(qty, row.uom) + item_args["transfer_qty"] = item_args["qty"] + if row.serial_nos or (row.batches and len(row.batches) == 1): + item_args["serial_no"] = row.serial_nos[0 : cint(qty)] + item_args["batch_no"] = next(iter(row.batches.values())) + if not item_args["uom"]: + item_args["uom"] = row.stock_uom + + self.doc.append("items", item_args) + elif row.batches: + self.split_items_based_on_batches(qty, item_args, row) + + def split_items_based_on_batches(self, qty, item_args, row): + for batch_no, batch_qty in row.batches.items(): + if qty <= 0: + return + + if batch_qty >= qty: + item_args["qty"] = qty + qty = 0 + else: + item_args["qty"] = batch_qty + qty -= batch_qty + + row.batches[batch_no] -= batch_qty + if not item_args["uom"]: + item_args["uom"] = row.stock_uom + + item_args["transfer_qty"] = item_args["qty"] + + self.doc.append("items", item_args) + + def prepare_available_materials_based_on_transfer(self): + self.available_materials = frappe._dict() + self._transfer_entries = self.get_transfer_entries() + if not self._transfer_entries: + return + + self.add_materials_from_transfer() + self._consumption_entries = self.get_consumption_entries() + if not self._consumption_entries: + return + + self.remove_consumed_materials_from_available() + + def return_available_materials_in_source_wh(self): + for row in self.doc.items: + row.s_warehouse, row.t_warehouse = row.t_warehouse, row.s_warehouse + + def get_transfer_entries(self): + stock_entry = frappe.qb.DocType("Stock Entry") + stock_entry_detail = frappe.qb.DocType("Stock Entry Detail") + + return ( + frappe.qb.from_(stock_entry) + .inner_join(stock_entry_detail) + .on(stock_entry.name == stock_entry_detail.parent) + .select(stock_entry_detail.star) + .where( + (stock_entry.work_order == self.doc.work_order) + & (stock_entry.purpose == "Material Transfer for Manufacture") + & (stock_entry.docstatus == 1) + ) + .orderby(stock_entry_detail.idx) + ).run(as_dict=1) + + def add_materials_from_transfer(self): + for row in self._transfer_entries: + row.warehouse = row.t_warehouse + key = (row.item_code, row.warehouse) + if key not in self.available_materials: + self.available_materials[key] = frappe._dict(row) + + self.available_materials[key].qty += row.qty + + if row.serial_and_batch_bundle: + self.available_materials[key].update(self.get_sabb_details(row.serial_and_batch_bundle)) + + def get_consumption_entries(self): + stock_entry = frappe.qb.DocType("Stock Entry") + stock_entry_detail = frappe.qb.DocType("Stock Entry Detail") + + return ( + frappe.qb.from_(stock_entry) + .inner_join(stock_entry_detail) + .on(stock_entry.name == stock_entry_detail.parent) + .select(stock_entry_detail.star) + .where( + (stock_entry.work_order == self.doc.work_order) + & (stock_entry_detail.s_warehouse.isnotnull()) + & (stock_entry.purpose == "Manufacture") + & (stock_entry.docstatus == 1) + ) + .orderby(stock_entry_detail.idx) + ).run(as_dict=1) + + def remove_consumed_materials_from_available(self): + for row in self._consumption_entries: + row.warehouse = row.s_warehouse + key = (row.item_code, row.warehouse) + self.available_materials[key].qty -= row.qty + if row.serial_and_batch_bundle: + _details = self.get_sabb_details(row.serial_and_batch_bundle) + if _details.serial_nos: + for sn in _details.serial_nos: + self.available_materials[key].serial_nos.remove(sn) + elif _details.batches: + # Qty is in negative therefore added insted of subtraction + for batch_no, qty in _details.batches.items(): + self.available_materials[key].batches[batch_no] += qty + + def add_additional_cost(self): + if not self.wo_doc: + return + + add_additional_cost(self.doc, self.wo_doc) + + def add_secondary_items_from_job_card(self): + if not self.wo_doc: + return + + secondary_items = self.get_secondary_items_from_job_card() + for row in secondary_items: + row.uom = row.uom or row.stock_uom + row.qty = ceil_qty_if_uom_has_whole_number(row.stock_qty, row.stock_uom) + row.transfer_qty = row.qty + row.s_warehouse = None + row.t_warehouse = row.warehouse or self.doc.to_warehouse + row.is_legacy_scrap_item = row.is_legacy + row.type = row.get("type") + + self.doc.append("items", row) + + def get_secondary_items_from_job_card(self): + if not self.wo_doc.operations: + return [] + + secondary_items = get_secondary_items_from_job_card(self.doc.work_order, self.doc.job_card) + if self.doc.job_card: + pending_qty = flt(self.doc.fg_completed_qty) + else: + pending_qty = flt(self.get_completed_job_card_qty()) - flt(self.wo_doc.produced_qty) + + used_secondary_items = self.get_used_secondary_items() + for row in secondary_items: + row.stock_qty -= flt(used_secondary_items.get(row.item_code)) + row.stock_qty = (row.stock_qty) * flt(self.doc.fg_completed_qty) / flt(pending_qty) + + if used_secondary_items.get(row.item_code): + used_secondary_items[row.item_code] -= row.stock_qty + + return secondary_items + + def get_used_secondary_items(self): + used_secondary_items = defaultdict(float) + + StockEntry = frappe.qb.DocType("Stock Entry") + StockEntryDetail = frappe.qb.DocType("Stock Entry Detail") + data = ( + frappe.qb.from_(StockEntry) + .inner_join(StockEntryDetail) + .on(StockEntryDetail.parent == StockEntry.name) + .select(StockEntryDetail.item_code, StockEntryDetail.qty) + .where( + (StockEntry.work_order == self.doc.work_order) + & ((StockEntryDetail.type.isnotnull()) | (StockEntryDetail.is_legacy_scrap_item == 1)) + & (StockEntry.docstatus == 1) + & (StockEntry.purpose.isin(["Repack", "Manufacture"])) + ) + ).run(as_dict=1) + + for row in data: + used_secondary_items[row.item_code] += row.qty + + return used_secondary_items + + def get_completed_job_card_qty(self): + return flt(min([d.completed_qty for d in self.wo_doc.operations])) + + def get_sabb_details(self, sabb): + sabb_entries = frappe.get_all( + "Serial and Batch Entry", + filters={"parent": sabb, "docstatus": 1, "is_cancelled": 0}, + fields=["serial_no", "batch_no", "qty"], + order_by="idx", + ) + + serial_nos = [] + batches = defaultdict(float) + + for row in sabb_entries: + if row.serial_no: + serial_nos.append(row.serial_no) + else: + batches[row.batch_no] += row.qty + + return frappe._dict({"serial_nos": serial_nos, "batches": batches}) + + def on_submit(self): + self.update_job_card_and_work_order() + + def on_cancel(self): + self.update_job_card_and_work_order() + + def update_job_card_and_work_order(self): + def _validate_work_order(pro_doc): + msg, title = "", "" + if flt(pro_doc.docstatus) != 1: + msg = _("Work Order {0} must be submitted").format(self.doc.work_order) + + if pro_doc.status == "Stopped": + msg = _("Transaction not allowed against stopped Work Order {0}").format(self.doc.work_order) + + if msg: + frappe.throw(_(msg), title=title) + + if self.doc.job_card: + job_doc = frappe.get_doc("Job Card", self.doc.job_card) + job_doc.set_consumed_qty_in_job_card_item(self.doc) + job_doc.set_manufactured_qty() + job_doc.update_work_order() + + if self.doc.work_order: + _validate_work_order(self.wo_doc) + + if self.doc.fg_completed_qty: + self.wo_doc.run_method("update_work_order_qty") + self.wo_doc.run_method("update_planned_qty") + + self.wo_doc.run_method("update_status") + if not self.wo_doc.operations: + self.wo_doc.set_actual_dates() + + +class RepackStockEntry(BaseManufactureStockEntry): + def before_validate(self): + self.set_default_warehouse() + + def validate(self): + self.validate_raw_materials_exists() + self.validate_repack_entry() + + def validate_repack_entry(self): + fg_items = {row.item_code: row for row in self.doc.items if row.is_finished_item} + + if len(fg_items) > 1 and not all(row.set_basic_rate_manually for row in fg_items.values()): + frappe.throw( + _( + "When there are multiple finished goods ({0}) in a Repack stock entry, the basic rate for all finished goods must be set manually. To set rate manually, enable the checkbox 'Set Basic Rate Manually' in the respective finished good row." + ).format(", ".join(fg_items)), + title=_("Set Basic Rate Manually"), + ) + + def add_items(self): + self.add_raw_materials_based_on_bom() + self.set_process_loss_qty() + self.add_finished_goods() + self.add_secondary_items() + + def add_raw_materials_based_on_bom(self): + bom_items = get_bom_items(self.doc.bom_no, self.doc.use_multi_level_bom) + + for row in bom_items: + row.s_warehouse = self.doc.from_warehouse + row.qty = row.qty * self.doc.fg_completed_qty + row.transfer_qty = row.qty + if not row.uom: + row.uom = row.stock_uom + + self.doc.append("items", row) + + +class MaterialConsumptionForManufactureStockEntry(ManufactureStockEntry): + def before_validate(self): + self.set_default_warehouse() + + def validate(self): + self.validate_work_order() + + def add_items(self): + if self.backflush_based_on == "BOM" or self.wo_doc.skip_transfer: + self.add_raw_materials_based_on_work_order() + else: + self.add_raw_materials_based_on_transfer() + + +def get_bom_items(bom_no, use_multi_level_bom=None, qty=None, fetch_secondary_items=False): + if use_multi_level_bom is None: + use_multi_level_bom = frappe.get_cached_value("BOM", bom_no, "use_multi_level_bom") + + if qty is None: + qty = 1 + + table_name = "BOM Item" + if use_multi_level_bom: + table_name = "BOM Explosion Item" + + if fetch_secondary_items: + table_name = "BOM Secondary Item" + + bom_doc = frappe.qb.DocType("BOM") + doctype = frappe.qb.DocType(table_name) + + query = ( + frappe.qb.from_(doctype) + .inner_join(bom_doc) + .on(doctype.parent == bom_doc.name) + .select( + doctype.item_code, + doctype.item_name, + doctype.stock_uom, + doctype.description, + (doctype.stock_qty / bom_doc.quantity.as_("qty") * qty).as_("qty"), + doctype.rate.as_("basic_rate"), + ) + .where((bom_doc.name == bom_no) & (bom_doc.docstatus == 1)) + .orderby(doctype.idx) + ) + + if table_name == "BOM Secondary Item": + query = query.select( + doctype.name, + doctype.cost_allocation_per, + doctype.uom, + doctype.process_loss_per, + doctype.type, + doctype.is_legacy, + doctype.conversion_factor, + ) + elif table_name == "BOM Item": + query = query.select(doctype.allow_alternative_item, doctype.uom, doctype.conversion_factor) + + return query.run(as_dict=1) + + +def get_secondary_items(bom_no, work_order=None): + if ( + frappe.db.get_single_value( + "Manufacturing Settings", "set_op_cost_and_secondary_items_from_sub_assemblies" + ) + and work_order + and frappe.get_cached_value("Work Order", work_order, "use_multi_level_bom") + ): + return get_secondary_items_from_sub_assemblies(bom_no) + else: + return get_bom_items(bom_no, fetch_secondary_items=True) + + +def get_secondary_items_from_sub_assemblies(bom_no): + items = [] + bom_items = get_bom_items(bom_no) + items.extend(bom_items) + for row in bom_items: + if not row.bom_no: + continue + + items.extend(get_bom_items(row.bom_no, qty=row.qty, fetch_secondary_items=True)) + get_secondary_items_from_sub_assemblies(row.bom_no) + + return items + + +def get_secondary_items_from_job_card(work_order, jc_name=None): + job_card = frappe.qb.DocType("Job Card") + job_card_secondary_item = frappe.qb.DocType("Job Card Secondary Item") + + secondary_items = ( + frappe.qb.from_(job_card) + .select( + Sum(job_card_secondary_item.stock_qty).as_("stock_qty"), + job_card_secondary_item.item_code, + job_card_secondary_item.item_name, + job_card_secondary_item.description, + job_card_secondary_item.stock_uom, + job_card_secondary_item.type, + job_card_secondary_item.bom_secondary_item, + ) + .join(job_card_secondary_item) + .on(job_card_secondary_item.parent == job_card.name) + .where( + (job_card_secondary_item.item_code.isnotnull()) + & (job_card.work_order == work_order) + & (job_card.docstatus == 1) + ) + .groupby(job_card_secondary_item.item_code, job_card_secondary_item.type) + .orderby(job_card_secondary_item.idx) + ) + + if jc_name: + secondary_items = secondary_items.where(job_card.name == jc_name) + + return secondary_items.run(as_dict=1) + + +def ceil_qty_if_uom_has_whole_number(qty, stock_uom): + if cint(frappe.get_cached_value("UOM", stock_uom, "must_be_whole_number")): + qty = ceil(qty) + + return qty + + +@frappe.whitelist() +def move_sample_to_retention_warehouse(company: str, items: str | list): + if isinstance(items, str): + items = json.loads(items) + + retention_warehouse = frappe.get_single_value("Stock Settings", "sample_retention_warehouse") + stock_entry = frappe.new_doc("Stock Entry") + stock_entry.company = company + stock_entry.purpose = "Material Transfer" + stock_entry.set_stock_entry_type() + for item in items: + if item.get("sample_quantity") and item.get("serial_and_batch_bundle"): + warehouse = item.get("t_warehouse") or item.get("warehouse") + total_qty = 0 + cls_obj = SerialBatchCreation( + { + "type_of_transaction": "Outward", + "serial_and_batch_bundle": item.get("serial_and_batch_bundle"), + "item_code": item.get("item_code"), + "warehouse": warehouse, + "do_not_save": True, + } + ) + sabb = cls_obj.duplicate_package() + batches = get_batch_nos(item.get("serial_and_batch_bundle")) + sabe_list = [] + for batch_no in batches.keys(): + sample_quantity = validate_sample_quantity( + item.get("item_code"), + item.get("sample_quantity"), + item.get("transfer_qty") or item.get("qty"), + batch_no, + ) + + sabe = next(item for item in sabb.entries if item.batch_no == batch_no) + if sample_quantity: + if sabb.has_serial_no: + new_sabe = [ + entry + for entry in sabb.entries + if entry.batch_no == batch_no + and frappe.db.exists( + "Serial No", {"name": entry.serial_no, "warehouse": warehouse} + ) + ][: int(sample_quantity)] + sabe_list.extend(new_sabe) + total_qty += len(new_sabe) + else: + total_qty += sample_quantity + sabe.qty = sample_quantity + else: + sabb.entries.remove(sabe) + + if total_qty: + if sabe_list: + sabb.entries = sabe_list + sabb.save() + + stock_entry.append( + "items", + { + "item_code": item.get("item_code"), + "s_warehouse": warehouse, + "t_warehouse": retention_warehouse, + "qty": total_qty, + "basic_rate": item.get("valuation_rate"), + "uom": item.get("uom"), + "stock_uom": item.get("stock_uom"), + "conversion_factor": item.get("conversion_factor") or 1.0, + "serial_and_batch_bundle": sabb.name, + }, + ) + if stock_entry.get("items"): + return stock_entry.as_dict() + + +@frappe.whitelist() +def validate_sample_quantity(item_code: str, sample_quantity: int, qty: float, batch_no: str | None = None): + from erpnext.stock.doctype.batch.batch import get_batch_qty + + if cint(qty) < cint(sample_quantity): + frappe.throw( + _("Sample quantity {0} cannot be more than received quantity {1}").format(sample_quantity, qty) + ) + retention_warehouse = frappe.get_single_value("Stock Settings", "sample_retention_warehouse") + retainted_qty = 0 + if batch_no: + retainted_qty = get_batch_qty(batch_no, retention_warehouse, item_code) + max_retain_qty = frappe.get_value("Item", item_code, "sample_quantity") + if retainted_qty >= max_retain_qty: + frappe.msgprint( + _( + "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." + ).format(retainted_qty, batch_no, item_code, batch_no), + alert=True, + ) + sample_quantity = 0 + qty_diff = max_retain_qty - retainted_qty + if cint(sample_quantity) > cint(qty_diff): + frappe.msgprint( + _("Maximum Samples - {0} can be retained for Batch {1} and Item {2}.").format( + max_retain_qty, batch_no, item_code + ), + alert=True, + ) + sample_quantity = qty_diff + + return sample_quantity diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py new file mode 100644 index 00000000000..3d5fa95c730 --- /dev/null +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py @@ -0,0 +1,90 @@ +import frappe +from frappe import _ +from frappe.query_builder.functions import Sum + +from .manufacturing import get_bom_items + + +class MaterialReceiptStockEntry: + def __init__(self, se_doc): + self.doc = se_doc + + def before_validate(self): + self.set_default_warehouse() + + def validate(self): + self.validate_warehouse() + + def set_default_warehouse(self): + for row in self.doc.items: + if not row.t_warehouse and self.doc.to_warehouse: + row.t_warehouse = self.doc.to_warehouse + row.s_warehouse = None + + def validate_warehouse(self): + for row in self.doc.items: + if not row.t_warehouse: + frappe.throw(_("Target Warehouse is required for item {0}").format(row.item_code)) + + +class BaseMaterialIssueStockEntry: + def __init__(self, se_doc): + self.doc = se_doc + + def set_default_warehouse(self): + for row in self.doc.items: + if not row.s_warehouse and self.doc.from_warehouse: + row.s_warehouse = self.doc.from_warehouse + row.t_warehouse = None + + def validate_warehouse(self): + for row in self.doc.items: + if not row.s_warehouse: + frappe.throw(_("Source Warehouse is required for item {0}").format(row.item_code)) + + +class MaterialIssueStockEntry(BaseMaterialIssueStockEntry): + def before_validate(self): + self.set_default_warehouse() + + def validate(self): + self.validate_warehouse() + + def add_items(self): + self.add_raw_materials_based_on_bom() + + def add_raw_materials_based_on_bom(self): + bom_items = get_bom_items(self.doc.bom_no, self.doc.use_multi_level_bom) + + for row in bom_items: + row.s_warehouse = self.doc.from_warehouse + row.qty = row.qty * self.doc.fg_completed_qty + if not row.uom: + row.uom = row.stock_uom + + self.doc.append("items", row) + + +def get_consumed_items(self): + """Get all raw materials consumed through consumption entries""" + parent = frappe.qb.DocType("Stock Entry") + child = frappe.qb.DocType("Stock Entry Detail") + + query = ( + frappe.qb.from_(parent) + .join(child) + .on(parent.name == child.parent) + .select( + child.item_code, + Sum(child.qty).as_("qty"), + child.original_item, + ) + .where( + (parent.docstatus == 1) + & (parent.purpose == "Material Consumption for Manufacture") + & (parent.work_order == self.work_order) + ) + .groupby(child.item_code, child.original_item) + ) + + return query.run(as_dict=True) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py new file mode 100644 index 00000000000..1b775eb75d0 --- /dev/null +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py @@ -0,0 +1,486 @@ +import frappe +from frappe import _, bold +from frappe.query_builder.functions import Sum +from frappe.utils import cstr, flt, get_link_to_form + +from erpnext.manufacturing.doctype.bom.bom import get_backflush_based_on + +from .manufacturing import get_bom_items + + +class BaseMaterialTransferStockEntry: + def __init__(self, se_doc): + self.doc = se_doc + + def set_default_warehouse(self): + for row in self.doc.items: + if not row.t_warehouse and self.doc.to_warehouse: + row.t_warehouse = self.doc.to_warehouse + if not row.s_warehouse and self.doc.from_warehouse: + row.s_warehouse = self.doc.from_warehouse + + def validate_warehouse(self): + for row in self.doc.items: + if not row.t_warehouse: + frappe.throw(_("Target Warehouse is required for item {0}").format(row.item_code)) + if not row.s_warehouse: + frappe.throw(_("Source Warehouse is required for item {0}").format(row.item_code)) + + def validate_same_source_target_warehouse(self): + """ + Raises: frappe.ValidationError: If warehouses are same and no inventory dimensions differ + """ + + if not frappe.get_single_value("Stock Settings", "validate_material_transfer_warehouses"): + return + + from erpnext.stock.doctype.inventory_dimension.inventory_dimension import get_inventory_dimensions + + inventory_dimensions = get_inventory_dimensions() + for item in self.doc.items: + if cstr(item.s_warehouse) == cstr(item.t_warehouse): + if not inventory_dimensions: + frappe.throw( + _( + "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" + ).format(item.idx), + title=_("Invalid Source and Target Warehouse"), + ) + else: + difference_found = False + for dimension in inventory_dimensions: + fieldname = ( + dimension.source_fieldname + if dimension.source_fieldname.startswith("to_") + else f"to_{dimension.source_fieldname}" + ) + if ( + item.get(dimension.source_fieldname) + and item.get(fieldname) + and item.get(dimension.source_fieldname) != item.get(fieldname) + ): + difference_found = True + break + if not difference_found: + frappe.throw( + _( + "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" + ).format(item.idx), + title=_("Invalid Source and Target Warehouse"), + ) + + @property + def wo_doc(self): + if not getattr(self, "_wo_doc", None): + if self.doc.work_order: + self._wo_doc = frappe.get_doc("Work Order", self.doc.work_order) + return getattr(self, "_wo_doc", None) + + @property + def backflush_based_on(self): + return get_backflush_based_on(self.doc.bom_no) + + +class MaterialTransferStockEntry(BaseMaterialTransferStockEntry): + def before_validate(self): + self.set_default_warehouse() + + def validate(self): + self.validate_warehouse() + self.validate_same_source_target_warehouse() + + +class MaterialTransferForManufactureStockEntry(BaseMaterialTransferStockEntry): + def before_validate(self): + self.set_default_warehouse() + + def validate(self): + self.validate_warehouse() + self.validate_component_and_quantities() + self.validate_same_source_target_warehouse() + + def validate_component_and_quantities(self): + if not frappe.db.get_single_value("Manufacturing Settings", "validate_components_quantities_per_bom"): + return + + if not self.doc.fg_completed_qty: + return + + precision = frappe.get_precision("Stock Entry Detail", "qty") + bom_items = get_bom_items(self.doc.bom_no, self.doc.use_multi_level_bom) + + for row in bom_items: + row.qty = row.qty * self.doc.fg_completed_qty + if matched_item := self.get_matched_items(row.item_code): + if flt(row.qty, precision) != flt(matched_item.qty, precision): + frappe.throw( + _( + "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." + ).format( + bold(row.item_code), + flt(row.qty), + get_link_to_form("BOM", self.doc.bom_no), + ), + title=_("Incorrect Component Quantity"), + ) + else: + frappe.throw( + _("According to the BOM {0}, the Item '{1}' is missing in the stock entry.").format( + get_link_to_form("BOM", self.doc.bom_no), bold(row.item_code) + ), + title=_("Missing Item"), + ) + + def add_items(self): + item_dict = self.get_pending_raw_materials() + if self.doc.to_warehouse and self.wo_doc: + for item in item_dict.values(): + item["s_warehouse"] = item.get("from_warehouse") + item["t_warehouse"] = self.wo_doc.wip_warehouse + + for item_code in item_dict: + self.doc.append("items", item_dict[item_code]) + + def get_pending_raw_materials(self): + """ + issue (item quantity) that is pending to issue or desire to transfer, + whichever is less + """ + item_dict = self.get_work_order_required_items() + + max_qty = flt(self.wo_doc.qty) + + allow_overproduction = False + overproduction_percentage = flt( + frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order") + ) + + transfer_extra_materials_percentage = flt( + frappe.db.get_single_value("Manufacturing Settings", "transfer_extra_materials_percentage") + ) + + to_transfer_qty = flt(self.wo_doc.material_transferred_for_manufacturing) + flt( + self.doc.fg_completed_qty + ) + transfer_limit_qty = max_qty + ((max_qty * overproduction_percentage) / 100) + if transfer_extra_materials_percentage: + transfer_limit_qty = max_qty + ((max_qty * transfer_extra_materials_percentage) / 100) + + if transfer_limit_qty >= to_transfer_qty: + allow_overproduction = True + + for item, item_details in item_dict.items(): + pending_to_issue = flt(item_details.required_qty) - flt(item_details.transferred_qty) + desire_to_transfer = flt(self.doc.fg_completed_qty) * flt(item_details.required_qty) / max_qty + + if ( + desire_to_transfer <= pending_to_issue + or ( + desire_to_transfer > 0 + and self.backflush_based_on == "Material Transferred for Manufacture" + ) + or allow_overproduction + ): + # "No need for transfer but qty still pending to transfer" case can occur + # when transferring multiple RM in different Stock Entries + item_dict[item]["qty"] = desire_to_transfer if (desire_to_transfer > 0) else pending_to_issue + elif pending_to_issue > 0: + item_dict[item]["qty"] = pending_to_issue + else: + item_dict[item]["qty"] = 0 + + # delete items with 0 qty + list_of_items = list(item_dict.keys()) + for item in list_of_items: + if not item_dict[item]["qty"]: + del item_dict[item] + + # show some message + if not len(item_dict): + frappe.msgprint(_("""All items have already been transferred for this Work Order.""")) + + return item_dict + + def get_work_order_required_items(self): + """ + Gets Work Order Required Items only if Stock Entry purpose is **Material Transferred for Manufacture**. + """ + item_dict, job_card_items = frappe._dict(), [] + work_order = self.wo_doc + + consider_job_card = work_order.transfer_material_against == "Job Card" and self.doc.get("job_card") + if consider_job_card: + job_card_items = self.get_job_card_item_codes() + + if not frappe.db.get_value("Warehouse", work_order.wip_warehouse, "is_group"): + wip_warehouse = work_order.wip_warehouse + else: + wip_warehouse = None + + transfer_extra_materials_percentage = flt( + frappe.db.get_single_value("Manufacturing Settings", "transfer_extra_materials_percentage") + ) + + for d in work_order.get("required_items"): + if consider_job_card and (d.item_code not in job_card_items): + continue + + additional_qty = 0.0 + if transfer_extra_materials_percentage: + additional_qty = transfer_extra_materials_percentage * flt(d.required_qty) / 100 + + transfer_pending = flt(d.required_qty) > flt(d.transferred_qty) + if additional_qty: + transfer_pending = (flt(d.required_qty) + additional_qty) > flt(d.transferred_qty) + + can_transfer = transfer_pending or ( + self.backflush_based_on == "Material Transferred for Manufacture" + ) + + if not can_transfer: + continue + + if d.include_item_in_manufacturing: + item_row = d.as_dict() + item_row["idx"] = len(item_dict) + 1 + + if consider_job_card: + job_card_item = frappe.db.get_value( + "Job Card Item", {"item_code": d.item_code, "parent": self.doc.get("job_card")} + ) + item_row["job_card_item"] = job_card_item or None + + if d.source_warehouse and not frappe.db.get_value( + "Warehouse", d.source_warehouse, "is_group" + ): + item_row["from_warehouse"] = d.source_warehouse + + item_row["to_warehouse"] = wip_warehouse + if item_row["allow_alternative_item"]: + item_row["allow_alternative_item"] = work_order.allow_alternative_item + + item_dict.setdefault(d.item_code, item_row) + + return item_dict + + def get_job_card_item_codes(self): + if not self.doc.get("job_card"): + return [] + + return frappe.get_all( + "Job Card Item", filters={"parent": self.doc.get("job_card")}, pluck="item_code", distinct=True + ) + + def on_submit(self): + self.update_job_card_and_work_order() + + def on_cancel(self): + self.update_job_card_and_work_order() + + def update_job_card_and_work_order(self): + def _validate_work_order(pro_doc): + msg, title = "", "" + if flt(pro_doc.docstatus) != 1: + msg = _("Work Order {0} must be submitted").format(self.doc.work_order) + + if pro_doc.status == "Stopped": + msg = _("Transaction not allowed against stopped Work Order {0}").format(self.doc.work_order) + + if msg: + frappe.throw(_(msg), title=title) + + if self.doc.job_card: + job_doc = frappe.get_doc("Job Card", self.doc.job_card) + job_doc.set_transferred_qty(update_status=True) + job_doc.set_transferred_qty_in_job_card_item(self.doc) + + if self.doc.work_order: + _validate_work_order(self.wo_doc) + + if self.doc.fg_completed_qty: + if self.doc.docstatus == 1: + self.wo_doc.add_additional_items(self.doc) + else: + self.wo_doc.remove_additional_items(self.doc) + + self.wo_doc.run_method("update_work_order_qty") + + self.wo_doc.run_method("update_status") + if not self.wo_doc.operations: + self.wo_doc.set_actual_dates() + + +class MaterialRequestStockEntry(BaseMaterialTransferStockEntry): + def before_validate(self): + self.set_default_warehouse() + + def validate(self): + self.validate_warehouse() + self.validate_material_request() + + def get_material_request(self, item_row): + material_request = item_row.material_request or None + material_request_item = item_row.material_request_item or None + + if self.doc.outgoing_stock_entry: + parent_se = frappe.get_value( + "Stock Entry Detail", + item_row.ste_detail, + ["material_request", "material_request_item"], + as_dict=True, + ) + if parent_se: + material_request = parent_se.material_request + material_request_item = parent_se.material_request_item + + return material_request, material_request_item + + def validate_material_request(self): + for row in self.doc.items: + material_request, material_request_item = self.get_material_request(row) + if not material_request: + return + + mreq_item = frappe.db.get_value( + "Material Request Item", + {"name": material_request_item, "parent": material_request}, + ["item_code", "warehouse", "idx"], + as_dict=True, + ) + + if mreq_item.item_code != row.item_code: + frappe.throw( + _("Item for row {0} does not match Material Request").format(self.idx), + frappe.MappingMismatchError, + ) + + def on_submit(self): + self.update_transferred_qty() + if self.doc.add_to_transit: + self.set_material_request_transfer_status("In Transit") + + if self.doc.outgoing_stock_entry: + self.set_material_request_transfer_status("Completed") + + def on_cancel(self): + self.update_transferred_qty() + if self.doc.add_to_transit: + self.set_material_request_transfer_status("Not Started") + + if self.doc.outgoing_stock_entry: + self.set_material_request_transfer_status("In Transit") + + def update_transferred_qty(self): + if not self.doc.outgoing_stock_entry: + return + + stock_entries, child_list = self._collect_transferred_qtys() + if not stock_entries: + return + + self._bulk_update_transferred_qty(stock_entries, child_list) + self._update_per_transferred_field() + + def _get_item_transferred_qty(self, item): + sed = frappe.qb.DocType("Stock Entry Detail") + result = ( + frappe.qb.from_(sed) + .select(Sum(sed.transfer_qty).as_("qty")) + .where( + (sed.against_stock_entry == item.against_stock_entry) + & (sed.ste_detail == item.ste_detail) + & (sed.docstatus == 1) + ) + ).run(as_dict=True) + return result[0].qty if result and result[0].qty else 0.0 + + def _validate_item_transferred_qty(self, item, transferred_qty): + if item.docstatus != 1: + return + + transfer_qty = frappe.get_value("Stock Entry Detail", item.ste_detail, "transfer_qty") + if transferred_qty > transfer_qty: + frappe.throw( + _("Row {0}: Transferred quantity cannot be greater than the requested quantity.").format( + item.idx + ) + ) + + def _collect_transferred_qtys(self): + stock_entries, child_list = {}, [] + for item in self.doc.items: + if not (item.against_stock_entry and item.ste_detail): + continue + + transferred_qty = self._get_item_transferred_qty(item) + self._validate_item_transferred_qty(item, transferred_qty) + child_list.append(item.ste_detail) + stock_entries[(item.against_stock_entry, item.ste_detail)] = transferred_qty + return stock_entries, child_list + + def _bulk_update_transferred_qty(self, stock_entries, child_list): + from pypika import Case + + sed = frappe.qb.DocType("Stock Entry Detail") + case_expr = Case() + for (parent, name), qty in stock_entries.items(): + case_expr = case_expr.when((sed.parent == parent) & (sed.name == name), qty) + ( + frappe.qb.update(sed) + .set(sed.transferred_qty, case_expr.else_(sed.transferred_qty)) + .where(sed.name.isin(child_list)) + ).run() + + def _update_per_transferred_field(self): + self.doc._update_percent_field_in_targets( + { + "source_dt": "Stock Entry Detail", + "target_field": "transferred_qty", + "target_ref_field": "qty", + "target_dt": "Stock Entry Detail", + "join_field": "ste_detail", + "target_parent_dt": "Stock Entry", + "target_parent_field": "per_transferred", + "source_field": "qty", + "percent_join_field": "against_stock_entry", + }, + update_modified=True, + ) + + def set_material_request_transfer_status(self, status): + material_requests = [] + parent_se = None + if self.doc.outgoing_stock_entry: + parent_se = frappe.get_value("Stock Entry", self.doc.outgoing_stock_entry, "add_to_transit") + + for item in self.doc.items: + material_request = item.get("material_request") + if material_request not in material_requests: + if self.doc.outgoing_stock_entry and parent_se: + material_request = frappe.get_value( + "Stock Entry Detail", item.ste_detail, "material_request" + ) + + if material_request and material_request not in material_requests: + material_requests.append(material_request) + if status == "Completed": + qty = get_transferred_qty(material_request) + if qty.get("transfer_qty") > qty.get("transferred_qty"): + status = "In Transit" + + frappe.db.set_value("Material Request", material_request, "transfer_status", status) + + +def get_transferred_qty(material_request): + sed = frappe.qb.DocType("Stock Entry Detail") + + query = ( + frappe.qb.from_(sed) + .select( + Sum(sed.transfer_qty).as_("transfer_qty"), + Sum(sed.transferred_qty).as_("transferred_qty"), + ) + .where((sed.material_request == material_request) & (sed.docstatus == 1)) + ).run(as_dict=True) + + return query[0] diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/serial_batch.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/serial_batch.py new file mode 100644 index 00000000000..0c985f035a9 --- /dev/null +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/serial_batch.py @@ -0,0 +1,370 @@ +from collections import defaultdict + +import frappe +from frappe import _ +from frappe.utils import cint, cstr, flt, nowdate + +from erpnext.manufacturing.doctype.bom.bom import get_backflush_based_on +from erpnext.stock.serial_batch_bundle import SerialBatchCreation, get_serial_or_batch_items +from erpnext.stock.utils import get_combine_datetime + + +class StockEntrySABB: + def __init__(self, se_doc): + self.doc = se_doc + + def make_serial_and_batch_bundle_for_outward(self): + serial_or_batch_items = get_serial_or_batch_items(self.doc.items) + if not serial_or_batch_items: + return + + serial_nos, batch_nos = self.get_serial_batch_fields_for_subcontracting_inward() + already_picked_serial_nos = [] + + for row in self.doc.items: + if row.use_serial_batch_fields: + continue + + if not row.s_warehouse: + continue + + if row.item_code not in serial_or_batch_items: + continue + + bundle_doc = None + if row.serial_and_batch_bundle and abs(row.transfer_qty) != abs( + frappe.get_cached_value("Serial and Batch Bundle", row.serial_and_batch_bundle, "total_qty") + ): + bundle_doc = SerialBatchCreation( + { + "item_code": row.item_code, + "warehouse": row.s_warehouse, + "serial_and_batch_bundle": row.serial_and_batch_bundle, + "type_of_transaction": "Outward", + "ignore_serial_nos": already_picked_serial_nos, + "qty": row.transfer_qty * -1, + } + ).update_serial_and_batch_entries( + serial_nos=serial_nos.get(row.name), batch_nos=batch_nos.get(row.name) + ) + elif not row.serial_and_batch_bundle and frappe.get_single_value( + "Stock Settings", "auto_create_serial_and_batch_bundle_for_outward" + ): + bundle_doc = SerialBatchCreation( + { + "item_code": row.item_code, + "warehouse": row.s_warehouse, + "posting_datetime": get_combine_datetime( + self.doc.posting_date, self.doc.posting_time + ), + "voucher_type": self.doc.doctype, + "voucher_detail_no": row.name, + "qty": row.transfer_qty * -1, + "ignore_serial_nos": already_picked_serial_nos, + "type_of_transaction": "Outward", + "company": self.doc.company, + "do_not_submit": True, + } + ).make_serial_and_batch_bundle( + serial_nos=serial_nos.get(row.name), batch_nos=batch_nos.get(row.name) + ) + + if not bundle_doc: + continue + + for entry in bundle_doc.entries: + if not entry.serial_no: + continue + + already_picked_serial_nos.append(entry.serial_no) + + row.serial_and_batch_bundle = bundle_doc.name + + def get_serial_nos_and_batches_from_sres(self, scio_detail, only_pending=True): + serial_nos, batch_nos = [], frappe._dict() + + table = frappe.qb.DocType("Stock Reservation Entry") + child_table = frappe.qb.DocType("Serial and Batch Entry") + query = ( + frappe.qb.from_(table) + .join(child_table) + .on(table.name == child_table.parent) + .select(child_table.serial_no, child_table.batch_no, child_table.qty) + .where((table.docstatus == 1) & (table.voucher_detail_no == scio_detail)) + ) + + if only_pending: + query = query.where(child_table.qty != child_table.delivered_qty) + else: + query = query.where(child_table.delivered_qty > 0) + + for d in query.run(as_dict=True): + if d.serial_no and d.serial_no not in serial_nos: + serial_nos.append(d.serial_no) + if d.batch_no and d.batch_no not in batch_nos: + batch_nos[d.batch_no] = d.qty + + return serial_nos, batch_nos + + def get_serial_batch_fields_for_subcontracting_inward(self): + serial_nos, batch_nos = frappe._dict(), frappe._dict() + for row in self.doc.items: + if self.doc.purpose in [ + "Return Raw Material to Customer", + "Subcontracting Delivery", + "Subcontracting Return", + ]: + if not row.serial_and_batch_bundle: + serial_nos_list, batch_nos_list = self.get_serial_nos_and_batches_from_sres( + row.scio_detail, only_pending=self.doc.purpose != "Subcontracting Return" + ) + + if len(batch_nos_list) > 1: + row.use_serial_batch_fields = 0 + + if row.use_serial_batch_fields: + if serial_nos_list and not row.serial_no: + row.serial_no = "\n".join(serial_nos_list) + if batch_nos_list and not row.batch_no: + row.batch_no = next(iter(batch_nos_list.keys())) + + serial_nos[row.name], batch_nos[row.name] = serial_nos_list, batch_nos_list + + return serial_nos, batch_nos + + def get_available_reserved_materials(self): + from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import ( + get_reserved_materials, + ) + + voucher_no = self.doc.work_order or self.doc.subcontracting_order + reserved_entries = get_reserved_materials(voucher_no) + if not reserved_entries: + return {} + + itemwise_serial_batch_qty = frappe._dict() + + for d in reserved_entries: + key = (d.item_code, d.warehouse) + if key not in itemwise_serial_batch_qty: + itemwise_serial_batch_qty[key] = frappe._dict( + { + "serial_no": [], + "batch_no": defaultdict(float), + "batchwise_sn": defaultdict(list), + } + ) + + details = itemwise_serial_batch_qty[key] + if d.batch_no: + details.batch_no[d.batch_no] += d.qty + if d.serial_no: + details.batchwise_sn[d.batch_no].extend(d.serial_no.split("\n")) + elif d.serial_no: + details.serial_no.append(d.serial_no) + + return itemwise_serial_batch_qty + + def set_serial_batch_based_on_reservation(self): + if self.doc.work_order and frappe.get_cached_value( + "Work Order", self.doc.work_order, "reserve_stock" + ): + skip_transfer = frappe.get_cached_value("Work Order", self.doc.work_order, "skip_transfer") + backflush_based_on = get_backflush_based_on(self.doc.bom_no) + + if ( + self.doc.purpose not in ["Material Transfer for Manufacture"] + and backflush_based_on != "BOM" + and not skip_transfer + ): + return + + reservation_entries = self.get_available_reserved_materials() + if not reservation_entries: + return + + new_items_to_add = [] + for d in self.doc.items: + if d.serial_and_batch_bundle or d.serial_no or d.batch_no: + continue + + key = (d.item_code, d.s_warehouse) + if details := reservation_entries.get(key): + original_qty = d.qty + if batches := details.get("batch_no"): + for batch_no, qty in batches.items(): + if original_qty <= 0: + break + + if qty <= 0: + continue + + if d.batch_no and original_qty > 0: + new_row = frappe.copy_doc(d) + new_row.name = None + new_row.batch_no = batch_no + new_row.qty = qty + new_row.idx = d.idx + 1 + if new_row.batch_no and details.get("batchwise_sn"): + new_row.serial_no = "\n".join( + details.get("batchwise_sn")[new_row.batch_no][: cint(new_row.qty)] + ) + + new_items_to_add.append(new_row) + original_qty -= qty + batches[batch_no] -= qty + + if qty >= d.qty and not d.batch_no: + d.batch_no = batch_no + batches[batch_no] -= d.qty + if d.batch_no and details.get("batchwise_sn"): + d.serial_no = "\n".join( + details.get("batchwise_sn")[d.batch_no][: cint(d.qty)] + ) + elif not d.batch_no: + d.batch_no = batch_no + d.qty = qty + original_qty -= qty + batches[batch_no] = 0 + + if d.batch_no and details.get("batchwise_sn"): + d.serial_no = "\n".join( + details.get("batchwise_sn")[d.batch_no][: cint(d.qty)] + ) + + if details.get("serial_no"): + d.serial_no = "\n".join(details.get("serial_no")[: cint(d.qty)]) + + d.use_serial_batch_fields = 1 + + for new_row in new_items_to_add: + self.doc.append("items", new_row) + + sorted_items = sorted(self.doc.items, key=lambda x: x.item_code) + if self.doc.purpose == "Manufacture": + # ensure finished item at last + sorted_items = sorted(sorted_items, key=lambda x: cstr(x.t_warehouse)) + + idx = 0 + for row in sorted_items: + idx += 1 + row.idx = idx + + self.doc.set("items", sorted_items) + + +def create_serial_and_batch_bundle(parent_doc, row, child, type_of_transaction=None): + item_details = frappe.get_cached_value( + "Item", child.item_code, ["has_serial_no", "has_batch_no"], as_dict=1 + ) + + if not (item_details.has_serial_no or item_details.has_batch_no): + return + + if not type_of_transaction: + type_of_transaction = "Inward" + + doc = frappe.get_doc( + { + "doctype": "Serial and Batch Bundle", + "voucher_type": "Stock Entry", + "item_code": child.item_code, + "warehouse": child.warehouse, + "type_of_transaction": type_of_transaction, + "posting_date": parent_doc.posting_date, + "posting_time": parent_doc.posting_time, + } + ) + + precision = frappe.get_precision("Stock Entry Detail", "qty") + if row.serial_nos and row.batches_to_be_consume: + doc.has_serial_no = 1 + doc.has_batch_no = 1 + batchwise_serial_nos = get_batchwise_serial_nos(child.item_code, row) + for batch_no, qty in row.batches_to_be_consume.items(): + while flt(qty, precision) > 0: + qty -= 1 + doc.append( + "entries", + { + "batch_no": batch_no, + "serial_no": batchwise_serial_nos.get(batch_no).pop(0), + "warehouse": row.warehouse, + "qty": -1, + }, + ) + + elif row.serial_nos: + doc.has_serial_no = 1 + for serial_no in row.serial_nos: + doc.append("entries", {"serial_no": serial_no, "warehouse": row.warehouse, "qty": -1}) + + elif row.batches_to_be_consume: + precision = frappe.get_precision("Serial and Batch Entry", "qty") + doc.has_batch_no = 1 + for batch_no, qty in row.batches_to_be_consume.items(): + if flt(qty, precision) > 0: + qty = flt(qty, precision) + doc.append("entries", {"batch_no": batch_no, "warehouse": row.warehouse, "qty": qty * -1}) + + if not doc.entries: + return None + + return doc.insert(ignore_permissions=True).name + + +def get_batchwise_serial_nos(item_code, row): + batchwise_serial_nos = {} + + for batch_no in row.batches_to_be_consume: + serial_nos = frappe.get_all( + "Serial No", + filters={"item_code": item_code, "batch_no": batch_no, "name": ("in", row.serial_nos)}, + ) + + if serial_nos: + batchwise_serial_nos[batch_no] = sorted([serial_no.name for serial_no in serial_nos]) + + return batchwise_serial_nos + + +@frappe.whitelist() +def get_expired_batch_items(): + from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import get_auto_batch_nos + + expired_batches = get_expired_batches() + if not expired_batches: + return [] + + expired_batches_stock = get_auto_batch_nos( + frappe._dict( + { + "batch_no": list(expired_batches.keys()), + "for_stock_levels": True, + } + ) + ) + + for row in expired_batches_stock: + row.update(expired_batches.get(row.batch_no)) + + return expired_batches_stock + + +def get_expired_batches(): + batch = frappe.qb.DocType("Batch") + + data = ( + frappe.qb.from_(batch) + .select(batch.item, batch.name.as_("batch_no"), batch.stock_uom) + .where((batch.expiry_date <= nowdate()) & (batch.expiry_date.isnotnull())) + ).run(as_dict=True) + + if not data: + return [] + + expired_batches = frappe._dict() + for row in data: + expired_batches[row.batch_no] = row + + return expired_batches diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py new file mode 100644 index 00000000000..9dac0f1dd40 --- /dev/null +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py @@ -0,0 +1,243 @@ +import frappe +from frappe import _, bold +from frappe.query_builder.functions import Sum +from frappe.utils import flt + +from erpnext.stock.utils import get_bin + + +class SendToSubcontractorStockEntry: + def __init__(self, se_doc): + self.doc = se_doc + + def validate(self): + self.validate_subcontract_order() + + def validate_subcontract_order(self): + """Throw exception if more raw material is transferred against Subcontract Order than in + the raw materials supplied table""" + backflush_raw_materials_based_on = frappe.db.get_single_value( + "Buying Settings", "backflush_raw_materials_of_subcontract_based_on" + ) + + if backflush_raw_materials_based_on == "BOM": + subcontract_order = frappe.get_doc( + self.doc.subcontract_data.order_doctype, self.doc.get(self.doc.subcontract_data.order_field) + ) + for se_item in self.doc.items: + self.validate_subcontracting_order_for_bom(se_item, subcontract_order) + + elif backflush_raw_materials_based_on == "Material Transferred for Subcontract": + for row in self.doc.items: + self.validate_subcontracting_order_for_transfer(row) + + def validate_subcontracting_order_for_bom(self, child_row, subcontract_order): + def get_required_qty(item_code): + return sum( + flt(d.required_qty) for d in subcontract_order.supplied_items if d.rm_item_code == item_code + ) + + qty_allowance = flt(frappe.db.get_single_value("Buying Settings", "over_transfer_allowance")) + item_code = child_row.original_item or child_row.item_code + required_qty = get_required_qty(item_code) + + if not required_qty and child_row.allow_alternative_item: + original_item_code = frappe.get_value( + "Item Alternative", {"alternative_item_code": item_code}, "item_code" + ) + required_qty = get_required_qty(original_item_code) + + if not required_qty: + frappe.throw( + _("Item {0} not found in 'Raw Materials Supplied' table in {1} {2}").format( + item_code, + self.doc.subcontract_data.order_doctype, + self.doc.get(self.doc.subcontract_data.order_field), + ) + ) + + total_allowed = required_qty + (required_qty * (qty_allowance / 100)) + total_supplied = self.get_total_supplied_qty(child_row) + + total_returned = 0 + if self.doc.subcontract_data.order_doctype == "Subcontracting Order": + total_returned = self.get_total_returned_qty(child_row) + + if flt( + total_supplied + child_row.transfer_qty - total_returned, child_row.precision("transfer_qty") + ) > flt(total_allowed, child_row.precision("transfer_qty")): + frappe.throw( + _("Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}").format( + child_row.idx, + item_code, + total_allowed, + self.doc.subcontract_data.order_doctype, + self.doc.get(self.doc.subcontract_data.order_field), + ) + ) + elif not self.doc.get(self.doc.subcontract_data.rm_detail_field): + order_rm_detail = self.get_order_rm_detail(child_row) + if order_rm_detail: + child_row.db_set(self.doc.subcontract_data.rm_detail_field, order_rm_detail) + else: + if not child_row.allow_alternative_item: + frappe.throw( + _("Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}").format( + child_row.idx, + item_code, + self.doc.subcontract_data.order_doctype, + self.doc.get(self.doc.subcontract_data.order_field), + ) + ) + + def validate_subcontracting_order_for_transfer(self, child_row): + if not self.doc.subcontracted_item: + frappe.throw( + _("Row {0}: Subcontracted Item is mandatory for the raw material {1}").format( + child_row.idx, bold(child_row.item_code) + ) + ) + elif not self.doc.get(self.doc.subcontract_data.rm_detail_field): + order_rm_detail = self.get_order_rm_detail(child_row) + if order_rm_detail: + child_row.db_set(self.doc.subcontract_data.rm_detail_field, order_rm_detail) + + def get_total_supplied_qty(self, child_row): + se = frappe.qb.DocType("Stock Entry") + se_detail = frappe.qb.DocType("Stock Entry Detail") + + return ( + frappe.qb.from_(se) + .inner_join(se_detail) + .on(se.name == se_detail.parent) + .select(Sum(se_detail.transfer_qty)) + .where( + (se.purpose == "Send to Subcontractor") + & (se.docstatus == 1) + & (se_detail.item_code == child_row.item_code) + & ( + ( + (se.purchase_order == self.doc.purchase_order) + & (se_detail.po_detail == self.doc.po_detail) + ) + if self.doc.subcontract_data.order_doctype == "Purchase Order" + else ( + (se.subcontracting_order == self.doc.subcontracting_order) + & (se_detail.sco_rm_detail == child_row.sco_rm_detail) + ) + ) + ) + ).run()[0][0] or 0 + + def get_total_returned_qty(self, child_row): + se = frappe.qb.DocType("Stock Entry") + se_detail = frappe.qb.DocType("Stock Entry Detail") + + return ( + frappe.qb.from_(se) + .inner_join(se_detail) + .on(se.name == se_detail.parent) + .select(Sum(se_detail.transfer_qty)) + .where( + (se.purpose == "Material Transfer") + & (se.docstatus == 1) + & (se.is_return == 1) + & (se_detail.item_code == child_row.item_code) + & (se_detail.sco_rm_detail == child_row.sco_rm_detail) + & (se.subcontracting_order == self.doc.subcontracting_order) + ) + ).run()[0][0] or 0 + + def get_order_rm_detail(self, child_row): + filters = { + "parent": self.doc.get(self.doc.subcontract_data.order_field), + "docstatus": 1, + "rm_item_code": child_row.item_code, + "main_item_code": child_row.subcontracted_item, + } + + return frappe.db.get_value(self.doc.subcontract_data.order_supplied_items_field, filters, "name") + + def on_submit(self): + self.update_subcontract_order_supplied_items() + + def on_cancel(self): + self.update_subcontract_order_supplied_items() + + def update_subcontract_order_supplied_items(self): + if not self.doc.get(self.doc.subcontract_data.order_field): + return + + # Get Subcontract Order Supplied Items Details + order_supplied_items = frappe.db.get_all( + self.doc.subcontract_data.order_supplied_items_field, + filters={"parent": self.doc.get(self.doc.subcontract_data.order_field)}, + fields=["name", "rm_item_code", "reserve_warehouse"], + ) + + # Get Items Supplied in Stock Entries against Subcontract Order + supplied_items = get_supplied_items( + self.doc.get(self.doc.subcontract_data.order_field), + self.doc.subcontract_data.rm_detail_field, + self.doc.subcontract_data.order_field, + ) + + for row in order_supplied_items: + key, item = row.name, {} + if not supplied_items.get(key): + # no stock transferred against Subcontract Order Supplied Items row + item = {"supplied_qty": 0, "returned_qty": 0, "total_supplied_qty": 0} + else: + item = supplied_items.get(key) + + frappe.db.set_value(self.doc.subcontract_data.order_supplied_items_field, row.name, item) + + # RM Item-Reserve Warehouse Dict + item_wh = {x.get("rm_item_code"): x.get("reserve_warehouse") for x in order_supplied_items} + + for d in self.doc.get("items"): + # Update reserved sub contracted quantity in bin based on Supplied Item Details and + item_code = d.get("original_item") or d.get("item_code") + reserve_warehouse = item_wh.get(item_code) + if not (reserve_warehouse and item_code): + continue + stock_bin = get_bin(item_code, reserve_warehouse) + stock_bin.update_reserved_qty_for_sub_contracting() + + +def get_supplied_items( + subcontract_order, rm_detail_field="sco_rm_detail", subcontract_order_field="subcontracting_order" +): + fields = [ + "`tabStock Entry Detail`.`transfer_qty`", + "`tabStock Entry`.`is_return`", + f"`tabStock Entry Detail`.`{rm_detail_field}`", + "`tabStock Entry Detail`.`item_code`", + ] + + filters = [ + ["Stock Entry", "docstatus", "=", 1], + ["Stock Entry", subcontract_order_field, "=", subcontract_order], + ] + + supplied_item_details = {} + for row in frappe.get_all("Stock Entry", fields=fields, filters=filters): + if not row.get(rm_detail_field): + continue + + key = row.get(rm_detail_field) + if key not in supplied_item_details: + supplied_item_details.setdefault( + key, frappe._dict({"supplied_qty": 0, "returned_qty": 0, "total_supplied_qty": 0}) + ) + + supplied_item = supplied_item_details[key] + + if row.is_return: + supplied_item.returned_qty += row.transfer_qty + else: + supplied_item.supplied_qty += row.transfer_qty + + supplied_item.total_supplied_qty = flt(supplied_item.supplied_qty) - flt(supplied_item.returned_qty) + + return supplied_item_details diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index e1b541529e2..59807e214b1 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -909,6 +909,7 @@ class TestStockEntry(ERPNextTestSuite): rm_cost += d.amount fg_cost = next(filter(lambda x: x.item_code == "_Test FG Item", s.get("items"))).amount secondary_item_cost = next(filter(lambda x: x.type or x.is_legacy_scrap_item, s.get("items"))).amount + self.assertEqual(fg_cost, flt(rm_cost - secondary_item_cost, 2)) # When Stock Entry has only FG + Scrap @@ -1783,7 +1784,7 @@ class TestStockEntry(ERPNextTestSuite): def test_use_serial_and_batch_fields(self): item = make_item( - "Test Use Serial and Batch Item SN Item", + "Test Use Serial and Batch Item SN Item - A", {"has_serial_no": 1, "is_stock_item": 1}, ) @@ -2266,7 +2267,7 @@ class TestStockEntry(ERPNextTestSuite): make_stock_entry(item_code=rm_item2, target=warehouse, qty=5, purpose="Material Receipt") bom_no = make_bom(item=fg_item, raw_materials=[rm_item1, rm_item2]).name - se = make_stock_entry(item_code=fg_item, qty=1, purpose="Manufacture", do_not_save=True) + se = make_stock_entry(item_code=fg_item, qty=1, purpose="Repack", do_not_save=True) se.from_bom = 1 se.use_multi_level_bom = 1 se.bom_no = bom_no @@ -2304,7 +2305,6 @@ class TestStockEntry(ERPNextTestSuite): se.to_warehouse = warehouse se.get_items() - # Verify FG as source (being consumed) fg_items = [d for d in se.items if d.is_finished_item] self.assertEqual(len(fg_items), 1) @@ -2331,7 +2331,9 @@ class TestStockEntry(ERPNextTestSuite): "Stock Settings", {"sample_retention_warehouse": "_Test Warehouse 1 - _TC"} ) def test_sample_retention_stock_entry(self): - from erpnext.stock.doctype.stock_entry.stock_entry import move_sample_to_retention_warehouse + from erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing import ( + move_sample_to_retention_warehouse, + ) warehouse = "_Test Warehouse - _TC" retain_sample_item = make_item( diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py index 0c1a21fefce..6d9e40052b1 100644 --- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py +++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py @@ -1,8 +1,24 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # License: GNU General Public License v3. See license.txt - +import frappe +from frappe import _, bold from frappe.model.document import Document +from frappe.utils import ( + cint, + cstr, + flt, + format_time, + formatdate, + get_link_to_form, + getdate, + nowdate, +) + +from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import ( + OpeningEntryAccountError, +) +from erpnext.stock.stock_ledger import NegativeStockError, get_previous_sle, is_negative_stock_allowed class StockEntryDetail(Document): @@ -73,4 +89,171 @@ class StockEntryDetail(Document): valuation_rate: DF.Currency # end: auto-generated types - pass + def validate_batch(self): + if not self.batch_no: + return + + disabled = frappe.db.get_value("Batch", self.batch_no, "disabled") + if disabled: + frappe.throw(_("Batch {0} of Item {1} is disabled.").format(self.batch_no, self.item_code)) + return + + expiry_date = frappe.db.get_value("Batch", self.batch_no, "expiry_date") + if expiry_date and getdate(self.parent_doc.posting_date) > getdate(expiry_date): + frappe.throw(_("Batch {0} of Item {1} has expired.").format(self.batch_no, self.item_code)) + + def validate_and_update_item_details(self, item_details, company, purpose): + if flt(self.qty) and flt(self.qty) < 0: + frappe.throw( + _("Row {0}: The item {1}, quantity must be positive number").format( + self.idx, bold(self.item_code) + ) + ) + + if item_details.get("is_stock_item") != 1: + frappe.throw(_("{0} is not a stock Item").format(self.item_code)) + + reset_fields = ("stock_uom", "item_name") + for field in reset_fields: + self.set(field, item_details.get(field)) + + update_fields = ( + "uom", + "description", + "expense_account", + "cost_center", + "conversion_factor", + "barcode", + ) + for field in update_fields: + if not self.get(field): + self.set(field, item_details.get(field)) + if field == "conversion_factor" and self.uom == item_details.get("stock_uom"): + self.set(field, item_details.get(field)) + + if not self.transfer_qty and self.qty: + self.transfer_qty = flt( + flt(self.qty) * flt(self.conversion_factor), self.precision("transfer_qty") + ) + + if purpose == "Subcontracting Delivery": + self.expense_account = frappe.get_value("Company", company, "default_expense_account") + + def validate_expense_account(self, is_opening, purpose): + if not self.expense_account: + frappe.throw( + _( + "Please enter Difference Account or set default " + "Stock Adjustment Account for company {0}" + ).format(bold(self.parent_doc.company)) + ) + + acc_details = frappe.get_cached_value( + "Account", + self.expense_account, + ["account_type", "report_type"], + as_dict=True, + ) + + if is_opening == "Yes" and acc_details.report_type == "Profit and Loss": + frappe.throw( + _( + "Difference Account must be a Asset/Liability type account " + "(Temporary Opening), since this Stock Entry is an Opening Entry" + ), + OpeningEntryAccountError, + ) + + if acc_details.account_type == "Stock": + frappe.throw( + _("At row #{0}: the Difference Account must not be a Stock type account...").format( + self.idx, get_link_to_form("Account", self.expense_account) + ), + title=_("Difference Account in Items Table"), + ) + + if ( + purpose not in ["Material Issue", "Subcontracting Delivery"] + and acc_details.account_type == "Cost of Goods Sold" + ): + frappe.msgprint( + _("At row #{0}: you have selected the Difference Account {1}...").format( + self.idx, bold(get_link_to_form("Account", self.expense_account)) + ), + indicator="orange", + alert=1, + ) + + def set_transfer_qty(self): + if not flt(self.conversion_factor): + frappe.throw(_("Row {0}: UOM Conversion Factor is mandatory").format(self.idx)) + + self.transfer_qty = flt(flt(self.qty) * flt(self.conversion_factor), self.precision("transfer_qty")) + + if not flt(self.transfer_qty): + frappe.throw( + _("Row {0}: Qty in Stock UOM can not be zero.").format(self.idx), title=_("Zero quantity") + ) + + def set_actual_qty(self, posting_date, posting_time): + allow_negative_stock = is_negative_stock_allowed(item_code=self.item_code) + previous_sle = get_previous_sle( + { + "item_code": self.item_code, + "warehouse": self.s_warehouse or self.t_warehouse, + "posting_date": posting_date, + "posting_time": posting_time, + } + ) + + # get actual stock at source warehouse + self.actual_qty = previous_sle.get("qty_after_transaction") or 0 + + # validate qty during submit + if ( + self.docstatus == 1 + and self.s_warehouse + and not allow_negative_stock + and flt(self.actual_qty, self.precision("actual_qty")) + < flt(self.transfer_qty, self.precision("actual_qty")) + ): + frappe.throw( + _( + "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" + ).format( + self.idx, + bold(self.s_warehouse), + formatdate(posting_date), + format_time(posting_time), + bold(self.item_code), + ) + + "

" + + _("Available quantity is {0}, you need {1}").format( + bold(flt(self.actual_qty, self.precision("actual_qty"))), + bold(self.transfer_qty), + ), + NegativeStockError, + title=_("Insufficient Stock"), + ) + + def delink_asset_repair_sabb(self, asset_repair): + if not self.serial_and_batch_bundle: + return + + voucher_detail_no = frappe.db.get_value( + "Asset Repair Consumed Item", + {"parent": asset_repair, "serial_and_batch_bundle": self.serial_and_batch_bundle}, + "name", + ) + + if not voucher_detail_no: + return + + doc = frappe.get_doc("Serial and Batch Bundle", self.serial_and_batch_bundle) + doc.db_set( + { + "voucher_type": "Asset Repair", + "voucher_no": asset_repair, + "voucher_detail_no": voucher_detail_no, + } + ) diff --git a/erpnext/stock/doctype/stock_entry_type/stock_entry_type.py b/erpnext/stock/doctype/stock_entry_type/stock_entry_type.py index ae2ca3a67d6..9a3f5d39055 100644 --- a/erpnext/stock/doctype/stock_entry_type/stock_entry_type.py +++ b/erpnext/stock/doctype/stock_entry_type/stock_entry_type.py @@ -122,6 +122,7 @@ class ManufactureEntry: if backflush_based_on != "BOM": available_serial_batches = self.get_transferred_serial_batches() + items_list = [] for item_code, _dict in item_dict.items(): _dict.from_warehouse = self.source_wh.get(item_code) or self.wip_warehouse _dict.to_warehouse = "" @@ -138,7 +139,9 @@ class ManufactureEntry: _dict.qty = calculated_qty self.update_available_serial_batches(_dict, available_serial_batches) - self.stock_entry.add_to_stock_entry_detail(item_dict) + items_list.append(_dict) + + self.stock_entry.append("items", items_list) def parse_available_serial_batches(self, item_dict, available_serial_batches): key = (item_dict.item_code, item_dict.from_warehouse) @@ -320,4 +323,4 @@ class ManufactureEntry: "is_finished_item": 1, } - self.stock_entry.add_to_stock_entry_detail({self.production_item: args}, bom_no=self.bom_no) + self.stock_entry.append("items", args) diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py index b477fee2228..8fb7a375dcf 100644 --- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py +++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py @@ -1898,3 +1898,32 @@ def update_serial_batch_delivered_qty(row, name, is_cancelled=False): ) query.run() + + +def get_reserved_materials(voucher_no): + doctype = frappe.qb.DocType("Stock Reservation Entry") + serial_batch_doc = frappe.qb.DocType("Serial and Batch Entry") + + query = ( + frappe.qb.from_(doctype) + .inner_join(serial_batch_doc) + .on(doctype.name == serial_batch_doc.parent) + .select( + serial_batch_doc.serial_no, + serial_batch_doc.batch_no, + serial_batch_doc.qty, + doctype.item_code, + doctype.warehouse, + doctype.name, + doctype.transferred_qty, + doctype.consumed_qty, + ) + .where( + (doctype.docstatus == 1) + & (doctype.voucher_no == voucher_no) + & (serial_batch_doc.delivered_qty < serial_batch_doc.qty) + ) + .orderby(serial_batch_doc.idx) + ) + + return query.run(as_dict=True) diff --git a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py index bda5f68c1e6..c3b5358e9d5 100644 --- a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py +++ b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py @@ -378,7 +378,7 @@ class SubcontractingInwardOrder(SubcontractingController): } } - stock_entry.add_to_stock_entry_detail(items_dict) + stock_entry.append("items", items_dict[rm_item.get("rm_item_code")]) if target_doc: return stock_entry @@ -419,7 +419,7 @@ class SubcontractingInwardOrder(SubcontractingController): } } - stock_entry.add_to_stock_entry_detail(items_dict) + stock_entry.append("items", items_dict[rm_item.get("rm_item_code")]) if target_doc: return stock_entry @@ -472,7 +472,7 @@ class SubcontractingInwardOrder(SubcontractingController): } } - stock_entry.add_to_stock_entry_detail(items_dict) + stock_entry.append("items", items_dict[fg_item.item_code]) if ( frappe.get_single_value("Selling Settings", "deliver_secondary_items") @@ -497,7 +497,7 @@ class SubcontractingInwardOrder(SubcontractingController): } } - stock_entry.add_to_stock_entry_detail(items_dict) + stock_entry.append("items", items_dict[secondary_item.item_code]) if target_doc: return stock_entry @@ -542,7 +542,7 @@ class SubcontractingInwardOrder(SubcontractingController): } } - stock_entry.add_to_stock_entry_detail(items_dict) + stock_entry.append("items", items_dict[fg_item.item_code]) if target_doc: return stock_entry diff --git a/erpnext/subcontracting/doctype/subcontracting_inward_order/test_subcontracting_inward_order.py b/erpnext/subcontracting/doctype/subcontracting_inward_order/test_subcontracting_inward_order.py index d035f4ddcb9..9a45a49be5e 100644 --- a/erpnext/subcontracting/doctype/subcontracting_inward_order/test_subcontracting_inward_order.py +++ b/erpnext/subcontracting/doctype/subcontracting_inward_order/test_subcontracting_inward_order.py @@ -240,6 +240,7 @@ class IntegrationTestSubcontractingInwardOrder(ERPNextTestSuite): delivery = frappe.new_doc("Stock Entry").update(scio.make_subcontracting_delivery()) delivery.items[0].use_serial_batch_fields = 1 delivery.save() + delivery.submit() delivery_serial_list, _ = get_serial_batch_list_from_item(delivery.items[0]) self.assertEqual(sorted(serial_list), sorted(delivery_serial_list)) From 6114293b92dfd71720862b850bc5cfbb3bdb78e5 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 19 May 2026 21:07:52 +0530 Subject: [PATCH 026/249] chore: remove leaderboard dead code (#55030) --- erpnext/hooks.py | 1 - erpnext/startup/leaderboard.py | 237 --------------------------------- 2 files changed, 238 deletions(-) delete mode 100644 erpnext/startup/leaderboard.py diff --git a/erpnext/hooks.py b/erpnext/hooks.py index a93e3150cd9..bba172e498b 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -68,7 +68,6 @@ after_install = "erpnext.setup.install.after_install" boot_session = "erpnext.startup.boot.boot_session" notification_config = "erpnext.startup.notifications.get_notification_config" get_help_messages = "erpnext.utilities.activation.get_help_messages" -leaderboards = "erpnext.startup.leaderboard.get_leaderboards" filters_config = "erpnext.startup.filters.get_filters_config" additional_print_settings = "erpnext.controllers.print_settings.get_print_settings" diff --git a/erpnext/startup/leaderboard.py b/erpnext/startup/leaderboard.py deleted file mode 100644 index 22cf179d2c0..00000000000 --- a/erpnext/startup/leaderboard.py +++ /dev/null @@ -1,237 +0,0 @@ -import frappe - -from erpnext.deprecation_dumpster import deprecated - - -def get_leaderboards(): - leaderboards = { - "Customer": { - "fields": [ - {"fieldname": "total_sales_amount", "fieldtype": "Currency"}, - "total_qty_sold", - {"fieldname": "outstanding_amount", "fieldtype": "Currency"}, - ], - "method": "erpnext.startup.leaderboard.get_all_customers", - "icon": "customer", - }, - "Item": { - "fields": [ - {"fieldname": "total_sales_amount", "fieldtype": "Currency"}, - "total_qty_sold", - {"fieldname": "total_purchase_amount", "fieldtype": "Currency"}, - "total_qty_purchased", - "available_stock_qty", - {"fieldname": "available_stock_value", "fieldtype": "Currency"}, - ], - "method": "erpnext.startup.leaderboard.get_all_items", - "icon": "stock", - }, - "Supplier": { - "fields": [ - {"fieldname": "total_purchase_amount", "fieldtype": "Currency"}, - "total_qty_purchased", - {"fieldname": "outstanding_amount", "fieldtype": "Currency"}, - ], - "method": "erpnext.startup.leaderboard.get_all_suppliers", - "icon": "buying", - }, - "Sales Partner": { - "fields": [ - {"fieldname": "total_sales_amount", "fieldtype": "Currency"}, - {"fieldname": "total_commission", "fieldtype": "Currency"}, - ], - "method": "erpnext.startup.leaderboard.get_all_sales_partner", - "icon": "hr", - }, - "Sales Person": { - "fields": [{"fieldname": "total_sales_amount", "fieldtype": "Currency"}], - "method": "erpnext.startup.leaderboard.get_all_sales_person", - "icon": "customer", - }, - } - - return leaderboards - - -@frappe.whitelist() -def get_all_customers(date_range: str, company: str, field: str, limit: int | None = None): - filters = [["docstatus", "=", "1"], ["company", "=", company]] - from_date, to_date = parse_date_range(date_range) - if field == "outstanding_amount": - if from_date and to_date: - filters.append(["posting_date", "between", [from_date, to_date]]) - - return frappe.get_list( - "Sales Invoice", - fields=["customer as name", {"SUM": "outstanding_amount", "as": "value"}], - filters=filters, - group_by="customer", - order_by="value desc", - limit=limit, - ) - else: - if field == "total_sales_amount": - select_field = "base_net_total" - elif field == "total_qty_sold": - select_field = "total_qty" - - if from_date and to_date: - filters.append(["transaction_date", "between", [from_date, to_date]]) - - return frappe.get_list( - "Sales Order", - fields=["customer as name", {"SUM": select_field, "as": "value"}], - filters=filters, - group_by="customer", - order_by="value desc", - limit=limit, - ) - - -@frappe.whitelist() -def get_all_items(date_range: str, company: str, field: str, limit: int | None = None): - if field in ("available_stock_qty", "available_stock_value"): - sum_field = "actual_qty" if field == "available_stock_qty" else "stock_value" - results = frappe.db.get_all( - "Bin", - fields=["item_code as name", {"SUM": sum_field, "as": "value"}], - group_by="item_code", - order_by="value desc", - limit=limit, - ) - readable_active_items = set(frappe.get_list("Item", filters={"disabled": 0}, pluck="name")) - return [item for item in results if item["name"] in readable_active_items] - else: - if field == "total_sales_amount": - select_field = "base_net_amount" - select_doctype = "Sales Order" - elif field == "total_purchase_amount": - select_field = "base_net_amount" - select_doctype = "Purchase Order" - elif field == "total_qty_sold": - select_field = "stock_qty" - select_doctype = "Sales Order" - elif field == "total_qty_purchased": - select_field = "stock_qty" - select_doctype = "Purchase Order" - - filters = [["docstatus", "=", "1"], ["company", "=", company]] - from_date, to_date = parse_date_range(date_range) - if from_date and to_date: - filters.append(["transaction_date", "between", [from_date, to_date]]) - - child_doctype = f"{select_doctype} Item" - return frappe.get_list( - select_doctype, - fields=[ - f"`tab{child_doctype}`.item_code as name", - {"SUM": f"`tab{child_doctype}`.{select_field}", "as": "value"}, - ], - filters=filters, - order_by="value desc", - group_by=f"`tab{child_doctype}`.item_code", - limit=limit, - ) - - -@frappe.whitelist() -def get_all_suppliers(date_range: str, company: str, field: str, limit: int | None = None): - filters = [["docstatus", "=", "1"], ["company", "=", company]] - from_date, to_date = parse_date_range(date_range) - - if field == "outstanding_amount": - if from_date and to_date: - filters.append(["posting_date", "between", [from_date, to_date]]) - - return frappe.get_list( - "Purchase Invoice", - fields=["supplier as name", {"SUM": "outstanding_amount", "as": "value"}], - filters=filters, - group_by="supplier", - order_by="value desc", - limit=limit, - ) - else: - if field == "total_purchase_amount": - select_field = "base_net_total" - elif field == "total_qty_purchased": - select_field = "total_qty" - - if from_date and to_date: - filters.append(["transaction_date", "between", [from_date, to_date]]) - - return frappe.get_list( - "Purchase Order", - fields=["supplier as name", {"SUM": select_field, "as": "value"}], - filters=filters, - group_by="supplier", - order_by="value desc", - limit=limit, - ) - - -@frappe.whitelist() -def get_all_sales_partner(date_range: str, company: str, field: str, limit: int | None = None): - if field == "total_sales_amount": - select_field = "base_net_total" - elif field == "total_commission": - select_field = "total_commission" - - filters = [["docstatus", "=", "1"], ["company", "=", company], ["sales_partner", "is", "set"]] - from_date, to_date = parse_date_range(date_range) - if from_date and to_date: - filters.append(["transaction_date", "between", [from_date, to_date]]) - - return frappe.get_list( - "Sales Order", - fields=[ - "sales_partner as name", - {"SUM": select_field, "as": "value"}, - ], - filters=filters, - group_by="sales_partner", - order_by="value DESC", - limit=limit, - ) - - -@frappe.whitelist() -def get_all_sales_person(date_range: str, company: str, field: str | None = None, limit: int | None = None): - filters = [ - ["docstatus", "=", "1"], - ["company", "=", company], - ["Sales Team", "sales_person", "is", "set"], - ] - from_date, to_date = parse_date_range(date_range) - if from_date and to_date: - filters.append(["transaction_date", "between", [from_date, to_date]]) - - return frappe.get_list( - "Sales Order", - fields=[ - "`tabSales Team`.sales_person as name", - {"SUM": "`tabSales Team`.allocated_amount", "as": "value"}, - ], - filters=filters, - group_by="`tabSales Team`.sales_person", - order_by="value desc", - limit=limit, - ) - - -@deprecated(f"{__name__}.get_date_condition", "unknown", "v16", "No known instructions.") -def get_date_condition(date_range, field): - date_condition = "" - if date_range: - date_range = frappe.parse_json(date_range) - from_date, to_date = date_range - date_condition = f"and {field} between {frappe.db.escape(from_date)} and {frappe.db.escape(to_date)}" - return date_condition - - -def parse_date_range(date_range): - if date_range: - date_range = frappe.parse_json(date_range) - return date_range[0], date_range[1] - - return None, None From 55bb6e0357fe7e746d5db19dcee3092c4cbeee7e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 19 May 2026 21:08:47 +0530 Subject: [PATCH 027/249] fix: handle None delivery_date when sorting MPS data (#55028) --- .../master_production_schedule/master_production_schedule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py b/erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py index ee5b1b96abe..48e04ebf050 100644 --- a/erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py +++ b/erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.py @@ -289,7 +289,7 @@ class MasterProductionSchedule(Document): return item_wise_data def add_mps_data(self, data): - data = frappe._dict(sorted(data.items(), key=lambda x: x[0][1])) + data = frappe._dict(sorted(data.items(), key=lambda x: x[0][1] or "")) for key in data: row = data[key] From fa403dd23b5352c2e4021aedc059a94cfba132b1 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 19 May 2026 23:04:47 +0530 Subject: [PATCH 028/249] fix: warn when accounting dimension fieldname conflicts with existing fields (#55036) --- .../accounting_dimension.py | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py index 5a689bf15f1..d43f333b50c 100644 --- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py +++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py @@ -43,6 +43,7 @@ class AccountingDimension(Document): def validate(self): self.validate_doctype() validate_column_name(self.fieldname) + self.validate_fieldname_conflict() self.validate_dimension_defaults() def validate_doctype(self): @@ -74,6 +75,27 @@ class AccountingDimension(Document): message += _("Please create a new Accounting Dimension if required.") frappe.throw(message) + def validate_fieldname_conflict(self): + conflicting_doctypes = [] + for doctype in get_doctypes_with_dimensions(): + meta = frappe.get_meta(doctype, cached=False) + if any(f.fieldname == self.fieldname for f in meta.get("fields")): + conflicting_doctypes.append(doctype) + + if conflicting_doctypes: + frappe.msgprint( + _( + "Fieldname {0} already exists in the following doctypes: {1}. " + "A separate dimension field will not be added to these doctypes. " + "GL Entries will use the value of the existing field as the dimension value." + ).format( + frappe.bold(self.fieldname), + ", ".join(frappe.bold(d) for d in conflicting_doctypes), + ), + title=_("Fieldname Conflict"), + indicator="orange", + ) + def validate_dimension_defaults(self): companies = [] for default in self.get("dimension_defaults"): From 87a4e872cfc0d3f39fedf98907e728393e5e7948 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 19 May 2026 23:13:30 +0530 Subject: [PATCH 029/249] fix: use route_options for Credit Note and Debit Note sidebar links (#55026) fix: use route_options instead of filters for Credit Note and Debit Note sidebar links Filters with ["=", value] format produce broken URLs like `?is_return=%3D%2C1` instead of `?is_return=1`. Switching to route_options with a plain JSON object generates correct URLs. --- erpnext/workspace_sidebar/invoicing.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/erpnext/workspace_sidebar/invoicing.json b/erpnext/workspace_sidebar/invoicing.json index 0c4a5a8c369..b6ff0c790e2 100644 --- a/erpnext/workspace_sidebar/invoicing.json +++ b/erpnext/workspace_sidebar/invoicing.json @@ -80,14 +80,13 @@ { "child": 1, "collapsible": 1, - "filters": "[[\"Sales Invoice\",\"is_return\",\"=\",1]]", "icon": "", "indent": 0, "keep_closed": 0, "label": "Credit Note", "link_to": "Sales Invoice", "link_type": "DocType", - "route_options": "", + "route_options": "{\"is_return\": 1}", "show_arrow": 0, "type": "Link" }, @@ -139,12 +138,12 @@ { "child": 1, "collapsible": 1, - "filters": "[[\"Purchase Invoice\",\"is_return\",\"=\",1]]", "indent": 0, "keep_closed": 0, "label": "Debit Note", "link_to": "Purchase Invoice", "link_type": "DocType", + "route_options": "{\"is_return\": 1}", "show_arrow": 0, "type": "Link" }, From 13e0a211ae70766ffddbcd7d13db49704ed62311 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 20 May 2026 00:48:29 +0530 Subject: [PATCH 030/249] fix: prevent negative amounts in common party JE on return invoices (#55034) Co-authored-by: Claude Sonnet 4.6 --- .../purchase_invoice/test_purchase_invoice.py | 46 ++++++++++++++++ .../sales_invoice/test_sales_invoice.py | 46 ++++++++++++++++ erpnext/controllers/accounts_controller.py | 54 ++++++++++--------- 3 files changed, 121 insertions(+), 25 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py index 5cf3c6be879..509120acce3 100644 --- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py @@ -2962,6 +2962,52 @@ class TestPurchaseInvoice(ERPNextTestSuite, StockTestMixin): pr = make_purchase_receipt_from_pi(pi.name) self.assertFalse(pr.items) + @ERPNextTestSuite.change_settings("Accounts Settings", {"enable_common_party_accounting": True}) + def test_purchase_invoice_return_common_party_je_has_no_negative_amounts(self): + from erpnext.accounts.doctype.opening_invoice_creation_tool.test_opening_invoice_creation_tool import ( + make_customer, + ) + from erpnext.accounts.doctype.party_link.party_link import create_party_link + from erpnext.controllers.sales_and_purchase_return import make_return_doc + + customer = make_customer(customer="_Test Common Party Return PI") + supplier = create_supplier(supplier_name="_Test Common Party Return PI").name + # Supplier must be secondary so get_common_party_link finds it via the PI's party_type + party_link = create_party_link("Customer", customer, supplier) + + pi = make_purchase_invoice(supplier=supplier, parent_cost_center="_Test Cost Center - _TC") + + return_pi = make_return_doc(pi.doctype, pi.name) + return_pi.submit() + + # JE for the return should credit the supplier (secondary/reconciliation) account + # and debit the customer (primary) account — all positive amounts + jv_accounts = frappe.get_all( + "Journal Entry Account", + filters={"reference_type": return_pi.doctype, "reference_name": return_pi.name, "docstatus": 1}, + fields=["debit_in_account_currency", "credit_in_account_currency", "account"], + ) + + self.assertTrue(jv_accounts, "Expected a Journal Entry for the return invoice") + for row in jv_accounts: + self.assertGreaterEqual( + row.debit_in_account_currency, + 0, + f"Negative debit on account {row.account}", + ) + self.assertGreaterEqual( + row.credit_in_account_currency, + 0, + f"Negative credit on account {row.account}", + ) + + # Supplier (secondary) account must be credited, not debited + supplier_row = next(r for r in jv_accounts if r.account == pi.credit_to) + self.assertGreater(supplier_row.credit_in_account_currency, 0) + self.assertEqual(supplier_row.debit_in_account_currency, 0) + + party_link.delete() + def set_advance_flag(company, flag, default_account): frappe.db.set_value( diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py index 504f354522c..b2e4ea875d0 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -3319,6 +3319,52 @@ class TestSalesInvoice(ERPNextTestSuite): party_link.delete() frappe.db.set_single_value("Accounts Settings", "enable_common_party_accounting", 0) + @ERPNextTestSuite.change_settings("Accounts Settings", {"enable_common_party_accounting": True}) + def test_sales_invoice_return_common_party_je_has_no_negative_amounts(self): + from erpnext.accounts.doctype.opening_invoice_creation_tool.test_opening_invoice_creation_tool import ( + make_customer, + ) + from erpnext.accounts.doctype.party_link.party_link import create_party_link + from erpnext.buying.doctype.supplier.test_supplier import create_supplier + from erpnext.controllers.sales_and_purchase_return import make_return_doc + + customer = make_customer(customer="_Test Common Party Return SI") + supplier = create_supplier(supplier_name="_Test Common Party Return SI").name + party_link = create_party_link("Supplier", supplier, customer) + + si = create_sales_invoice(customer=customer, parent_cost_center="_Test Cost Center - _TC") + + return_si = make_return_doc(si.doctype, si.name) + return_si.submit() + + # JE for the return should credit the supplier (primary/advance) account + # and debit the customer (secondary/reconciliation) account — all positive amounts + jv_accounts = frappe.get_all( + "Journal Entry Account", + filters={"reference_type": return_si.doctype, "reference_name": return_si.name, "docstatus": 1}, + fields=["debit_in_account_currency", "credit_in_account_currency", "account"], + ) + + self.assertTrue(jv_accounts, "Expected a Journal Entry for the return invoice") + for row in jv_accounts: + self.assertGreaterEqual( + row.debit_in_account_currency, + 0, + f"Negative debit on account {row.account}", + ) + self.assertGreaterEqual( + row.credit_in_account_currency, + 0, + f"Negative credit on account {row.account}", + ) + + # Customer (secondary) account must be debited, not credited + customer_row = next(r for r in jv_accounts if r.account == return_si.debit_to) + self.assertGreater(customer_row.debit_in_account_currency, 0) + self.assertEqual(customer_row.credit_in_account_currency, 0) + + party_link.delete() + def test_payment_statuses(self): from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 6ab1c54fea8..36dd0ddb88c 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -2899,7 +2899,9 @@ class AccountsController(TransactionBase): advance_entry.party_type = primary_party_type advance_entry.party = primary_party advance_entry.cost_center = self.cost_center or erpnext.get_default_cost_center(self.company) - advance_entry.is_advance = "Yes" + # For returns the direction is reversed, so this entry cannot be an advance + # (JE validation: Supplier advance must be debit, Customer advance must be credit) + advance_entry.is_advance = "No" if self.is_return else "Yes" # Update dimensions dimensions_dict = frappe._dict() @@ -2931,35 +2933,26 @@ class AccountsController(TransactionBase): ) ) - # Convert outstanding amount from secondary to primary account currency, if needed + outstanding_amount = abs(self.outstanding_amount) + os_in_default_currency = outstanding_amount * exc_rate_secondary_to_default + os_in_primary_currency = outstanding_amount * exc_rate_secondary_to_primary - os_in_default_currency = self.outstanding_amount * exc_rate_secondary_to_default - os_in_primary_currency = self.outstanding_amount * exc_rate_secondary_to_primary + # SI normal and PI return → reconciliation is credit; SI return and PI normal → debit + reconciliation_is_credit = (self.doctype == "Sales Invoice") != bool(self.is_return) + _set_je_amounts( + reconcilation_entry, outstanding_amount, os_in_default_currency, reconciliation_is_credit + ) + _set_je_amounts( + advance_entry, os_in_primary_currency, os_in_default_currency, not reconciliation_is_credit + ) - if self.doctype == "Sales Invoice": - # Calculate credit and debit values for reconciliation and advance entries - reconcilation_entry.credit_in_account_currency = self.outstanding_amount - reconcilation_entry.credit = os_in_default_currency - - advance_entry.debit_in_account_currency = os_in_primary_currency - advance_entry.debit = os_in_default_currency - else: - advance_entry.credit_in_account_currency = os_in_primary_currency - advance_entry.credit = os_in_default_currency - - reconcilation_entry.debit_in_account_currency = self.outstanding_amount - reconcilation_entry.debit = os_in_default_currency - - # Set exchange rates for entries reconcilation_entry.exchange_rate = exc_rate_secondary_to_default advance_entry.exchange_rate = exc_rate_primary_to_default else: - if self.doctype == "Sales Invoice": - reconcilation_entry.credit_in_account_currency = self.outstanding_amount - advance_entry.debit_in_account_currency = self.outstanding_amount - else: - advance_entry.credit_in_account_currency = self.outstanding_amount - reconcilation_entry.debit_in_account_currency = self.outstanding_amount + outstanding_amount = abs(self.outstanding_amount) + reconciliation_is_credit = (self.doctype == "Sales Invoice") != bool(self.is_return) + _set_je_amounts(reconcilation_entry, outstanding_amount, is_credit=reconciliation_is_credit) + _set_je_amounts(advance_entry, outstanding_amount, is_credit=not reconciliation_is_credit) jv.multi_currency = multi_currency jv.append("accounts", reconcilation_entry) @@ -3699,6 +3692,17 @@ def set_child_tax_template_and_map(item, child_item, parent_doc): ) +def _set_je_amounts(entry, amount, default_amount=None, is_credit=True): + if is_credit: + entry.credit_in_account_currency = amount + if default_amount is not None: + entry.credit = default_amount + else: + entry.debit_in_account_currency = amount + if default_amount is not None: + entry.debit = default_amount + + def add_taxes_from_tax_template(child_item, parent_doc, db_insert=True): add_taxes_from_item_tax_template = frappe.get_single_value( "Accounts Settings", "add_taxes_from_item_tax_template" From 202ea0061c0e1d8901d8f8159ee46f6091143678 Mon Sep 17 00:00:00 2001 From: MochaMind Date: Wed, 20 May 2026 00:50:45 +0530 Subject: [PATCH 031/249] fix: sync translations from crowdin (#54951) --- erpnext/locale/ar.po | 1152 +++++++++++++++++++------------------ erpnext/locale/bs.po | 1150 +++++++++++++++++++------------------ erpnext/locale/cs.po | 1140 ++++++++++++++++++------------------ erpnext/locale/da.po | 1140 ++++++++++++++++++------------------ erpnext/locale/de.po | 1152 +++++++++++++++++++------------------ erpnext/locale/eo.po | 1152 +++++++++++++++++++------------------ erpnext/locale/es.po | 1152 +++++++++++++++++++------------------ erpnext/locale/fa.po | 1204 ++++++++++++++++++++------------------- erpnext/locale/fr.po | 1150 +++++++++++++++++++------------------ erpnext/locale/hr.po | 1156 +++++++++++++++++++------------------ erpnext/locale/hu.po | 1140 ++++++++++++++++++------------------ erpnext/locale/id.po | 1140 ++++++++++++++++++------------------ erpnext/locale/it.po | 1140 ++++++++++++++++++------------------ erpnext/locale/my.po | 1140 ++++++++++++++++++------------------ erpnext/locale/nb.po | 1140 ++++++++++++++++++------------------ erpnext/locale/nl.po | 1152 +++++++++++++++++++------------------ erpnext/locale/pl.po | 1146 +++++++++++++++++++------------------ erpnext/locale/pt.po | 1140 ++++++++++++++++++------------------ erpnext/locale/pt_BR.po | 1140 ++++++++++++++++++------------------ erpnext/locale/ru.po | 1152 +++++++++++++++++++------------------ erpnext/locale/sl.po | 1142 +++++++++++++++++++------------------ erpnext/locale/sr.po | 1152 +++++++++++++++++++------------------ erpnext/locale/sr_CS.po | 1152 +++++++++++++++++++------------------ erpnext/locale/sv.po | 1162 +++++++++++++++++++------------------ erpnext/locale/th.po | 1152 +++++++++++++++++++------------------ erpnext/locale/tr.po | 1152 +++++++++++++++++++------------------ erpnext/locale/vi.po | 1152 +++++++++++++++++++------------------ erpnext/locale/zh.po | 1152 +++++++++++++++++++------------------ 28 files changed, 16713 insertions(+), 15481 deletions(-) diff --git a/erpnext/locale/ar.po b/erpnext/locale/ar.po index 9fede98b963..5b907c5f521 100644 --- a/erpnext/locale/ar.po +++ b/erpnext/locale/ar.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:20\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:20\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Arabic\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr " التجميع الفرعي" msgid " Summary" msgstr "" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"الأصناف المقدمة من العملاء\" لا يمكن شرائها" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"الأصناف المقدمة من العملاء\" لا يمكن ان تحتوي على تكلفة" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "\"اصل ثابت\" لا يمكن أن يكون غير محدد، حيث يوجد سجل أصول مقابل البند" @@ -302,7 +302,7 @@ msgstr "من تاريخ (مطلوب)" msgid "'From Date' must be after 'To Date'" msgstr "\"من تاريخ \" يجب أن يكون بعد \" إلى تاريخ \"" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "\"لهُ رقم تسلسل\" لا يمكن ان يكون \"نعم\" لبند غير قابل للتخزين" @@ -338,7 +338,7 @@ msgstr ""الأوراق المالية التحديث" لا يمكن msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "لا يمكن التحقق من ' تحديث المخزون ' لبيع الأصول الثابتة\\n
\\n'Update Stock' cannot be checked for fixed asset sale" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "{0} الحساب مستخدم بواسطة{1} استخدم حساب آخر." @@ -995,7 +995,7 @@ msgstr "" msgid "A logical Warehouse against which stock entries are made." msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "حدث تعارض في سلسلة التسمية أثناء إنشاء الأرقام التسلسلية. يرجى تغيير سلسلة التسمية للعنصر {0}." @@ -1207,7 +1207,7 @@ msgstr "مفتاح الوصول مطلوب لموفر الخدمة: {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "وفقًا لـ CEFACT/ICG/2010/IC013 أو CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "وفقًا لقائمة المواد {0}، فإن العنصر '{1}' مفقود في إدخال المخزون." @@ -1877,8 +1877,8 @@ msgstr "القيود المحاسبة" msgid "Accounting Entry for Asset" msgstr "المدخلات الحسابية للأصول" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1886,7 +1886,7 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "القيد المحاسبي للخدمة" @@ -1899,16 +1899,16 @@ msgstr "القيد المحاسبي للخدمة" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "القيود المحاسبية للمخزون" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "القيد المحاسبي لـ {0}" @@ -2206,12 +2206,6 @@ msgstr "الإجراء إذا لم يتم تقديم استقصاء الجودة msgid "Action If Quality Inspection Is Rejected" msgstr "" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "العمل مهيأ" @@ -2270,6 +2264,12 @@ msgstr "الإجراء المتخذ في حالة تجاوز الميزانية msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2537,7 +2537,7 @@ msgstr "الوقت الفعلي (بالساعات)" msgid "Actual qty in stock" msgstr "الكمية الفعلية في المخزون" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "نوع الضريبة الفعلي لا يمكن تضمينه في معدل الصنف في الصف {0}" @@ -2551,7 +2551,7 @@ msgstr "الكَميَّة المخصصة" msgid "Add / Edit Prices" msgstr "إضافة و تعديل الأسعار" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "" @@ -2705,7 +2705,7 @@ msgstr "" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -2950,7 +2950,7 @@ msgstr "مبلغ الخصم الإضافي" msgid "Additional Discount Amount (Company Currency)" msgstr "مقدار الخصم الاضافي (بعملة الشركة)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -3235,7 +3235,7 @@ msgstr "ضبط الكميَّة" msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3348,7 +3348,7 @@ msgstr "" msgid "Advance amount" msgstr "المبلغ مقدما" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "قيمة الدفعة المقدمة لا يمكن أن تكون أكبر من {0} {1}" @@ -3417,7 +3417,7 @@ msgstr "مقابل" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "مقابل الحساب" @@ -3535,7 +3535,7 @@ msgstr "مقابل فاتورة المورد {0}" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "مقابل إيصال" @@ -3559,7 +3559,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "مقابل إيصال نوع" @@ -3840,7 +3840,7 @@ msgstr "يجب نقل جميع الاتصالات بما في ذلك وما فو msgid "All items are already requested" msgstr "جميع العناصر مطلوبة مسبقاً" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "تم بالفعل تحرير / إرجاع جميع العناصر" @@ -3848,7 +3848,7 @@ msgstr "تم بالفعل تحرير / إرجاع جميع العناصر" msgid "All items have already been received" msgstr "تم استلام جميع العناصر مسبقاً" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "جميع الإصناف تم نقلها لأمر العمل" @@ -3897,7 +3897,7 @@ msgstr "تخصيص" msgid "Allocate Advances Automatically (FIFO)" msgstr "تخصيص السلف تلقائيا (الداخل أولا الخارج أولا)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "تخصيص مبلغ الدفع" @@ -3907,7 +3907,7 @@ msgstr "تخصيص مبلغ الدفع" msgid "Allocate Payment Based On Payment Terms" msgstr "تخصيص الدفع على أساس شروط الدفع" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "" @@ -3937,7 +3937,7 @@ msgstr "تخصيص" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4058,15 +4058,15 @@ msgstr "السماح في المرتجعات" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "السماح بإضافة العنصر عدة مرات في المعاملة" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4095,12 +4095,6 @@ msgstr "السماح بالقيم السالبة للمخزون" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4313,8 +4307,11 @@ msgstr "" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4406,7 +4403,7 @@ msgstr "سمح للاعتماد مع" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4603,7 +4600,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4633,7 +4630,6 @@ msgstr "" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4803,10 +4799,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "المبلغ بالكلمات" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5426,7 +5418,7 @@ msgstr "نظرًا لتمكين الحقل {0} ، يكون الحقل {1} إلز msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "أثناء تمكين الحقل {0} ، يجب أن تكون قيمة الحقل {1} أكثر من 1." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "بما أن هناك معاملات مقدمة بالفعل مقابل العنصر {0}، فلا يمكنك تغيير قيمة {1}." @@ -5576,7 +5568,7 @@ msgstr "حساب فئة الأصول" msgid "Asset Category Name" msgstr "اسم فئة الأصول" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "فئة الموجودات إلزامية لبنود الموجودات الثابتة\\n
\\nAsset Category is mandatory for Fixed Asset item" @@ -5972,7 +5964,7 @@ msgstr "لم يتم إرسال الأصل {0} . يرجى إرسال الأصل msgid "Asset {0} must be submitted" msgstr "الاصل {0} يجب تقديمه" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "تم إنشاء الأصل {assets_link} لـ {item_code}" @@ -6010,11 +6002,11 @@ msgstr "الأصول" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "لم يتم إنشاء الأصول لـ {item_code}. سيكون عليك إنشاء الأصل يدويًا." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "الأصول {assets_link} التي تم إنشاؤها لـ {item_code}" @@ -6087,7 +6079,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "يلزم وجود صف واحد على الأقل في نموذج التقرير المالي" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "يُشترط وجود مستودع واحد على الأقل" @@ -6119,7 +6111,7 @@ msgstr "في الصف {0}: الكمية إلزامية للدفعة {1}" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "في الصف {0}: الرقم التسلسلي إلزامي للعنصر {1}" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "في الصف {0}: تم إنشاء حزمة الرقم التسلسلي وحزمة الدفعة {1} مسبقًا. يُرجى حذف القيم من حقلي الرقم التسلسلي أو رقم الدفعة." @@ -6183,7 +6175,11 @@ msgstr "السمة اسم" msgid "Attribute Value" msgstr "السمة القيمة" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "جدول الخصائص إلزامي" @@ -6191,11 +6187,19 @@ msgstr "جدول الخصائص إلزامي" msgid "Attribute value: {0} must appear only once" msgstr "قيمة السمة: {0} يجب أن تظهر مرة واحدة فقط" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "تم تحديد السمة {0} عدة مرات في جدول السمات\\n
\\nAttribute {0} selected multiple times in Attributes Table" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "سمات" @@ -6255,24 +6259,12 @@ msgstr "القيمة المرخص بها" msgid "Auto Create Exchange Rate Revaluation" msgstr "إنشاء إعادة تقييم سعر الصرف تلقائياً" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "إنشاء إيصال الشراء تلقائياً" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "إنشاء تلقائي لحزم تسلسلية وحزم دفعية للخارج" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "إنشاء أمر التعاقد من الباطن تلقائياً" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6391,6 +6383,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "تم الرد على فرصة الإغلاق التلقائي بعد عدد الأيام المذكور أعلاه" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6608,7 +6612,7 @@ msgstr "" msgid "Available for use date is required" msgstr "مطلوب تاريخ متاح للاستخدام" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "الكمية المتاحة هي {0} ، تحتاج إلى {1}" @@ -6707,7 +6711,7 @@ msgstr "بي إف إس" msgid "BIN Qty" msgstr "الكمية في الصندوق" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -6980,7 +6984,7 @@ msgstr "صنف الموقع الالكتروني بقائمة المواد" msgid "BOM Website Operation" msgstr "عملية الموقع الالكتروني بقائمة المواد" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "يُعدّ كل من قائمة المواد وكمية المنتج النهائي شرطًا أساسيًا لعملية التفكيك." @@ -7071,8 +7075,8 @@ msgstr "المواد الخام Backflush من مستودع في التقدم ف #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "Backflush المواد الخام من العقد من الباطن" +msgid "Backflush raw materials of subcontract based on" +msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7092,7 +7096,7 @@ msgstr "الموازنة" msgid "Balance (Dr - Cr)" msgstr "الرصيد (مدين - دائن)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "الرصيد ({0})" @@ -7623,11 +7627,11 @@ msgstr "الخدمات المصرفية" msgid "Barcode Type" msgstr "نوع الباركود" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "الباركود {0} مستخدم بالفعل في الصنف {1}" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "الباركود {0} ليس رمز {1} صالحًا" @@ -7994,12 +7998,12 @@ msgstr "الدفعة {0} والمستودع" msgid "Batch {0} is not available in warehouse {1}" msgstr "الدفعة {0} غير متوفرة في المستودع {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "الدفعة {0} للعنصر {1} انتهت صلاحيتها\\n
\\nBatch {0} of Item {1} has expired." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "تم تعطيل الدفعة {0} من الصنف {1}." @@ -8072,8 +8076,8 @@ msgstr "رقم الفاتورة" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "فاتورة بالكمية المرفوضة في فاتورة الشراء" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8413,8 +8417,11 @@ msgstr "صنف أمر بطانية" msgid "Blanket Order Rate" msgstr "بطالة سعر النظام" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -8929,7 +8936,7 @@ msgstr "البيع والشراء" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "يجب أن يتم التحقق الشراء، إذا تم تحديد مطبق للك {0}" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "" @@ -9294,7 +9301,7 @@ msgstr "لا يمكن الفلتره علي اساس (رقم الأيصال)، msgid "Can only make payment against unbilled {0}" msgstr "يمكن إجراء دفعة فقط مقابل فاتورة غير مدفوعة {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9350,9 +9357,9 @@ msgstr "لا يمكن تغيير إعدادات حساب المخزون" msgid "Cannot Create Return" msgstr "لا يمكن إنشاء إرجاع" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "لا يمكن الدمج" @@ -9380,7 +9387,7 @@ msgstr "لا يمكن تعديل {0} {1}، يرجى إنشاء واحد جديد msgid "Cannot apply TDS against multiple parties in one entry" msgstr "لا يمكن تطبيق ضريبة الاستقطاع على عدة أطراف في إدخال واحد" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "لا يمكن أن يكون عنصر الأصول الثابتة كما يتم إنشاء دفتر الأستاذ." @@ -9416,7 +9423,7 @@ msgstr "لا يمكن إلغاء إدخال مخزون التصنيع هذا ل msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "لا يمكن إلغاء هذا المستند لأنه مرتبط بالأصل المُرسَل {asset_link}. يُرجى إلغاء الأصل للمتابعة." @@ -9424,7 +9431,7 @@ msgstr "لا يمكن إلغاء هذا المستند لأنه مرتبط با msgid "Cannot cancel transaction for Completed Work Order." msgstr "لا يمكن إلغاء المعاملة لأمر العمل المكتمل." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "لا يمكن تغيير سمات بعد معاملة الأسهم. جعل عنصر جديد ونقل الأسهم إلى البند الجديد" @@ -9436,7 +9443,7 @@ msgstr "لا يمكن تغيير نوع المستند المرجعي." msgid "Cannot change Service Stop Date for item in row {0}" msgstr "لا يمكن تغيير تاريخ إيقاف الخدمة للعنصر الموجود في الصف {0}" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "لا يمكن تغيير خصائص المتغير بعد معاملة المخزون. سيكون عليك عمل عنصر جديد للقيام بذلك." @@ -9464,11 +9471,11 @@ msgstr "لا يمكن التحويل إلى مجموعة لأن نوع الحس msgid "Cannot covert to Group because Account Type is selected." msgstr "لا يمكن تحويل الحساب إلى تصنيف مجموعة لأن نوع الحساب تم اختياره." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "لا يمكن إنشاء إدخالات حجز المخزون لإيصالات الشراء ذات التواريخ المستقبلية." -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "لا يمكن إنشاء قائمة اختيار لأمر البيع {0} لأنه يحتوي على مخزون محجوز. يرجى إلغاء حجز المخزون لإنشاء قائمة الاختيار." @@ -9494,7 +9501,7 @@ msgstr "لا يمكن ان تعلن بانها فقدت ، لأنه تم تقد msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "لا يمكن الخصم عندما تكون الفئة \"التقييم\" أو \"التقييم والإجمالي\"" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "لا يمكن حذف صف الربح/الخسارة في الصرف" @@ -9531,7 +9538,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "لا يمكن تفكيك كمية أكبر من الكمية المنتجة." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9539,8 +9546,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "لا يمكن تفعيل حساب المخزون حسب الصنف، لوجود قيود دفترية للمخزون للشركة {0} مع حساب مخزون حسب المستودع. يرجى إلغاء معاملات المخزون أولاً ثم المحاولة مرة أخرى." -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "لا يمكن ضمان التسليم بواسطة Serial No حيث أن العنصر {0} مضاف مع وبدون ضمان التسليم بواسطة Serial No." @@ -9584,7 +9591,7 @@ msgstr "" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "لا يمكن تقليل الكمية عن الكمية المطلوبة أو المشتراة" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9602,8 +9609,8 @@ msgstr "تعذر استرداد رمز الرابط. راجع سجل الأخط msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9619,7 +9626,7 @@ msgstr "لا يمكن أن تعين كخسارة لأنه تم تقديم أمر msgid "Cannot set authorization on basis of Discount for {0}" msgstr "لا يمكن تحديد التخويل على أساس الخصم ل {0}" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "لا يمكن تعيين عدة عناصر افتراضية لأي شركة." @@ -10530,7 +10537,7 @@ msgstr "إغلاق (دائن)" msgid "Closing (Dr)" msgstr "إغلاق (مدين)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "الإغلاق (الافتتاحي + الإجمالي)" @@ -10991,7 +10998,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11273,7 +11280,7 @@ msgstr "شركة" msgid "Company Abbreviation" msgstr "اختصار الشركة" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11286,7 +11293,7 @@ msgstr "لا يمكن أن يحتوي اختصار الشركة على أكثر msgid "Company Account" msgstr "حساب الشركة" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "" @@ -11462,7 +11469,7 @@ msgstr "" msgid "Company is mandatory" msgstr "الشركة إلزامية" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "الشركة إلزامية لحساب الشركة" @@ -11733,7 +11740,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11746,7 +11753,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "تكوين تجميع المنتج" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11764,13 +11773,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "قم بضبط الإجراء لإيقاف المعاملة أو مجرد التنبيه في حالة عدم الحفاظ على نفس السعر." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "تكوين قائمة الأسعار الافتراضية عند إنشاء معاملة شراء جديدة. سيتم جلب أسعار العناصر من قائمة الأسعار هذه." @@ -11948,7 +11957,7 @@ msgstr "" msgid "Consumed" msgstr "مستهلك" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "القيمة المستهلكة" @@ -11992,7 +12001,7 @@ msgstr "تكلفة المواد المستهلكة" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12165,10 +12174,6 @@ msgstr "جهة الاتصال لا تنتمي إلى {0}" msgid "Contact:" msgstr "اتصال:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "اتصال: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12346,7 +12351,7 @@ msgstr "معامل التحويل" msgid "Conversion Rate" msgstr "معدل التحويل" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "معامل التحويل الافتراضي لوحدة القياس يجب أن يكون 1 في الصف {0}" @@ -12618,7 +12623,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12713,7 +12718,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "مركز التكلفة مطلوب في الصف {0} في جدول الضرائب للنوع {1}\\n
\\nCost Center is required in row {0} in Taxes table for type {1}" @@ -13051,7 +13056,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "إنشاء أصول مجمعة" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "إنشاء Inter Journal Journal Entry" @@ -13424,7 +13429,7 @@ msgstr "إنشاء {0} {1}؟" msgid "Created By Migration" msgstr "تم إنشاؤه بواسطة الهجرة" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "تم إنشاء {0} بطاقات تسجيل النقاط لـ {1} بين:" @@ -13565,15 +13570,15 @@ msgstr "" msgid "Credit" msgstr "دائن" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "الائتمان (المعاملة)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "الائتمان ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "حساب دائن" @@ -13768,7 +13773,7 @@ msgstr "نسبة دوران الدائنين" msgid "Creditors" msgstr "الدائنين" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14066,7 +14071,7 @@ msgstr "حزمة الأرقام التسلسلية/الدفعات الحالية msgid "Current Serial No" msgstr "الرقم التسلسلي الحالي" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14267,7 +14272,7 @@ msgstr "محددات مخصصة" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15040,7 +15045,7 @@ msgstr "مواعيد المعالجة" msgid "Day Of Week" msgstr "يوم من الأسبوع" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15156,11 +15161,11 @@ msgstr "تاجر" msgid "Debit" msgstr "مدين" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "مدين (معاملة)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "مدين ({0})" @@ -15170,7 +15175,7 @@ msgstr "مدين ({0})" msgid "Debit / Credit Note Posting Date" msgstr "تاريخ ترحيل إشعار الخصم / إشعار الدائن" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "حساب مدين" @@ -15281,7 +15286,7 @@ msgstr "عدم تطابق بين المدين والدائن" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15423,7 +15428,7 @@ msgstr "نطاق العمر الافتراضي" msgid "Default BOM" msgstr "الافتراضي BOM" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "يجب أن تكون قائمة المواد الافتراضية ({0}) نشطة لهذا الصنف أو قوالبه" @@ -15780,15 +15785,15 @@ msgstr "الإقليم الافتراضي" msgid "Default Unit of Measure" msgstr "وحدة القياس الافتراضية" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "لا يمكن تغيير وحدة القياس الافتراضية للعنصر {0} مباشرةً لأنك أجريتَ بالفعل بعض المعاملات بوحدة قياس أخرى. عليك إما إلغاء المستندات المرتبطة أو إنشاء عنصر جديد." -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "لا يمكن تغيير وحدة القياس الافتراضية للبند {0} مباشرة لأنك قمت بالفعل ببعض المعاملات (المعاملة) مع UOM أخرى. ستحتاج إلى إنشاء عنصر جديد لاستخدام واجهة مستخدم افتراضية مختلفة.\\n
\\nDefault Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "وحدة القياس الافتراضية للمتغير '{0}' يجب أن تكون كما في النمودج '{1}'" @@ -16089,7 +16094,7 @@ msgstr "" msgid "Delivered" msgstr "تسليم" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "القيمة التي تم تسليمها" @@ -16139,8 +16144,8 @@ msgstr "مواد سلمت و لم يتم اصدار فواتيرها" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16151,11 +16156,11 @@ msgstr "الكمية المستلمة" msgid "Delivered Qty (in Stock UOM)" msgstr "الكمية المُسلَّمة (وحدة القياس المتوفرة في المخزون)" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16244,7 +16249,7 @@ msgstr "مدير التوصيل" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16769,7 +16774,7 @@ msgstr "حساب الفرق في جدول البنود" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "يجب أن يكون حساب الفرق حسابًا من نوع الأصول/الخصوم (افتتاح مؤقت)، لأن قيد المخزون هذا هو قيد افتتاحي." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "حساب الفرق يجب أن يكون حساب الأصول / حساب نوع الالتزام، حيث يعتبر تسوية المخزون بمثابة مدخل افتتاح\\n
\\nDifference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" @@ -16933,11 +16938,9 @@ msgstr "تعطيل العتبة التراكمية" msgid "Disable In Words" msgstr "تعطيل خاصية التفقيط" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "تعطيل معدل الشراء الأخير" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -16978,6 +16981,12 @@ msgstr "تعطيل رقم التسلسل ومحدد الدفعة" msgid "Disable Transaction Threshold" msgstr "تعطيل حد المعاملات" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17034,7 +17043,7 @@ msgstr "فكّك" msgid "Disassemble Order" msgstr "ترتيب التفكيك" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17559,6 +17568,12 @@ msgstr "لا تستخدم التقييم على أساس الدفعات" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17649,9 +17664,12 @@ msgstr "بحث المستندات" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17669,6 +17687,10 @@ msgstr "نوع الوثيقة" msgid "Document Type already used as a dimension" msgstr "" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "الوثائق" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -17973,7 +17995,7 @@ msgstr "مشروع مكرر مع المهام" msgid "Duplicate Sales Invoices found" msgstr "تم العثور على فواتير مبيعات مكررة" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "خطأ في الرقم التسلسلي المكرر" @@ -18093,8 +18115,8 @@ msgstr "معرف المستخدم ERPNext" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18317,7 +18339,7 @@ msgstr "إيصال البريد الإلكتروني" msgid "Email Sent to Supplier {0}" msgstr "تم إرسال بريد إلكتروني إلى المورد {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18507,7 +18529,7 @@ msgstr "معرف مستخدم الموظف" msgid "Employee cannot report to himself." msgstr "الموظف لا يمكن أن يقدم تقريرا إلى نفسه.\\n
\\nEmployee cannot report to himself." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18515,7 +18537,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "الموظف مطلوب أثناء إصدار الأصول {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18528,7 +18550,7 @@ msgstr "الموظف {0} لا ينتمي إلى الشركة {1}" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "الموظف {0} يعمل حاليًا على محطة عمل أخرى. يرجى تعيين موظف آخر." -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18571,7 +18593,7 @@ msgstr "تمكين جدولة موعد" msgid "Enable Auto Email" msgstr "تفعيل البريد الإلكتروني التلقائي" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "تمكين إعادة الطلب التلقائي" @@ -19172,7 +19194,7 @@ msgstr "خطأ: هذا الأصل لديه بالفعل {0} فترة استهل "\t\t\t\t\tيجب أن يكون تاريخ \"بدء الاستهلاك\" بعد {1} فترة على الأقل من تاريخ \"جاهز للاستخدام\".\n" "\t\t\t\t\tيرجى تصحيح التواريخ وفقًا لذلك." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "الخطأ: {0} هو حقل إلزامي" @@ -19218,7 +19240,7 @@ msgstr "من المصنع" msgid "Example URL" msgstr "مثال على عنوان URL" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "مثال على مستند مرتبط: {0}" @@ -19248,7 +19270,7 @@ msgstr "مثال: الرقم التسلسلي {0} محجوز في {1}." msgid "Exception Budget Approver Role" msgstr "دور الموافقة على الموازنة الاستثنائية" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19607,7 +19629,7 @@ msgstr "القيمة المتوقعة بعد حياة مفيدة" msgid "Expense" msgstr "نفقة" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "حساب نفقات / قروق ({0}) يجب ان يكون حساب ارباح و خسائر" @@ -19655,7 +19677,7 @@ msgstr "حساب نفقات / قروق ({0}) يجب ان يكون حساب ار msgid "Expense Account" msgstr "حساب النفقات" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "حساب المصاريف مفقود" @@ -20118,7 +20140,7 @@ msgstr "تصفية مجموع صفر الكمية" msgid "Filter by Reference Date" msgstr "تصفية حسب تاريخ المرجع" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20448,7 +20470,7 @@ msgstr "مستودع البضائع الجاهزة" msgid "Finished Goods based Operating Cost" msgstr "تكلفة التشغيل بناءً على المنتجات النهائية" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "المنتج النهائي {0} لا يتطابق مع أمر العمل {1}" @@ -20543,7 +20565,7 @@ msgstr "النظام المالي إلزامي ، يرجى تعيين النظا msgid "Fiscal Year" msgstr "السنة المالية" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20607,7 +20629,7 @@ msgstr "حساب الأصول الثابتة" msgid "Fixed Asset Defaults" msgstr "حالات التخلف عن سداد الأصول الثابتة" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "يجب أن يكون بند الأصول الثابتة عنصرا غير مخزون.
\\nFixed Asset Item must be a non-stock item." @@ -20757,7 +20779,7 @@ msgstr "للشركة" msgid "For Item" msgstr "للمنتج" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "لا يمكن استلام أكثر من الكمية {1} من المنتج {0} مقابل الكمية {2} {3}" @@ -20788,7 +20810,7 @@ msgstr "لائحة الأسعار" msgid "For Production" msgstr "للإنتاج" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "للكمية (الكمية المصنعة) إلزامية\\n
\\nFor Quantity (Manufactured Qty) is mandatory" @@ -20872,6 +20894,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "بالنسبة للعنصر {0}، يجب أن يكون السعر رقمًا موجبًا. للسماح بالأسعار السالبة، فعّل {1} في {2}" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20893,7 +20921,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "بالنسبة للكميات المتوقعة والمتنبأ بها، سيأخذ النظام في الاعتبار جميع المستودعات الفرعية التابعة للمستودع الرئيسي المحدد." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "يجب ألا تتجاوز الكمية {0} الكمية المسموح بها {1}" @@ -20902,7 +20930,7 @@ msgstr "يجب ألا تتجاوز الكمية {0} الكمية المسموح msgid "For reference" msgstr "للرجوع إليها" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "بالنسبة للصف {0} في {1}، يجب تضمين الصف {2} في سعر الصنف. لإضافة الصف {3} إلى سعر الصنف، يجب أيضًا إضافة الصف {3}." @@ -20926,7 +20954,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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -20935,7 +20963,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 "لكي يسري مفعول {0} الجديد، هل ترغب في مسح {1}الحالي؟" -#: erpnext/controllers/stock_controller.py:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "بالنسبة لـ {0}، لا يوجد مخزون متاح للإرجاع في المستودع {1}." @@ -21548,7 +21576,7 @@ msgstr "جي - دي" msgid "GENERAL LEDGER" msgstr "دفتر الأستاذ العام" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21560,7 +21588,7 @@ msgstr "GL Balance" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "GL الدخول" @@ -22075,7 +22103,7 @@ msgstr "البضائع في العبور" msgid "Goods Transferred" msgstr "نقل البضائع" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "تم استلام البضائع بالفعل مقابل الإدخال الخارجي {0}" @@ -22258,7 +22286,7 @@ msgstr "" msgid "Grant Commission" msgstr "لجنة المنح" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "أكبر من المبلغ" @@ -22899,11 +22927,11 @@ msgstr "عدد المرات؟" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" -msgstr "كم مرة يجب تحديث إجمالي تكلفة الشراء للمشروع؟" +msgid "How often should project be updated of Total Purchase Cost ?" +msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling #. Settings' @@ -23057,7 +23085,7 @@ msgstr "إذا تم تقسيم عملية ما إلى عمليات فرعية، msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "إذا كان فارغًا ، فسيتم اعتبار حساب المستودع الأصلي أو حساب الشركة الافتراضي في المعاملات" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23240,7 +23268,7 @@ msgstr "في حالة التفعيل، سيسمح النظام باختيار و msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "في حال تفعيل هذه الخاصية، سيسمح النظام للمستخدمين بتعديل المواد الخام وكمياتها في أمر العمل. ولن يعيد النظام ضبط الكميات وفقًا لقائمة المواد إذا قام المستخدم بتغييرها." -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23412,11 +23440,11 @@ msgstr "إذا كان هذا غير مرغوب فيه، فيرجى إلغاء ع msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "إذا كان هذا البند لديها بدائل، فإنه لا يمكن اختيارها في أوامر البيع الخ" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "إذا تم تكوين هذا الخيار "نعم" ، سيمنعك ERPNext من إنشاء فاتورة شراء أو إيصال دون إنشاء أمر شراء أولاً. يمكن تجاوز هذا التكوين لمورد معين عن طريق تمكين مربع الاختيار "السماح بإنشاء فاتورة الشراء بدون أمر شراء" في مدير المورد." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "إذا تم تكوين هذا الخيار "نعم" ، سيمنعك ERPNext من إنشاء فاتورة شراء دون إنشاء إيصال شراء أولاً. يمكن تجاوز هذا التكوين لمورد معين عن طريق تمكين مربع الاختيار "السماح بإنشاء فاتورة الشراء بدون إيصال شراء" في مدير المورد." @@ -23532,7 +23560,7 @@ msgstr "تجاهل المخزون الفارغ" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "تجاهل سجلات إعادة تقييم سعر الصرف وسجلات الربح/الخسارة" @@ -23584,7 +23612,7 @@ msgstr "تم تفعيل خيار تجاهل قاعدة التسعير. لا يم #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "تجاهل إشعارات الإيداع/السحب التي يُنشئها النظام" @@ -23627,7 +23655,7 @@ msgstr "تجاهل تداخل وقت محطة العمل" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "يتجاهل هذا النظام حقل \"هل الرصيد الافتتاحي\" القديم في إدخال دفتر الأستاذ العام، والذي يسمح بإضافة الرصيد الافتتاحي بعد استخدام النظام أثناء إنشاء التقارير." -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23641,6 +23669,7 @@ msgid "Implementation Partner" msgstr "شريك التنفيذ" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -23994,7 +24023,7 @@ msgstr "تضمين أصول فيسبوك الافتراضية" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24248,7 +24277,7 @@ msgstr "كمية الرصيد غير صحيحة بعد العملية" msgid "Incorrect Batch Consumed" msgstr "تم استهلاك دفعة غير صحيحة" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "تسجيل دخول غير صحيح (مجموعة) إلى مستودع إعادة الطلب" @@ -24256,7 +24285,7 @@ msgstr "تسجيل دخول غير صحيح (مجموعة) إلى مستودع msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "كمية المكونات غير صحيحة" @@ -24466,14 +24495,14 @@ msgstr "بدأت" msgid "Inspected By" msgstr "تفتيش من قبل" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "تم رفض التفتيش" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "التفتيش مطلوب" @@ -24490,7 +24519,7 @@ msgstr "التفتيش المطلوبة قبل تسليم" msgid "Inspection Required before Purchase" msgstr "التفتيش المطلوبة قبل الشراء" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "طلب فحص" @@ -24572,8 +24601,8 @@ msgstr "أذونات غير كافية" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "المالية غير كافية" @@ -24793,7 +24822,7 @@ msgstr "التحويلات الداخلية" msgid "Internal Work History" msgstr "سجل العمل الداخلي" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "لا يمكن إجراء التحويلات الداخلية إلا بالعملة الافتراضية للشركة" @@ -24886,7 +24915,7 @@ msgstr "تاريخ تسليم غير صالح" msgid "Invalid Discount" msgstr "خصم غير صالح" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "مبلغ الخصم غير صالح" @@ -24916,7 +24945,7 @@ msgstr "تجميع غير صالح" msgid "Invalid Item" msgstr "عنصر غير صالح" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "القيم الافتراضية للعناصر غير صالحة" @@ -25002,12 +25031,12 @@ msgstr "جدول غير صالح" msgid "Invalid Selling Price" msgstr "سعر البيع غير صالح" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "رقم تسلسلي وحزمة دفعات غير صالحة" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "مصدر ومستودع هدف غير صالحين" @@ -25044,7 +25073,7 @@ msgstr "صيغة التصفية غير صالحة. يرجى التحقق من ب msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "سبب ضائع غير صالح {0} ، يرجى إنشاء سبب ضائع جديد" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "سلسلة تسمية غير صالحة (. مفقود) لـ {0}" @@ -25173,7 +25202,6 @@ msgstr "إلغاء الفاتورة" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "تاريخ الفاتورة" @@ -25194,10 +25222,6 @@ msgstr "خطأ في تحديد نوع مستند الفاتورة" msgid "Invoice Grand Total" msgstr "الفاتورة الكبرى المجموع" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "رقم الفاتورة" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25719,13 +25743,13 @@ msgstr "عنصر وهمي" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "هل طلب الشراء مطلوب لإنشاء فاتورة الشراء والإيصال؟" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "هل إيصال الشراء مطلوب لإنشاء فاتورة الشراء؟" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -25997,7 +26021,7 @@ msgstr "قضايا" msgid "Issuing Date" msgstr "تاريخ الإصدار" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "قد يستغرق الأمر بضع ساعات حتى تظهر قيم المخزون الدقيقة بعد دمج العناصر." @@ -26067,7 +26091,7 @@ msgstr "نص مائل للمجاميع الفرعية أو الملاحظات" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26114,6 +26138,7 @@ msgstr "نص مائل للمجاميع الفرعية أو الملاحظات" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26129,7 +26154,6 @@ msgstr "نص مائل للمجاميع الفرعية أو الملاحظات" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26893,6 +26917,7 @@ msgstr "مادة المصنع" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26903,7 +26928,6 @@ msgstr "مادة المصنع" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27163,11 +27187,11 @@ msgstr "إعدادات متنوع السلعة" msgid "Item Variant {0} already exists with same attributes" msgstr "متغير الصنف {0} موجود بالفعل مع نفس الخصائص" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "تم تحديث متغيرات العنصر" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "تم تفعيل إعادة النشر بناءً على مستودع العناصر." @@ -27206,6 +27230,15 @@ msgstr "مواصفات الموقع الإلكتروني للصنف" msgid "Item Weight Details" msgstr "تفاصيل وزن الصنف" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27235,7 +27268,7 @@ msgstr "تفصيل ضريبة وفقاً للصنف" msgid "Item Wise Tax Details" msgstr "تفاصيل الضرائب حسب الصنف" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "لا تتطابق تفاصيل الضرائب الخاصة بكل بند مع الضرائب والرسوم في الصفوف التالية:" @@ -27255,11 +27288,11 @@ msgstr "المنتج والمستودع" msgid "Item and Warranty Details" msgstr "البند والضمان تفاصيل" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "عنصر الصف {0} لا يتطابق مع طلب المواد" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "البند لديه متغيرات." @@ -27289,7 +27322,7 @@ msgstr "عملية الصنف" msgid "Item qty can not be updated as raw materials are already processed." msgstr "لا يمكن تحديث كمية الصنف لأن المواد الخام قد تمت معالجتها بالفعل." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "تم تحديث سعر السلعة إلى الصفر حيث تم تحديد خيار \"السماح بسعر تقييم صفري\" للسلعة {0}" @@ -27308,10 +27341,14 @@ msgstr "يتم إعادة حساب معدل تقييم السلعة مع الأ msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "جارٍ إعادة نشر تقييم الأصناف. قد يُظهر التقرير تقييمًا غير صحيح للأصناف." -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "متغير العنصر {0} موجود بنفس السمات\\n
\\nItem variant {0} exists with same attributes" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "تمت إضافة العنصر {0} عدة مرات تحت نفس العنصر الأصل {1} في الصفين {2} و {3}" @@ -27325,7 +27362,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "لا يمكن طلب أكثر من {0} من المنتج {1} ضمن طلب شامل {2}." #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "العنصر {0} غير موجود\\n
\\nItem {0} does not exist" @@ -27333,7 +27370,7 @@ msgstr "العنصر {0} غير موجود\\n
\\nItem {0} does not exist" msgid "Item {0} does not exist in the system or has expired" msgstr "الصنف{0} غير موجود في النظام أو انتهت صلاحيته" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "العنصر {0} غير موجود\\n
\\nItem {0} does not exist." @@ -27349,15 +27386,15 @@ msgstr "تمت إرجاع الصنف{0} من قبل" msgid "Item {0} has been disabled" msgstr "الصنف{0} تم تعطيله" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "العنصر {0} ليس له رقم تسلسلي. يتم تسليم العناصر ذات الأرقام التسلسلية فقط بناءً على الرقم التسلسلي." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "الصنف{0} قد وصل إلى نهاية عمره في {1}" @@ -27369,19 +27406,23 @@ msgstr "تم تجاهل الصنف {0} لأنه ليس بند مخزون" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "تم حجز/تسليم المنتج {0} بالفعل بموجب أمر البيع {1}." -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "تم إلغاء العنصر {0}\\n
\\nItem {0} is cancelled" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "تم تعطيل البند {0}" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "البند {0} ليس بند لديه رقم تسلسلي" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "العنصر {0} ليس عنصر مخزون\\n
\\nItem {0} is not a stock Item" @@ -27389,7 +27430,11 @@ msgstr "العنصر {0} ليس عنصر مخزون\\n
\\nItem {0} is not a s msgid "Item {0} is not a subcontracted item" msgstr "العنصر {0} ليس عنصرًا متعاقدًا عليه من الباطن" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "البند {0} غير نشط أو تم التوصل إلى نهاية الحياة" @@ -27405,7 +27450,7 @@ msgstr "يجب أن يكون العنصر {0} عنصرًا غير متوفر ف msgid "Item {0} must be a non-stock item" msgstr "الصنف {0} يجب ألا يكون صنف مخزن
Item {0} must be a non-stock item" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "العنصر {0} غير موجود في جدول \"المواد الخام الموردة\" في {1} {2}" @@ -27421,7 +27466,7 @@ msgstr "البند {0} الكمية المطلوبة {1} لا يمكن أن تك msgid "Item {0}: {1} qty produced. " msgstr "العنصر {0}: {1} الكمية المنتجة." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "العنصر {} غير موجود." @@ -27531,7 +27576,7 @@ msgstr "عناصر لطلب المواد الخام" msgid "Items not found." msgstr "لم يتم العثور على العناصر." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "تم تحديث سعر الأصناف إلى الصفر حيث تم تحديد خيار \"السماح بسعر تقييم صفري\" للأصناف التالية: {0}" @@ -28164,7 +28209,7 @@ msgstr "آخر مستودع تم مسحه ضوئيًا" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "كانت آخر معاملة مخزون للبند {0} تحت المستودع {1} في {2}." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28443,7 +28488,7 @@ msgstr "أسطورة" msgid "Length (cm)" msgstr "الطول (سم)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "أقل من المبلغ" @@ -28584,7 +28629,7 @@ msgstr "الفواتير المرتبطة" msgid "Linked Location" msgstr "الموقع المرتبط" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "مرتبط بالوثائق المقدمة" @@ -28979,11 +29024,6 @@ msgstr "صيانة الأصول" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "الحفاظ على نفس السعر طوال المعاملة الداخلية" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "حافظ على نفس السعر طوال دورة الشراء" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -28995,6 +29035,11 @@ msgstr "منتج يخزن" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29191,7 +29236,7 @@ msgid "Major/Optional Subjects" msgstr "المواد الرئيسية والاختيارية التي تم دراستها" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29360,8 +29405,8 @@ msgstr "القسم الإلزامي" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29420,8 +29465,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29570,7 +29615,7 @@ msgstr "تاريخ التصنيع" msgid "Manufacturing Manager" msgstr "مدير التصنيع" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "كمية التصنيع إلزامية\\n
\\nManufacturing Quantity is mandatory" @@ -29846,7 +29891,7 @@ msgstr "اهلاك المواد" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "اهلاك المواد للتصنيع" @@ -29917,6 +29962,7 @@ msgstr "أستلام مواد" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30023,11 +30069,11 @@ msgstr "المادة طلب خطة البند" msgid "Material Request Type" msgstr "نوع طلب المواد" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "لم يتم إنشاء طلب المواد ، ككمية للمواد الخام المتاحة بالفعل." @@ -30142,7 +30188,7 @@ msgstr "المواد المنقولة لغرض صناعة" msgid "Material Transferred for Manufacturing" msgstr "المواد المنقولة لغرض التصنيع" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30271,11 +30317,11 @@ msgstr "الحد الأقصى لمبلغ الدفع" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "الحد الأقصى للعينات - {0} يمكن الاحتفاظ بالدفعة {1} والبند {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "الحد الأقصى للعينات - {0} تم الاحتفاظ به مسبقا للدفعة {1} و العنصر {2} في الدفعة {3}." @@ -30719,11 +30765,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "نفقات متنوعة" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "عدم تطابق" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "مفتقد" @@ -30761,7 +30807,7 @@ msgstr "فلاتر مفقودة" msgid "Missing Finance Book" msgstr "كتاب التمويل المفقود" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "مفقود، تم الانتهاء منه، جيد" @@ -30769,11 +30815,11 @@ msgstr "مفقود، تم الانتهاء منه، جيد" msgid "Missing Formula" msgstr "الصيغة المفقودة" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "العنصر المفقود" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30817,10 +30863,6 @@ msgstr "قيمة مفقودة" msgid "Mixed Conditions" msgstr "ظروف مختلطة" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "المحمول: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31089,7 +31131,7 @@ msgstr "" msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "يوجد سنوات مالية متعددة لنفس التاريخ {0}. الرجاء تحديد الشركة لهذه السنة المالية\\n
\\nMultiple fiscal years exist for the date {0}. Please set company in Fiscal Year" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "لا يمكن وضع علامة \"منتج نهائي\" على عدة عناصر" @@ -31168,27 +31210,20 @@ msgstr "مكان مسمى" msgid "Naming Series Prefix" msgstr "بادئة سلسلة التسمية" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "تسمية السلاسل والأسعار الافتراضية" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "سلسلة التسمية إلزامية" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31236,16 +31271,16 @@ msgstr "تحليل الاحتياجات" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "الكمية السلبية غير مسموح بها\\n
\\nnegative Quantity is not allowed" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "خطأ في المخزون السالب" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "معدل التقييم السلبي غير مسموح به\\n
\\nNegative Valuation Rate is not allowed" @@ -31859,7 +31894,7 @@ msgstr "لم يتم العثور على ملف تعريف نقطة البيع. #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "لا يوجد تصريح" @@ -31872,7 +31907,7 @@ msgstr "لم يتم إنشاء أي أوامر شراء" msgid "No Records for these settings." msgstr "لا توجد سجلات لهذه الإعدادات." -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "لا يوجد اختيار" @@ -31917,7 +31952,7 @@ msgstr "لم يتم العثور على أي مدفوعات غير مطابقة msgid "No Work Orders were created" msgstr "لم يتم إنشاء أي أوامر عمل" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "لا القيود المحاسبية للمستودعات التالية" @@ -31930,7 +31965,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "لم يتم العثور على BOM نشط للعنصر {0}. لا يمكن ضمان التسليم عن طريق الرقم التسلسلي" @@ -31942,7 +31977,7 @@ msgstr "لا توجد حقول إضافية متاحة" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "لا توجد كمية متاحة للحجز للصنف {0} في المستودع {1}" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -31950,7 +31985,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32044,7 +32079,7 @@ msgstr "لا مزيد من الأطفال على اليسار" msgid "No more children on Right" msgstr "لا مزيد من الأطفال على اليمين" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32219,7 +32254,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "لم يتم إنشاء أي قيود في دفتر الأستاذ الخاص بالمخزون. يرجى تحديد الكمية أو سعر التقييم للأصناف بشكل صحيح والمحاولة مرة أخرى." @@ -32311,7 +32346,7 @@ msgstr "غير الصفر" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "لا يوجد أي من البنود لديها أي تغيير في كمية أو قيمة.\\n
\\nNone of the items have any change in quantity or value." @@ -32415,7 +32450,7 @@ msgstr "غير مصرح به لأن {0} يتجاوز الحدود" msgid "Not authorized to edit frozen Account {0}" msgstr "غير مصرح له بتحرير الحساب المجمد {0}\\n
\\nNot authorized to edit frozen Account {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32461,7 +32496,7 @@ msgstr "ملاحظة : لن يتم إنشاء تدوين المدفوعات نظ msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "ملاحظة: مركز التكلفة هذا هو مجموعة. لا يمكن إجراء القيود المحاسبية مقابل المجموعات." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "ملاحظة: لدمج الأصناف، أنشئ مطابقة مخزون منفصلة للصنف القديم {0}" @@ -32938,7 +32973,7 @@ msgstr "يجب أن يكون أحد خياري الإيداع أو السحب ف msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "لا يمكن إنشاء سوى إدخال واحد {0} مقابل أمر العمل {1}" @@ -33090,7 +33125,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "افتتاحي" @@ -33249,16 +33284,16 @@ msgstr "تم إنشاء فواتير المبيعات الافتتاحية." #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "مخزون أول المدة" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33615,7 +33650,7 @@ msgstr "اختياري . سيتم استخدام هذا الإعداد لفلت msgid "Optional. Used with Financial Report Template" msgstr "اختياري. يُستخدم مع نموذج التقرير المالي" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33749,7 +33784,7 @@ msgstr "الكمية التي تم طلبها" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "أوامر" @@ -33957,7 +33992,7 @@ msgstr "الرصيد المستحق (عملة الشركة)" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34015,7 +34050,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "نسبة السماح بالفواتير الزائدة (%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "تم تجاوز حدّ السماح بالفواتير الزائدة لبند إيصال الشراء {0} ({1}) بنسبة {2}%" @@ -34033,7 +34068,7 @@ msgstr "بدل التسليم/الاستلام الزائد (%)" msgid "Over Picking Allowance" msgstr "بدل الإفراط في الانتقاء" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "إيصال زائد" @@ -34276,7 +34311,6 @@ msgstr "نقاط البيع الميدانية" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "فاتورة نقاط البيع" @@ -34547,7 +34581,7 @@ msgstr "عنصر معبأ" msgid "Packed Items" msgstr "عناصر معبأة" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "لا يمكن نقل العناصر المعبأة داخلياً" @@ -34995,7 +35029,7 @@ msgstr "تلقى جزئيا" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35131,7 +35165,7 @@ msgstr "أجزاء في المليون" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35257,7 +35291,7 @@ msgstr "عدم توافق الحزب" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35343,7 +35377,7 @@ msgstr "عنصر خاص بالحزب" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35646,7 +35680,6 @@ msgstr "تدوين مدفوعات {0} غير مترابطة" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35904,7 +35937,7 @@ msgstr "المراجع الدفع" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -35983,10 +36016,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "حالة الدفع" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37007,7 +37036,7 @@ msgstr "يرجى تحديد الأولوية" msgid "Please Set Supplier Group in Buying Settings." msgstr "يرجى تعيين مجموعة الموردين في إعدادات الشراء." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "يرجى تحديد الحساب" @@ -37039,11 +37068,11 @@ msgstr "الرجاء إضافة حساب فتح مؤقت في مخطط الحس msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "يرجى إضافة رقم تسلسلي واحد على الأقل / رقم دفعة واحد على الأقل" @@ -37063,7 +37092,7 @@ msgstr "الرجاء إضافة الحساب إلى شركة على مستوى msgid "Please add {1} role to user {0}." msgstr "يرجى إضافة الدور {1} إلى المستخدم {0}." -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "يرجى تعديل الكمية أو تحرير {0} للمتابعة." @@ -37170,7 +37199,7 @@ msgstr "يرجى إنشاء عملية شراء من مستند البيع أو msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "الرجاء إنشاء إيصال شراء أو فاتورة شراء للعنصر {0}" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "يرجى حذف حزمة المنتج {0}قبل دمج {1} في {2}" @@ -37239,11 +37268,11 @@ msgstr "الرجاء إدخال الحساب لمبلغ التغيير\\n
\\ msgid "Please enter Approving Role or Approving User" msgstr "الرجاء إدخال صلاحية المخول بالتصديق أو المستخدم المخول بالتصديق" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "يرجى إدخال مركز التكلفة\\n
\\nPlease enter Cost Center" @@ -37255,7 +37284,7 @@ msgstr "الرجاء إدخال تاريخ التسليم" msgid "Please enter Employee Id of this sales person" msgstr "الرجاء إدخال معرف الموظف الخاص بشخص المبيعات هذا" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "الرجاء إدخال حساب النفقات\\n
\\nPlease enter Expense Account" @@ -37300,7 +37329,7 @@ msgstr "الرجاء إدخال تاريخ المرجع\\n
\\nPlease enter Re msgid "Please enter Root Type for account- {0}" msgstr "الرجاء إدخال نوع الجذر للحساب - {0}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "" @@ -37377,7 +37406,7 @@ msgstr "يرجى إدخال تاريخ التسليم الأول" msgid "Please enter the phone number first" msgstr "الرجاء إدخال رقم الهاتف أولاً" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "الرجاء إدخال {schedule_date}." @@ -37491,12 +37520,12 @@ msgstr "يرجى حفظ أمر البيع قبل إضافة جدول التسل msgid "Please select Template Type to download template" msgstr "يرجى تحديد نوع القالب لتنزيل القالب" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "الرجاء اختيار (تطبيق تخفيض على)" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "الرجاء اختيار بوم ضد العنصر {0}" @@ -37512,13 +37541,13 @@ msgstr "يرجى اختيار الحساب المصرفي" msgid "Please select Category first" msgstr "الرجاء تحديد التصنيف أولا\\n
\\nPlease select Category first" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "يرجى تحديد نوع الرسوم أولا" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "الرجاء اختيار شركة \\n
\\nPlease select Company" @@ -37527,7 +37556,7 @@ msgstr "الرجاء اختيار شركة \\n
\\nPlease select Company" msgid "Please select Company and Posting Date to getting entries" msgstr "يرجى تحديد الشركة وتاريخ النشر للحصول على إدخالات" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "الرجاء تحديد الشركة أولا\\n
\\nPlease select Company first" @@ -37576,7 +37605,7 @@ msgstr "الرجاء تحديد حساب الفرق في إدخالات المح msgid "Please select Posting Date before selecting Party" msgstr "الرجاء تجديد تاريخ النشر قبل تحديد المستفيد\\n
\\nPlease select Posting Date before selecting Party" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "الرجاء تحديد تاريخ النشر أولا\\n
\\nPlease select Posting Date first" @@ -37584,11 +37613,11 @@ msgstr "الرجاء تحديد تاريخ النشر أولا\\n
\\nPlease s msgid "Please select Price List" msgstr "الرجاء اختيار قائمة الأسعار\\n
\\nPlease select Price List" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "الرجاء اختيار الكمية ضد العنصر {0}" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "يرجى تحديد نموذج الاحتفاظ مستودع في إعدادات المخزون أولا" @@ -37641,7 +37670,7 @@ msgstr "يرجى اختيار أمر شراء خاص بالتعاقد من ال msgid "Please select a Supplier" msgstr "الرجاء اختيار مورد" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "الرجاء اختيار مستودع" @@ -37702,7 +37731,7 @@ msgstr "الرجاء تحديد صف لإنشاء إدخال إعادة نشر" msgid "Please select a supplier for fetching payments." msgstr "يرجى اختيار مورد لتحصيل المدفوعات." -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37722,7 +37751,7 @@ msgstr "يرجى تحديد رمز المنتج قبل تحديد المستود msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "يرجى تحديد فلتر واحد على الأقل: رمز الصنف، أو رقم الدفعة، أو الرقم التسلسلي." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37829,7 +37858,7 @@ msgstr "يرجى اختيار نوع مستند صالح." msgid "Please select weekly off day" msgstr "الرجاء اختيار يوم العطلة الاسبوعي" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "الرجاء تحديد {0} أولا\\n
\\nPlease select {0} first" @@ -37969,7 +37998,7 @@ msgstr "يرجى تحديد الطلب الفعلي أو توقعات المبي msgid "Please set an Address on the Company '%s'" msgstr "يرجى تحديد عنوان في الشركة '%s'" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "يرجى تحديد حساب مصروفات في جدول البنود" @@ -38013,7 +38042,7 @@ msgstr "يرجى تعيين حساب المصروفات الافتراضي في msgid "Please set default UOM in Stock Settings" msgstr "يرجى تعيين الافتراضي UOM في إعدادات الأسهم" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "يرجى تحديد حساب تكلفة البضائع المباعة الافتراضي في الشركة {0} لتسجيل مكاسب وخسائر التقريب أثناء نقل المخزون" @@ -38132,7 +38161,7 @@ msgstr "يرجى تحديد {0} أولاً." msgid "Please specify at least one attribute in the Attributes table" msgstr "يرجى تحديد خاصية واحدة على الأقل في جدول (الخاصيات)" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "يرجى تحديد الكمية أو التقييم إما قيم أو كليهما" @@ -38303,7 +38332,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38328,7 +38357,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38443,7 +38472,7 @@ msgstr "تاريخ ووقت النشر" msgid "Posting Time" msgstr "نشر التوقيت" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "تاريخ النشر و وقت النشر الزامي\\n
\\nPosting date and posting time is mandatory" @@ -38622,6 +38651,12 @@ msgstr "الصيانة الوقائية" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -38915,7 +38950,9 @@ msgstr "ألواح سعر الخصم أو المنتج مطلوبة" msgid "Price per Unit (Stock UOM)" msgstr "السعر لكل وحدة (المخزون UOM)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40270,6 +40307,7 @@ msgstr "مصروفات شراء الصنف {0}" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40306,6 +40344,12 @@ msgstr "عربون فاتورة الشراء" msgid "Purchase Invoice Item" msgstr "اصناف فاتورة المشتريات" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40357,6 +40401,7 @@ msgstr "فواتير الشراء" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40366,7 +40411,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40483,7 +40528,7 @@ msgstr "تم إنشاء أمر الشراء {0}" msgid "Purchase Order {0} is not submitted" msgstr "طلب الشراء {0} يجب أن يعتمد\\n
\\nPurchase Order {0} is not submitted" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "طلبات الشراء" @@ -40546,6 +40591,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40560,7 +40606,7 @@ msgstr "قائمة أسعار الشراء" msgid "Purchase Receipt" msgstr "إستلام المشتريات" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40826,7 +40872,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41414,7 +41459,7 @@ msgstr "مراجعة جودة" msgid "Quality Review Objective" msgstr "هدف مراجعة الجودة" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41475,7 +41520,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41669,7 +41714,7 @@ msgstr "سلسلة مسار الاستعلام" msgid "Queue Size should be between 5 and 100" msgstr "يجب أن يتراوح حجم قائمة الانتظار بين 5 و 100" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "قيد دفتر يومية سريع" @@ -41724,7 +41769,7 @@ msgstr "نسبة الاقتباس/العميل المحتمل" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41887,7 +41932,6 @@ msgstr "التي أثارها (بريد إلكتروني)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42297,8 +42341,8 @@ msgstr "المواد الخام للعميل" msgid "Raw SQL" msgstr "SQL الخام" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "سيتم التحقق من كمية المواد الخام المستهلكة بناءً على الكمية المطلوبة من قائمة مكونات المنتج النهائي." @@ -42706,11 +42750,10 @@ msgstr "مطابقة المعاملة المصرفية" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43234,7 +43277,7 @@ msgstr "تم رفض الرقم التسلسلي وحزمة الدفعات" msgid "Rejected Warehouse" msgstr "رفض مستودع" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "لا يمكن أن يكون المستودع المرفوض هو نفسه المستودع المقبول." @@ -43284,7 +43327,7 @@ msgid "Remaining Balance" msgstr "الرصيد المتبقي" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43338,7 +43381,7 @@ msgstr "كلام" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43377,7 +43420,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "قم بإزالة المنتج إذا لم تكن الرسوم مطبقة عليه." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "العناصر إزالتها مع أي تغيير في كمية أو قيمة." @@ -43782,6 +43825,7 @@ msgstr "طلب المعلومات" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44055,7 +44099,7 @@ msgstr "مخصص للتجميع الفرعي" msgid "Reserved" msgstr "محجوز" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "تعارض الدُفعات المحجوزة" @@ -44668,7 +44712,7 @@ msgstr "" msgid "Reversal Of" msgstr "عكس" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "عكس دخول المجلة" @@ -44817,10 +44861,7 @@ msgstr "يُسمح لهذا الدور بتقديم/استلام أكثر من #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "الدور المسموح له بتجاوز أمر إيقاف الإجراء" @@ -44835,8 +44876,11 @@ msgstr "الدور المسموح به لتجاوز حد الائتمان" msgid "Role allowed to bypass period restrictions." msgstr "يُسمح للدور بتجاوز قيود الفترة." +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45037,8 +45081,8 @@ msgstr "مخصص خسائر التقريب" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "يجب أن يكون بدل خسائر التقريب بين 0 و 1" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "قيد تقريب الربح/الخسارة لنقل الأسهم" @@ -45065,11 +45109,11 @@ msgstr "اسم التوجيه" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "الصف # {0}: لا يمكن الارجاع أكثر من {1} للبند {2}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "الصف رقم {0}: يرجى إضافة الرقم التسلسلي وحزمة الدفعة للعنصر {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "الصف رقم {0}: يرجى إدخال الكمية للعنصر {1} لأنها ليست صفرًا." @@ -45095,7 +45139,7 @@ msgstr "الصف # {0} (جدول الدفع): يجب أن يكون المبلغ msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "الصف رقم {0} (جدول الدفع): يجب أن يكون المبلغ موجبا" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "الصف #{0}: يوجد بالفعل إدخال إعادة طلب للمستودع {1} بنوع إعادة الطلب {2}." @@ -45296,7 +45340,7 @@ msgstr "الصف # {0}: إدخال مكرر في المراجع {1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "الصف # {0}: تاريخ التسليم المتوقع لا يمكن أن يكون قبل تاريخ أمر الشراء" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "الصف #{0}: لم يتم تعيين حساب المصروفات للعنصر {1}. {2}" @@ -45356,7 +45400,7 @@ msgstr "الصف #{0}: حقلا \"من وقت\" و\"إلى وقت\" مطلوبا msgid "Row #{0}: Item added" msgstr "الصف # {0}: تمت إضافة العنصر" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "الصف #{0}: لا يمكن نقل العنصر {1} إلى أكثر من {2} مقابل {3} {4}" @@ -45384,7 +45428,7 @@ msgstr "الصف #{0}: العنصر {1} في المستودع {2}: متوفر {3 msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "الصف #{0}: العنصر {1} ليس عنصرًا مقدمًا من العميل." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "الصف # {0}: العنصر {1} ليس عنصرًا تسلسليًا / مُجمَّع. لا يمكن أن يكون له رقم مسلسل / لا دفعة ضده." @@ -45437,7 +45481,7 @@ msgstr "الصف #{0}: الصف {1} فقط متاح للحجز للعنصر {2}" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "الصف #{0}: يجب أن يكون الاستهلاك المتراكم الافتتاحي أقل من أو يساوي {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "الصف # {0}: العملية {1} لم تكتمل لـ {2} الكمية من السلع تامة الصنع في أمر العمل {3}. يرجى تحديث حالة التشغيل عبر بطاقة العمل {4}." @@ -45462,7 +45506,7 @@ msgstr "الصف #{0}: يرجى تحديد عنصر المنتج النهائي msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "الصف #{0}: الرجاء تحديد مستودع التجميع الفرعي" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "الصف # {0}: يرجى تعيين إعادة ترتيب الكمية\\n
\\nRow #{0}: Please set reorder quantity" @@ -45488,15 +45532,15 @@ msgstr "الصف #{0}: يجب أن تكون الكمية عددًا موجبًا msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "الصف #{0}: يجب أن تكون الكمية أقل من أو تساوي الكمية المتاحة للحجز (الكمية الفعلية - الكمية المحجوزة) {1} للصنف {2} مقابل الدفعة {3} في المستودع {4}." -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "الصف #{0}: يلزم فحص الجودة للعنصر {1}" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "الصف #{0}: لم يتم تقديم فحص الجودة {1} للعنصر: {2}" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "الصف #{0}: تم رفض فحص الجودة {1} للعنصر {2}" @@ -45527,11 +45571,11 @@ msgstr "الصف #{0}: يجب أن تكون الكمية المراد حجزها msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "الصف #{0}: يجب أن يكون المعدل هو نفسه {1}: {2} ({3} / {4})" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "الصف {0} : نوع المستند المرجع يجب أن يكون واحدة من طلب شراء ,فاتورة شراء أو قيد يومبة\\n
\\nRow #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "الصف # {0}: يجب أن يكون نوع المستند المرجعي أحد أوامر المبيعات أو فاتورة المبيعات أو إدخال دفتر اليومية أو المطالبة" @@ -45574,7 +45618,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "الصف #{0}: يجب أن يكون معرف التسلسل {1} أو {2} للعملية {3}." -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "الصف # {0}: الرقم التسلسلي {1} لا ينتمي إلى الدُفعة {2}" @@ -45622,11 +45666,11 @@ msgstr "الصف #{0}: لا يمكن أن يكون مستودع المصدر {1} msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "الصف #{0}: يجب أن يكون مستودع المصدر {1} للعنصر {2} هو نفسه مستودع المصدر {3} في أمر العمل." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "الصف #{0}: لا يمكن أن يكون مستودع المصدر ومستودع الهدف متطابقين لنقل المواد" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "الصف #{0}: لا يمكن أن تكون أبعاد المستودع المصدر والمستودع الهدف والمخزون متطابقة تمامًا في عملية نقل المواد." @@ -45679,11 +45723,11 @@ msgstr "الصف #{0}: كمية المخزون {1} ({2}) للصنف {3} لا ي msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "الصف #{0}: يجب أن يكون المستودع المستهدف هو نفسه مستودع العميل {1} من أمر الشراء الداخلي المرتبط بالتعاقد من الباطن" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "الصف رقم {0}: انتهت صلاحية الدفعة {1} بالفعل." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "الصف #{0}: المستودع {1} ليس مستودعًا فرعيًا لمستودع مجموعة {2}" @@ -45711,7 +45755,7 @@ msgstr "الصف #{0}: مبلغ الاستقطاع {1} لا يتطابق مع ا msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "الصف #{0}: يوجد أمر عمل مقابل كمية كاملة أو جزئية من العنصر {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "الصف #{0}: لا يمكنك استخدام بُعد المخزون '{1}' في مطابقة المخزون لتعديل الكمية أو معدل التقييم. تُستخدم مطابقة المخزون باستخدام أبعاد المخزون فقط لإجراء قيود افتتاحية." @@ -45747,23 +45791,23 @@ msgstr "الصف #{1}: المستودع إلزامي لعنصر المخزون { msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "الصف #{idx}: لا يمكن تحديد مستودع المورد أثناء توريد المواد الخام إلى المقاول من الباطن." -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "الصف #{idx}: تم تحديث سعر الصنف وفقًا لسعر التقييم نظرًا لأنه تحويل مخزون داخلي." -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "الصف #{idx}: الرجاء إدخال موقع عنصر الأصل {item_code}." -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "الصف #{idx}: يجب أن تكون الكمية المستلمة مساوية للكمية المقبولة + الكمية المرفوضة للعنصر {item_code}." -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "الصف #{idx}: {field_label} لا يمكن أن يكون سالباً بالنسبة للعنصر {item_code}." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "الصف #{idx}: {field_label} إلزامي." @@ -45771,7 +45815,7 @@ msgstr "الصف #{idx}: {field_label} إلزامي." msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "الصف #{idx}: {from_warehouse_field} و {to_warehouse_field} لا يمكن أن يكونا متطابقين." -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "الصف #{idx}: {schedule_date} لا يمكن أن يكون قبل {transaction_date}." @@ -45836,7 +45880,7 @@ msgstr "رقم الصف {}: {}" msgid "Row #{}: {} {} does not exist." msgstr "الصف رقم {}: {} {} غير موجود." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "الصف رقم {}: {} {} لا ينتمي إلى الشركة {}. يرجى اختيار {} صحيح." @@ -45852,7 +45896,7 @@ msgstr "الصف {0}: العملية مطلوبة مقابل عنصر الماد msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "الكمية المختارة من الصف {0} أقل من الكمية المطلوبة، يلزم كمية إضافية {1} {2} ." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "الصف {0}# العنصر {1} غير موجود في جدول \"المواد الخام الموردة\" في {2} {3}" @@ -45884,7 +45928,7 @@ msgstr "الصف {0}: يجب أن يكون المبلغ المخصص {1} أقل msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "الصف {0}: يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي مبلغ الدفعة المتبقية {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "الصف {0}: بما أن {1} مُفعّل، فلا يمكن إضافة المواد الخام إلى المدخل {2} . استخدم المدخل {3} لاستهلاك المواد الخام." @@ -45943,7 +45987,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "الصف {0}: يجب أن يكون مرجع عنصر إشعار التسليم أو العنصر المعبأ إلزاميًا." #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "الصف {0}: سعر صرف إلزامي" @@ -45984,7 +46028,7 @@ msgstr "صف {0}: (من الوقت) و (إلى وقت) تكون إلزامية." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "الصف {0}: من وقت إلى وقت {1} يتداخل مع {2}" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "الصف {0}: من المستودع إلزامي للتحويلات الداخلية" @@ -46108,7 +46152,7 @@ msgstr "الصف {0}: يجب أن تكون الكمية أكبر من 0." msgid "Row {0}: Quantity cannot be negative." msgstr "الصف {0}: لا يمكن أن تكون الكمية سالبة." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "الصف {0}: الكمية غير متوفرة {4} في المستودع {1} في وقت نشر الإدخال ({2} {3})" @@ -46120,11 +46164,11 @@ msgstr "الصف {0}: تم إنشاء فاتورة المبيعات {1} بالف msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "الصف {0}: لا يمكن تغيير المناوبة لأن عملية الإهلاك قد تمت بالفعل" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "الصف {0}: العنصر المتعاقد عليه من الباطن إلزامي للمادة الخام {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "الصف {0}: المستودع المستهدف إلزامي للتحويلات الداخلية" @@ -46148,7 +46192,7 @@ msgstr "الصف {0}: الحساب {3} {1} لا ينتمي إلى الشركة { msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "الصف {0}: لتعيين دورية {1} ، يجب أن يكون الفرق بين تاريخي البداية والنهاية أكبر من أو يساوي {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "الصف {0}: لا يمكن أن تكون الكمية المنقولة أكبر من الكمية المطلوبة." @@ -46201,7 +46245,7 @@ msgstr "الصف {0}: {2} العنصر {1} غير موجود في {2} {3}" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "الصف {1}: لا يمكن أن تكون الكمية ({0}) كسرًا. للسماح بذلك ، قم بتعطيل '{2}' في UOM {3}." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "الصف {idx}: سلسلة تسمية الأصول إلزامية لإنشاء الأصول تلقائيًا للعنصر {item_code}." @@ -46231,7 +46275,7 @@ msgstr "سيتم دمج الصفوف التي تحتوي على نفس رؤوس msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "تم العثور على صفوف ذات تواريخ استحقاق مكررة في صفوف أخرى: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "الصفوف: {0} تحتوي على \"إدخال الدفع\" كنوع مرجعي. لا ينبغي تعيين هذا يدويًا." @@ -46297,7 +46341,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46594,7 +46638,7 @@ msgstr "معدل المبيعات الواردة" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46768,7 +46812,7 @@ msgstr "فرص المبيعات حسب المصدر" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46891,8 +46935,8 @@ msgstr "طلب البيع مطلوب للبند {0}\\n
\\nSales Order require msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "يوجد بالفعل أمر بيع {0} مرتبط بأمر شراء العميل {1}. للسماح بإنشاء أوامر بيع متعددة، فعّل الخيار {2} في {3}." -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47303,7 +47347,7 @@ msgstr "نفس البند" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "تم إدخال نفس المنتج ونفس تركيبة المستودع مسبقاً." @@ -47340,7 +47384,7 @@ msgstr "مستودع الاحتفاظ بالعينات" msgid "Sample Size" msgstr "حجم العينة" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "كمية العينة {0} لا يمكن أن تكون أكثر من الكمية المستلمة {1}" @@ -47631,7 +47675,7 @@ msgstr "ابحث باستخدام رمز المنتج أو الرقم التسل msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47776,7 +47820,7 @@ msgstr "اختر الماركة ..." msgid "Select Columns and Filters" msgstr "تحديد الأعمدة والفلاتر" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "حدد الشركة" @@ -48471,7 +48515,7 @@ msgstr "نطاق الأرقام التسلسلية" msgid "Serial No Reserved" msgstr "الرقم التسلسلي محجوز" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "تداخل سلسلة الأرقام التسلسلية" @@ -48532,7 +48576,7 @@ msgstr "الرقم التسلسلي إلزامي" msgid "Serial No is mandatory for Item {0}" msgstr "رقم المسلسل إلزامي القطعة ل {0}" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "الرقم التسلسلي {0} موجود بالفعل" @@ -48818,7 +48862,7 @@ msgstr "الأرقام التسلسلية غير متوفرة للعنصر {0} #: 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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48844,7 +48888,7 @@ msgstr "الأرقام التسلسلية غير متوفرة للعنصر {0} #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49242,12 +49286,6 @@ msgstr "حدد المخزن الوجهة" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "تحديد سعر التقييم بناءً على مستودع المصدر" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "تحديد سعر تقييم المواد المرفوضة" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "مستودع المجموعة" @@ -49353,6 +49391,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "قم بتعيين {0} في فئة الأصول {1} للشركة {2}" @@ -49851,7 +49895,7 @@ msgstr "عرض الأرصدة في دليل الحسابات" msgid "Show Barcode Field in Stock Transactions" msgstr "إظهار حقل الباركود في معاملات المخزون" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "إظهار الإدخالات الملغاة" @@ -49859,7 +49903,7 @@ msgstr "إظهار الإدخالات الملغاة" msgid "Show Completed" msgstr "عرض مكتمل" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "إظهار الرصيد الدائن / المدين بعملة الشركة" @@ -49942,7 +49986,7 @@ msgstr "إظهار ملاحظات التسليم المرتبطة" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "عرض القيم الصافية في حساب الطرف" @@ -49954,7 +49998,7 @@ msgstr "" msgid "Show Open" msgstr "عرض مفتوح" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "إظهار إدخالات الافتتاح" @@ -49967,11 +50011,6 @@ msgstr "عرض الرصيد الافتتاحي والختامي" msgid "Show Operations" msgstr "مشاهدة العمليات" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "إظهار زر الدفع في بوابة أوامر الشراء" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "إظهار تفاصيل الدفع" @@ -49987,7 +50026,7 @@ msgstr "عرض جدول الدفع في الطباعة" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "إظهار الملاحظات" @@ -50054,6 +50093,11 @@ msgstr "إظهار نقاط البيع فقط" msgid "Show only the Immediate Upcoming Term" msgstr "اعرض الفصل الدراسي القادم مباشرة فقط" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "عرض الإدخالات المعلقة" @@ -50340,11 +50384,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50410,7 +50454,7 @@ msgstr "يجب أن يكون مستودع المصدر {0} هو نفسه مست msgid "Source and Target Location cannot be same" msgstr "لا يمكن أن يكون المصدر و الموقع الهدف نفسه" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "المصدر والمستودع المستهدف لا يمكن أن يكون نفس الصف {0}\\n
\\nSource and target warehouse cannot be same for row {0}" @@ -50424,8 +50468,8 @@ msgid "Source of Funds (Liabilities)" msgstr "(مصدر الأموال (الخصوم" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "مستودع المصدر إلزامي للصف {0}\\n
\\nSource warehouse is mandatory for row {0}" @@ -50590,8 +50634,8 @@ msgstr "المصاريف الخاضعة للضريبة القياسية" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "البيع القياسية" @@ -50924,7 +50968,7 @@ msgstr "سجل إغلاق المخزون" msgid "Stock Details" msgstr "تفاصيل المخزون" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "تم إنشاء إدخالات المخزون بالفعل لأمر العمل {0}: {1}" @@ -51195,7 +51239,7 @@ msgstr "المخزون المتلقي ولكن غير مفوتر" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51207,7 +51251,7 @@ msgstr "جرد المخزون" msgid "Stock Reconciliation Item" msgstr "جرد عناصر المخزون" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "تسويات المخزون" @@ -51245,7 +51289,7 @@ msgstr "إعدادات إعادة نشر المخزون" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51273,7 +51317,7 @@ msgstr "تم إلغاء إدخالات حجز المخزون" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "تم إنشاء قيود حجز المخزون" @@ -51655,7 +51699,7 @@ msgstr "لا يمكن إلغاء طلب العمل المتوقف ، قم بإل #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "مخازن" @@ -51733,10 +51777,6 @@ msgstr "العمليات الفرعية" msgid "Sub Procedure" msgstr "الإجراء الفرعي" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "المجموع الفرعي" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "المراجع الخاصة بعناصر التجميع الفرعي مفقودة. يرجى إعادة جلب التجميعات الفرعية والمواد الخام." @@ -51953,7 +51993,7 @@ msgstr "بند خدمة طلب داخلي للتعاقد من الباطن" msgid "Subcontracting Order" msgstr "أمر التعاقد من الباطن" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -51979,7 +52019,7 @@ msgstr "بند خدمة طلب التعاقد من الباطن" msgid "Subcontracting Order Supplied Item" msgstr "بند مورد من طلب التعاقد من الباطن" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "تم إنشاء أمر التعاقد من الباطن {0} ." @@ -52068,7 +52108,7 @@ msgstr "" msgid "Subdivision" msgstr "تقسيم فرعي" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "فشل إرسال الإجراء" @@ -52243,7 +52283,7 @@ msgstr "تمت التسوية بنجاح\\n
\\nSuccessfully Reconciled" msgid "Successfully Set Supplier" msgstr "بنجاح تعيين المورد" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "تم تغيير وحدة قياس المخزون بنجاح، يرجى إعادة تعريف عوامل التحويل لوحدة القياس الجديدة." @@ -52399,6 +52439,7 @@ msgstr "الموردة الكمية" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52440,8 +52481,8 @@ msgstr "الموردة الكمية" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52489,6 +52530,12 @@ msgstr "عناوين الموردين وجهات الاتصال" msgid "Supplier Contact" msgstr "جهة اتصال المورد" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52583,7 +52630,7 @@ msgstr "المورد فاتورة التسجيل" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "رقم فاتورة المورد" @@ -52863,19 +52910,10 @@ msgstr "مورد السلع أو الخدمات." msgid "Supplier {0} not found in {1}" msgstr "المورد {0} غير موجود في {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "المورد (ق)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "المورد حكيم المبيعات تحليلات" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -52937,7 +52975,7 @@ msgstr "فريق الدعم" msgid "Support Tickets" msgstr "تذاكر الدعم الفني" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53196,8 +53234,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "يجب أن يكون المستودع المستهدف {0} هو نفسه مستودع التسليم {1} في بند أمر التوريد الداخلي للتعاقد من الباطن." #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "المستودع المستهدف إلزامي للصف {0}\\n
\\nTarget warehouse is mandatory for row {0}" @@ -53666,7 +53704,7 @@ msgstr "يتم اقتطاع الضريبة فقط على المبلغ الذي #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "المبلغ الخاضع للضريبة" @@ -53827,7 +53865,7 @@ msgstr "خصم الضرائب والرسوم" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "الضرائب والرسوم مقطوعة (عملة الشركة)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "لا يمكن أن يكون صف الضرائب #{0}: {1} أصغر من {2}" @@ -54017,7 +54055,6 @@ msgstr "نموذج الشروط" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54209,7 +54246,7 @@ msgstr "تم تعطيل الوصول إلى طلب عرض الأسعار من ا msgid "The BOM which will be replaced" msgstr "وBOM التي سيتم استبدالها" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "تحتوي الدفعة {0} على كمية سالبة {1}. لحل هذه المشكلة، انتقل إلى الدفعة وانقر على \"إعادة حساب كمية الدفعة\". إذا استمرت المشكلة، فأنشئ إدخالًا داخليًا." @@ -54253,7 +54290,7 @@ msgstr "قد يكون مصطلح الدفع في الصف {0} مكررا." 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:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "تمت إعادة ضبط كمية الفاقد في العملية وفقًا لبطاقات العمل." @@ -54269,7 +54306,7 @@ msgstr "الرقم التسلسلي في الصف #{0}: {1} غير متوفر ف msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "الرقم التسلسلي {0} محجوز مقابل {1} {2} ولا يمكن استخدامه لأي معاملة أخرى." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "حزمة البيانات التسلسلية والدفعية {0} غير صالحة لهذه المعاملة. يجب أن يكون \"نوع المعاملة\" \"خارجي\" بدلاً من \"داخلي\" في حزمة البيانات التسلسلية والدفعية {0}" @@ -54305,7 +54342,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "تم حجز الدفعة {0} بالفعل في {1} {2}. لذا، لا يمكن المتابعة مع {3} {4}، والتي تم إنشاؤها مقابل {5} {6}." @@ -54411,7 +54448,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "توجد السمات المحذوفة التالية في المتغيرات ولكن ليس في القالب. يمكنك إما حذف المتغيرات أو الاحتفاظ بالسمة (السمات) في القالب." @@ -54455,15 +54492,15 @@ msgstr "عطلة على {0} ليست بين من تاريخ وإلى تاريخ" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "العنصر {item} غير مُصنّف كعنصر {type_of} . يمكنك تفعيله كعنصر {type_of} من قائمة العناصر الرئيسية." -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "العنصران {0} و {1} موجودان في العنصر التالي {2} :" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "العناصر {items} غير مصنفة كعناصر {type_of} . يمكنك تفعيلها كعناصر {type_of} من قائمة العناصر الرئيسية الخاصة بها." @@ -54619,7 +54656,7 @@ msgstr "الأسهم غير موجودة مع {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "كان رصيد الصنف {0} في المستودع {1} سالبًا في {2}. يجب عليك إنشاء قيد موجب {3} قبل التاريخ {4} والوقت {5} لتسجيل معدل التقييم الصحيح. لمزيد من التفاصيل، يُرجى قراءة الوثائق ." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "تم حجز المخزون للأصناف والمستودعات التالية، قم بإلغاء حجزها في {0} تسوية المخزون:

{1}" @@ -54641,11 +54678,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "وقد تم إرساء المهمة كعمل خلفية. في حالة وجود أي مشكلة في المعالجة في الخلفية ، سيقوم النظام بإضافة تعليق حول الخطأ في تسوية المخزون هذا والعودة إلى مرحلة المسودة" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "تمت إضافة المهمة إلى قائمة الانتظار كعملية خلفية. في حال وجود أي مشكلة أثناء المعالجة في الخلفية، سيضيف النظام تعليقًا حول الخطأ في عملية مطابقة المخزون هذه، ثم يعود إلى حالة \"تم الإرسال\"." @@ -54717,7 +54754,7 @@ msgstr "يجب أن يكون {0} ({1}) مساويًا لـ {2} ({3})" msgid "The {0} contains Unit Price Items." msgstr "يحتوي {0} على عناصر سعر الوحدة." -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "البادئة {0} '{1}' موجودة بالفعل. يُرجى تغيير رقم التسلسل، وإلا ستظهر لك رسالة خطأ \"إدخال مكرر\"." @@ -54770,7 +54807,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "لا توجد مواعيد متاحة في هذا التاريخ" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54814,7 +54851,7 @@ msgstr "لم يتم العثور على دفعة بالمقابلة مع {0}: {1 msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "يجب أن يكون هناك منتج نهائي واحد على الأقل في هذا الإدخال المخزوني." @@ -54870,11 +54907,11 @@ msgstr "هذا العنصر هو متغير {0} (قالب)." msgid "This Month's Summary" msgstr "ملخص هذا الشهر" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "تم التعاقد من الباطن بالكامل على أمر الشراء هذا." -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "تم التعاقد من الباطن بالكامل على أمر البيع هذا." @@ -55675,7 +55712,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين" @@ -55710,7 +55747,7 @@ msgstr "لاستخدام دفتر مالي مختلف، يرجى إلغاء تح #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "لاستخدام دفتر حسابات مالية مختلف، يرجى إلغاء تحديد \"تضمين إدخالات دفتر الحسابات المالية الافتراضية\"." @@ -55861,7 +55898,7 @@ msgstr "إجمالي المخصصات" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "الاعتماد الأساسي" @@ -56284,7 +56321,7 @@ msgstr "لا يمكن أن يكون إجمالي مبلغ طلب الدفع أك msgid "Total Payments" msgstr "مجموع المدفوعات" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "إجمالي الكمية المختارة {0} أكبر من الكمية المطلوبة {1}. يمكنك ضبط سماحية الاختيار الزائد في إعدادات المخزون." @@ -56316,7 +56353,7 @@ msgstr "مجموع تكلفة الشراء (عن طريق شراء الفاتو #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "إجمالي الكمية" @@ -56702,7 +56739,7 @@ msgstr "رابط التتبع" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56713,7 +56750,7 @@ msgstr "حركة" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "عملية العملات" @@ -57385,11 +57422,11 @@ msgstr "إعدادات ضريبة القيمة المضافة في الإمار #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57461,7 +57498,7 @@ msgstr "معامل تحويل وحدة القياس مطلوب في الصف: {0 msgid "UOM Name" msgstr "اسم وحدة القايس" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "معامل تحويل وحدة القياس المطلوب لوحدة القياس: {0} في العنصر: {1}" @@ -57537,7 +57574,7 @@ msgstr "تعذر العثور على النتيجة بدءا من {0}. يجب أ msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "لم يتم العثور على الفترة الزمنية المناسبة للعملية {1}خلال الأيام {0} القادمة. يرجى زيادة \"تخطيط السعة لـ (أيام)\" في {2}." -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "تعذر العثور على المتغير:" @@ -57656,7 +57693,7 @@ msgstr "وحدة القياس" msgid "Unit of Measure (UOM)" msgstr "وحدة القياس" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول" @@ -57776,10 +57813,9 @@ msgid "Unreconcile Transaction" msgstr "معاملة غير قابلة للتسوية" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "لم تتم تسويتها" @@ -57802,10 +57838,6 @@ msgstr "إدخالات غير مُطابقة" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57851,7 +57883,7 @@ msgstr "غير المجدولة" msgid "Unsecured Loans" msgstr "القروض غير المضمونة" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "طلب دفع غير مطابق" @@ -58066,12 +58098,6 @@ msgstr "تحديث المخزون" msgid "Update Type" msgstr "نوع التحديث" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "تحديث وتيرة المشروع" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58112,7 +58138,7 @@ msgstr "تم تحديث صف (صفوف) التقرير المالي {0} باسم msgid "Updating Costing and Billing fields against this Project..." msgstr "تحديث حقول التكاليف والفواتير لهذا المشروع..." -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "جارٍ تحديث المتغيرات ..." @@ -58570,12 +58596,6 @@ msgstr "التحقق من صحة القاعدة المطبقة" msgid "Validate Components and Quantities Per BOM" msgstr "التحقق من صحة المكونات والكميات لكل قائمة مواد" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "التحقق من الكمية المستهلكة (وفقًا لقائمة المواد)" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58599,6 +58619,12 @@ msgstr "التحقق من صحة قاعدة التسعير" msgid "Validate Stock on Save" msgstr "تحقق من صحة المخزون عند الحفظ" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58705,11 +58731,11 @@ msgstr "معدل التقييم مفقود" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "معدل التقييم للعنصر {0} ، مطلوب لإجراء إدخالات محاسبية لـ {1} {2}." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "معدل التقييم إلزامي إذا ادخلت قيمة مبدئية للمخزون\\n
\\nValuation Rate is mandatory if Opening Stock entered" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "معدل التقييم مطلوب للبند {0} في الصف {1}" @@ -58719,7 +58745,7 @@ msgstr "معدل التقييم مطلوب للبند {0} في الصف {1}" msgid "Valuation and Total" msgstr "التقييم والمجموع" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "تم تحديد معدل تقييم العناصر التي يقدمها العملاء عند الصفر." @@ -58869,7 +58895,7 @@ msgstr "التباين ({})" msgid "Variant" msgstr "مختلف" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "خطأ في سمة المتغير" @@ -58888,7 +58914,7 @@ msgstr "المتغير BOM" msgid "Variant Based On" msgstr "البديل القائم على" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "لا يمكن تغيير المتغير بناءً على" @@ -58906,7 +58932,7 @@ msgstr "الحقل البديل" msgid "Variant Item" msgstr "عنصر متغير" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "العناصر المتغيرة" @@ -59287,7 +59313,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59327,7 +59353,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "نوع القسيمة الفرعي" @@ -59359,7 +59385,7 @@ msgstr "نوع القسيمة الفرعي" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59594,7 +59620,7 @@ msgstr "المستودع {0} غير موجود" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "لا يُسمح باستخدام المستودع {0} في أمر البيع {1}، بل يجب أن يكون {2}" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "المستودع {0} غير مرتبط بأي حساب، يرجى ذكر الحساب في سجل المستودع أو تعيين حساب المخزون الافتراضي في الشركة {1}." @@ -59641,7 +59667,7 @@ msgstr "المستودعات مع الصفقة الحالية لا يمكن أن #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59697,6 +59723,12 @@ msgstr "تحذير لطلب جديد للاقتباسات" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "تحذير - الصف {0}: ساعات الفوترة أكثر من الساعات الفعلية" @@ -59880,7 +59912,7 @@ msgstr "موقع المواصفات" msgid "Website:" msgstr "الموقع:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60254,7 +60286,7 @@ msgstr "المواد المستهلكة في أمر العمل" msgid "Work Order Item" msgstr "بند أمر العمل" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60316,11 +60348,11 @@ msgstr "أمر العمل لم يتم إنشاؤه" msgid "Work Order {0} created" msgstr "تم إنشاء أمر العمل {0}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "أمر العمل {0}: لم يتم العثور على بطاقة المهمة للعملية {1}" @@ -60636,11 +60668,11 @@ msgstr "اسم العام" msgid "Year Start Date" msgstr "تاريخ بدء العام" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60693,7 +60725,7 @@ msgstr "يمكنك أيضا نسخ - لصق هذا الرابط في متصفح msgid "You can also set default CWIP account in Company {}" msgstr "يمكنك أيضًا تعيين حساب CWIP الافتراضي في الشركة {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60847,6 +60879,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60875,7 +60911,7 @@ msgstr "لقد قمت بتفعيل {0} و {1} في {2}. قد يؤدي هذا إ msgid "You have entered a duplicate Delivery Note on Row" msgstr "لقد أدخلت إشعار تسليم مكرر في الصف" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60883,7 +60919,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "يجب عليك تمكين الطلب التلقائي في إعدادات الأسهم للحفاظ على مستويات إعادة الطلب." @@ -60954,8 +60990,11 @@ msgstr "معدل صفري" msgid "Zero quantity" msgstr "الكمية صفر" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61067,7 +61106,7 @@ msgstr "exchangerate.host" msgid "fieldname" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61285,6 +61324,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "فريدة مثل SAVE20 لاستخدامها للحصول على الخصم" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "" @@ -61343,7 +61386,8 @@ msgstr "{0} القسيمة المستخدمة هي {1}. الكمية المسم msgid "{0} Digest" msgstr "{0} الملخص" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61363,7 +61407,7 @@ msgstr "{0} العمليات: {1}" msgid "{0} Request for {1}" msgstr "{0} طلب {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} يعتمد الاحتفاظ بالعينة على الدُفعة ، يُرجى تحديد "رقم الدُفعة" للاحتفاظ بعينة من العنصر" @@ -61476,7 +61520,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} ادخل مرتين في ضريبة البند" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "تم إدخال {0} مرتين {1} في ضرائب الأصناف" @@ -61644,7 +61688,7 @@ msgstr "{0} المعلمة غير صالحة" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} لا يمكن فلترة المدفوعات المدخلة {1}" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "يتم استلام كمية {0} من الصنف {1} في المستودع {2} بسعة {3}." @@ -61657,7 +61701,7 @@ msgstr "{0} إلى {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "تم حجز الوحدات {0} للصنف {1} في المستودع {2}، يرجى إلغاء حجزها لـ {3} في عملية مطابقة المخزون." @@ -61859,7 +61903,7 @@ msgstr "{0} {1}: الحساب {2} غير فعال \\n
\\n{0} {1}: Account {2} msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: قيد محاسبي ل {2} يمكن ان يتم فقط بالعملة : {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: مركز التكلفة إلزامي للبند {2}" @@ -61945,23 +61989,23 @@ msgstr "{0}: {1} غير موجود" msgid "{0}: {1} is a group account." msgstr "{0}: {1} هو حساب جماعي." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} يجب أن يكون أقل من {2}" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "{count} الأصول التي تم إنشاؤها لـ {item_code}" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} تم إلغائه أو مغلق." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "لا يمكن أن يكون حجم العينة {item_name}({sample_size}) أكبر من الكمية المقبولة ({accepted_quantity})" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "{ref_doctype} {ref_name} هو {status}." diff --git a/erpnext/locale/bs.po b/erpnext/locale/bs.po index 47b514f7f95..83324ec5e38 100644 --- a/erpnext/locale/bs.po +++ b/erpnext/locale/bs.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-11 18:40\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:21\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Bosnian\n" "MIME-Version: 1.0\n" @@ -100,15 +100,15 @@ msgstr " Podsklop" msgid " Summary" msgstr " Sažetak" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"Klijent Dostavljeni Artikal\" ne može biti Nabavni Artikal" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"Klijent Dostavljen Artikal\" ne može imati Stopu Vrednovanja" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "Ne može se poništiti izbor opcije \"Fiksna Imovina\", jer postoji zapis imovine naspram artikla" @@ -307,7 +307,7 @@ msgstr "'Od datuma' je obavezan" msgid "'From Date' must be after 'To Date'" msgstr "'Od datuma' mora biti nakon 'Do datuma'" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "'Ima Serijski Broj' ne može biti 'Da' za artikal koji nije na zalihama" @@ -343,7 +343,7 @@ msgstr "'Ažuriraj Zalihe' se ne može provjeriti jer se artikli ne isporučuju msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "'Ažuriraj Zalihe' ne može se provjeriti za prodaju osnovne Imovine" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "Račun '{0}' već koristi {1}. Koristite drugi račun." @@ -1098,7 +1098,7 @@ msgstr "Vozač mora biti naveden da bi se podnijelo." msgid "A logical Warehouse against which stock entries are made." msgstr "Logičko skladište naspram kojeg se vrše knjiženja zaliha." -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "Došlo je do konflikta imenovanja serije prilikom kreiranja serijskih brojeva. Molimo vas da promijenite imenovanje serije za artikal {0}." @@ -1310,7 +1310,7 @@ msgstr "Pristupni ključ je potreban za davaoca usluga: {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "Prema CEFACT/ICG/2010/IC013 ili CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "Prema Sastavnici {0}, artikal '{1}' nedostaje u unosu zaliha." @@ -1980,8 +1980,8 @@ msgstr "Knjigovodstveni Unosi" msgid "Accounting Entry for Asset" msgstr "Knjigovodstveni Unos za Imovinu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "Knjigovodstveni Unos za Dokument Troškova Nabavke u Unosu Zaliha {0}" @@ -1989,7 +1989,7 @@ msgstr "Knjigovodstveni Unos za Dokument Troškova Nabavke u Unosu Zaliha {0}" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "Knjigovodstveni Unos verifikat troškova nabave za podizvođački račun {0}" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Knjigovodstveni Unos za Servis" @@ -2002,16 +2002,16 @@ msgstr "Knjigovodstveni Unos za Servis" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Knjigovodstveni Unos za Zalihe" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "Knjigovodstveni Unos za {0}" @@ -2309,12 +2309,6 @@ msgstr "Radnja ako nije podnesena Kontrola Kvaliteta" msgid "Action If Quality Inspection Is Rejected" msgstr "Radnja ako je Kontrola Kvaliteta odbijena" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "Radnja ako se Ista Cijena ne Održava" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "Radnja je Pokrenuta" @@ -2373,6 +2367,12 @@ msgstr "Radnja ako je godišnji proračun prekoračen kumulativnim troškom" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "Radnja ako se ista stopa ne održava tokom cijele interne transakcije" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "Radnja ako se ne održava ista stopa" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2640,7 +2640,7 @@ msgstr "Stvarno vrijeme u satima (preko rasporeda vremena)" msgid "Actual qty in stock" msgstr "Stvarna Količina na Zalihama" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "Stvarni tip PDV-a ne može se uključiti u cijenu Artikla u redu {0}" @@ -2654,7 +2654,7 @@ msgstr "Namjenska Količina" msgid "Add / Edit Prices" msgstr "Dodaj / Uredi cijene" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "Dodaj Kolone u Valuti Transakcije" @@ -2808,7 +2808,7 @@ msgstr "Dodaj Serijski / Šaržni Broj" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "Dodaj Serijski / Šaržni Broj (Odbijena Količina)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "Dodaj Prefiks Serije Imenovanja" @@ -3053,7 +3053,7 @@ msgstr "Iznos dodatnog popusta" msgid "Additional Discount Amount (Company Currency)" msgstr "Dodatni iznos popusta (Valuta Poduzeća)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "Dodatni Iznos Popusta ({discount_amount}) ne može premašiti ukupan iznos prije takvog popusta ({total_before_discount})" @@ -3342,7 +3342,7 @@ msgstr "Prilagodi Količinu" msgid "Adjustment Against" msgstr "Usaglašavanje Naspram" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "Usklađivanje na osnovu stope fakture nabavke" @@ -3455,7 +3455,7 @@ msgstr "Tip Verifikata Predujma" msgid "Advance amount" msgstr "Iznos Predujma" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Iznos Predujma ne može biti veći od {0} {1}" @@ -3524,7 +3524,7 @@ msgstr "Naspram" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Naspram Računa" @@ -3642,7 +3642,7 @@ msgstr "Naspram Fakture Dobavljača {0}" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "Naspram Verifikata" @@ -3666,7 +3666,7 @@ msgstr "Naspram Verifikata Broj" #: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "Naspram Verifikata Tipa" @@ -3947,7 +3947,7 @@ msgstr "Sva komunikacija uključujući i iznad ovoga bit će premještena u novi msgid "All items are already requested" msgstr "Svi artikli su već traženi" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "Svi Artikli su već Fakturisani/Vraćeni" @@ -3955,7 +3955,7 @@ msgstr "Svi Artikli su već Fakturisani/Vraćeni" msgid "All items have already been received" msgstr "Svi Artikli su već primljeni" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Svi Artikli su već prenesen za ovaj Radni Nalog." @@ -4004,7 +4004,7 @@ msgstr "Dodijeli" msgid "Allocate Advances Automatically (FIFO)" msgstr "Automatski Dodjeli Predujam (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Alociraj iznos uplate" @@ -4014,7 +4014,7 @@ msgstr "Alociraj iznos uplate" msgid "Allocate Payment Based On Payment Terms" msgstr "Dodjeli Plaćanje na osnovu Uslova Plaćanja" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "Dodijeli zahtjev za plaćanje" @@ -4044,7 +4044,7 @@ msgstr "Dodjeljeno" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4165,15 +4165,15 @@ msgstr "Dozvoli u Povratima" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "Dozvoli interne transfere po tržišnoj cijeni" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "Dozvoli da se Artikal doda više puta u Transakciji" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "Dozvolite da se artikal doda više puta u transakciji" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "Dozvoli dodavanje artikla više puta u transakciji" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4202,12 +4202,6 @@ msgstr "Dozvoli Negativne Zalihe" msgid "Allow Negative Stock for Batch" msgstr "Dozvoli negativne zalihe za Šaržu" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "Dozvolite negativne cijene za Artikle" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4420,8 +4414,11 @@ msgstr "Dozvoli viševalutne fakture naspram računa jedne stranke " msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "Dozvoli više Nabavnih Naloga za jedan Nabavni Nalog klijenta" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "Dozvoli negativne cijene za artikle" @@ -4513,7 +4510,7 @@ msgstr "Dozvoljena Transakcija sa" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "Dozvoljene primarne uloge su 'Klijent' i 'Dobavljač'. Molimo odaberite samo jednu od ovih uloga." -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "Dozvoljeni specijalni znakovi su '/' i '-'" @@ -4710,7 +4707,7 @@ msgstr "Uvijek Pitaj" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4740,7 +4737,6 @@ msgstr "Uvijek Pitaj" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4910,10 +4906,6 @@ msgstr "Iznos nije usklađen s odabranom transakcijom" msgid "Amount in Account Currency" msgstr "Iznos u Valuti Računa" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "Iznos U Riječima" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5533,7 +5525,7 @@ msgstr "Pošto je polje {0} omogućeno, polje {1} je obavezno." msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "Pošto je polje {0} omogućeno, vrijednost polja {1} bi trebala biti veća od 1." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "Pošto postoje postojeće podnešene transakcije naspram artikla {0}, ne možete promijeniti vrijednost {1}." @@ -5683,7 +5675,7 @@ msgstr "Račun kategorije imovine" msgid "Asset Category Name" msgstr "Naziv kategorije imovine" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "Kategorija Imovine je obavezna za Artikal Fiksne Imovine" @@ -6079,7 +6071,7 @@ msgstr "Imovina {0} nije podnešena. Podnesi imovinu prije nastavka." msgid "Asset {0} must be submitted" msgstr "Imovina {0} mora biti podnešena" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "Imovina {assets_link} kreirana za {item_code}" @@ -6117,11 +6109,11 @@ msgstr "Imovina" msgid "Assets Setup" msgstr "Postavljanje Imovine" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "Imovina nije kreirana za {item_code}. Morat ćete kreirati Imovinu ručno." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "Imovina {assets_link} kreirana za {item_code}" @@ -6194,7 +6186,7 @@ msgstr "Najmanje jedan artikal sirovine mora biti prisutan u unosu zaliha za tip msgid "At least one row is required for a financial report template" msgstr "Za šablon finansijskog izvještaja potreban je barem jedan red" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "Najmanje jedno skladište je obavezno" @@ -6226,7 +6218,7 @@ msgstr "Red {0}: Količina je obavezna za Šaržu {1}" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "Red {0}: Serijski Broj je obavezan za Artikal {1}" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "Red {0}: Serijski i Šaržni Paket {1} je već kreiran. Molimo uklonite vrijednosti iz polja serijski broj ili šarža." @@ -6290,7 +6282,11 @@ msgstr "Naziv Atributa" msgid "Attribute Value" msgstr "Vrijednost Atributa" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "Vrijednost atributa {0} nije važeća za odabrani atribut {1}." + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "Tabela Atributa je obavezna" @@ -6298,11 +6294,19 @@ msgstr "Tabela Atributa je obavezna" msgid "Attribute value: {0} must appear only once" msgstr "Vrijednost Atributa: {0} se mora pojaviti samo jednom" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "Atribut {0} je onemogućen." + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "Atribut {0} nije valjan za odabrani šablon." + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "Atribut {0} izabran više puta u Tabeli Atributa" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Atributi" @@ -6362,24 +6366,12 @@ msgstr "Ovlaštena Vrijednost" msgid "Auto Create Exchange Rate Revaluation" msgstr "Automatsko Kreiranje Revalorizacije Deviznog Kursa" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "Automatsko Kreiranje Nabavnog Računa" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "Automatsko Kreiranje Serijskog i Šarža paketa za Dostavu" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "Automatsko Kreiranje Podizvođačkom Naloga" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6498,6 +6490,18 @@ msgstr "Greška Automatskog Stvaranja Korisnika" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "Automatski zatvori Odgovoran na Mogućnost nakon broja gore navedenih dana" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "Automatsko Kreiranje Nabavnog Računa" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "Automatsko Kreiranje Podizvođačkom Naloga" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6715,7 +6719,7 @@ msgstr "Datum Dostupnosti za Upotrebu" msgid "Available for use date is required" msgstr "Datum dostupnosti za upotrebu je obavezan" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "Dostupna količina je {0}, potrebno vam je {1}" @@ -6814,7 +6818,7 @@ msgstr "Polovi Kjnigovodstveni Izvod" msgid "BIN Qty" msgstr "Spremnička Količina" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7087,7 +7091,7 @@ msgstr "Artikal Web Stranice Sastavnice" msgid "BOM Website Operation" msgstr "Operacija Web Stranice Sastavnice" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "Sastavnica i Količina Gotovog Proizvoda su obavezni za Rastavljanje" @@ -7178,7 +7182,7 @@ msgstr "Retroaktivno Preuzmi Sirovine iz Skladišta za Posao U Toku" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" +msgid "Backflush raw materials of subcontract based on" msgstr "Retroaktivno Preuzmi Sirovina od Podizvođača na osnovu" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' @@ -7199,7 +7203,7 @@ msgstr "Stanje" msgid "Balance (Dr - Cr)" msgstr "Stanje (Dr - Cr)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Stanje ({0})" @@ -7463,18 +7467,18 @@ msgstr "Bankovne Provizije, Plata, itd." #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/workspace_sidebar/banking.json msgid "Bank Clearance" -msgstr "Bankarsko Odobrenje" +msgstr "Bankovno Odobrenje" #. Name of a DocType #: erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json msgid "Bank Clearance Detail" -msgstr "Detalji Bankarskog Odobrenja" +msgstr "Detalji Bankovnog Odobrenja" #. Name of a report #: banking/src/pages/BankReconciliation.tsx:119 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.json msgid "Bank Clearance Summary" -msgstr "Sažetak Bankarskog Odobrenja" +msgstr "Sažetak Bankovnog Odobrenja" #. Label of the credit_balance (Check) field in DocType 'Email Digest' #: erpnext/setup/doctype/email_digest/email_digest.json @@ -7730,11 +7734,11 @@ msgstr "Bankarstvo" msgid "Barcode Type" msgstr "Barkod Tip" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "Barkod {0} se već koristi za artikal {1}" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "Barkod {0} nije važeći {1} kod" @@ -8101,12 +8105,12 @@ msgstr "Šarža {0} i Skladište" msgid "Batch {0} is not available in warehouse {1}" msgstr "Šarža {0} nije dostupna u skladištu {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "Šarža {0} artikla {1} je istekla." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "Šarža {0} artikla {1} je onemogućena." @@ -8179,7 +8183,7 @@ msgstr "Broj Fakture" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" +msgid "Bill for rejected quantity in Purchase Invoice" msgstr "Faktura za odbijenu količinu na Kupovnoj Fakturi" #. Label of a Card Break in the Manufacturing Workspace @@ -8520,8 +8524,11 @@ msgstr "Ugovorni Nalog Artikal" msgid "Blanket Order Rate" msgstr "Cijena po Ugovornom Nalogu" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "Okvirni Nalozi" @@ -9036,7 +9043,7 @@ msgstr "Nabava & Prodaja" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "Nabava se mora provjeriti ako je Primjenjivo za odabrano kao {0}" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "Prema standard postavkama, Ime dobavljača je postavljeno prema unesenom imenu dobavljača. Ako želite da dobavljači budu imenovani po Imenovanje Serije odaberi opciju 'Imenovanje Serije'." @@ -9401,7 +9408,7 @@ msgstr "Ne može se filtrirati na osnovu broja verifikata, ako je grupiran prema msgid "Can only make payment against unbilled {0}" msgstr "Plaćanje se može izvršiti samo protiv nefakturisanog(e) {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9457,9 +9464,9 @@ msgstr "Nije moguće promijeniti Postavke Računa Inventara" msgid "Cannot Create Return" msgstr "Nije moguće Kreirati Povrat" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "Nije moguće spojiti" @@ -9487,7 +9494,7 @@ msgstr "Nije moguće izmijeniti {0} {1}, umjesto toga kreirajte novi." msgid "Cannot apply TDS against multiple parties in one entry" msgstr "Ne može se primijeniti TDS naspram više strana u jednom unosu" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "Ne može biti artikal fiksne imovine jer je kreiran Registar Zaliha." @@ -9523,7 +9530,7 @@ msgstr "Nije moguće otkazati ovaj Unos Proizvodnih Zaliha jer količina proizve msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "Ne može se poništiti ovaj dokument jer je povezan s podnesenim Prilagođavanjem Vrijednosti Imovine {0}. Poništi Prilagođavanje Vrijednosti Imovine da biste nastavili." -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "Ne može se poništiti ovaj dokument jer je povezan sa dostavljenom imovinom {asset_link}. Otkaži imovinu da nastavite." @@ -9531,7 +9538,7 @@ msgstr "Ne može se poništiti ovaj dokument jer je povezan sa dostavljenom imov msgid "Cannot cancel transaction for Completed Work Order." msgstr "Nije moguće otkazati transakciju za Završeni Radni Nalog." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "Nije moguće promijeniti atribute nakon transakcije zaliha. Napravi novi artikal i prebaci zalihe na novi artikal" @@ -9543,7 +9550,7 @@ msgstr "Nije moguće promijeniti tip referentnog dokumenta." msgid "Cannot change Service Stop Date for item in row {0}" msgstr "Nije moguće promijeniti datum zaustavljanja servisa za artikal u redu {0}" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "Ne mogu promijeniti svojstva varijante nakon transakcije zaliha. Morat ćete napraviti novi artikal da biste to učinili." @@ -9571,11 +9578,11 @@ msgstr "Nije moguće pretvoriti u Grupu jer je odabran Tip Računa." msgid "Cannot covert to Group because Account Type is selected." msgstr "Nije moguće pretvoriti u Grupu jer je odabran Tip Računa." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "Nije moguće kreirati Unose Rezervisanja Zaliha za buduće datume Nabavnih Računa." -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "Nije moguće kreirati Listu Odabira za Prodajni Nalog {0} jer ima rezervisane zalihe. Poništi rezervacije zaliha kako biste kreirali Listu Odabira." @@ -9601,7 +9608,7 @@ msgstr "Ne može se proglasiti izgubljenim, jer je Ponuda napravljena." msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "Ne može se odbiti kada je kategorija za 'Vrednovanje' ili 'Vrednovanje i Ukupno'" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "Nije moguće izbrisati red Dobitka/Gubitka Deviznog Kursa" @@ -9638,7 +9645,7 @@ msgstr "Ne može se onemogućiti {0} jer to može dovesti do netačne procjene v msgid "Cannot disassemble more than produced quantity." msgstr "Ne može se demontirati više od proizvedene količine." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "Ne može se rastaviti {0} količina u odnosu na unos na zalihi {1}. Samo {2} količina dostupna za rastavljanje." @@ -9646,8 +9653,8 @@ msgstr "Ne može se rastaviti {0} količina u odnosu na unos na zalihi {1}. Samo msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "Nije moguće omogućiti račun zaliha po artiklima, jer postoje postojeći unosi u glavnu knjigu zaliha za {0} sa računom zaliha po skladištu. Molimo vas da prvo otkažete transakcije zaliha i pokušate ponovo." -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "Nije moguće osigurati dostavu serijskim brojem jer je artikal {0} dodan sa i bez Osiguraj Dostavu Serijskim Brojem." @@ -9691,7 +9698,7 @@ msgstr "Ne može se primiti od klijenta naspram negativnog nepodmirenog" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "Ne može se smanjiti količina naručene ili nabavljene količine" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9709,8 +9716,8 @@ msgstr "Nije moguće preuzeti oznaku veze. Provjerite zapisnik grešaka za više msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "Nije moguće odabrati tip grupe \"Klijent Grupa\". Odaberi klijent grupu koja nije grupa." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9726,7 +9733,7 @@ msgstr "Ne može se postaviti kao Izgubljeno pošto je Prodajni Nalog napravljen msgid "Cannot set authorization on basis of Discount for {0}" msgstr "Nije moguće postaviti autorizaciju na osnovu Popusta za {0}" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "Nije moguće postaviti više Standard Artikal Postavki za poduzeće." @@ -10637,7 +10644,7 @@ msgstr "Zatvaranje (Cr)" msgid "Closing (Dr)" msgstr "Zatvaranje (Dr)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "Zatvaranje (Otvaranje + Ukupno)" @@ -11098,7 +11105,7 @@ msgstr "Poduzeća" #: 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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11380,7 +11387,7 @@ msgstr "Poduzeće" msgid "Company Abbreviation" msgstr "Skraćenica Poduzeća" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "Skraćenica Poduzeća (potrebno je instalirati Sistem)" @@ -11393,7 +11400,7 @@ msgstr "Skraćenica Poduzeća ne može imati više od 5 znakova" msgid "Company Account" msgstr "Račun Poduzeća" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "Račun poduzeća je obavezan" @@ -11569,7 +11576,7 @@ msgstr "Filter poduzeća nije postavljen!" msgid "Company is mandatory" msgstr "Poduzeće je obavezno" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "Poduzeće je obavezno za Račun Poduzeća" @@ -11840,7 +11847,7 @@ msgstr "Konfiguriraj Račune" msgid "Configure Accounts for Bank Entry" msgstr "Konfiguriši Račune za bankovni unos" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "Konfiguriši Bankovne Račune" @@ -11853,7 +11860,9 @@ msgstr "Konfiguriši Kontni Plan" msgid "Configure Product Assembly" msgstr "Konfiguriši Proizvodnju Artikla" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "Konfiguriši Seriju Imenovanja" @@ -11871,13 +11880,13 @@ msgstr "Konfiguriši pravila kako biste uštedjeli vrijeme prilikom usklađivanj msgid "Configure settings for the banking module" msgstr "Konfiguriši postavke za bankarski modul" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "Konfiguriši akciju za zaustavljanje transakcije ili samo upozorite ako se ista stopa marže ne održava." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "Konfiguriši standard Cijenovnik prilikom kreiranja nove transakcije Kupovine. Cijene artikala se preuzimaju iz ovog Cijenovnika." @@ -12055,7 +12064,7 @@ msgstr "Konzumirane Komponente" msgid "Consumed" msgstr "Potrošeno" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "Potrošeni Iznos" @@ -12099,7 +12108,7 @@ msgstr "Trošak Potrošenih Artikala" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12272,10 +12281,6 @@ msgstr "Kontakt Osoba ne pripada {0}" msgid "Contact:" msgstr "Kontakt:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Kontakt: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12453,7 +12458,7 @@ msgstr "Faktor Pretvaranja" msgid "Conversion Rate" msgstr "Stopa Pretvaranja" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "Faktor pretvaranja za standard jedinicu mora biti 1 u redu {0}" @@ -12725,7 +12730,7 @@ msgstr "Raspodjela Troškova / Gubitak Procesa" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12820,7 +12825,7 @@ msgid "Cost Center is required" msgstr "Centar Troškova je obavezan" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "Centar Troškova je obavezan u redu {0} u tabeli PDV za tip {1}" @@ -13158,7 +13163,7 @@ msgstr "Kreiraj Gotove Proizvode" msgid "Create Grouped Asset" msgstr "Kreiraj Grupiranu Imovinu" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "Kreiraj Naloga Knjiženja za Inter Poduzeće" @@ -13531,7 +13536,7 @@ msgstr "Kreiraj {0} {1}?" msgid "Created By Migration" msgstr "Kreirano Migracijom" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "Kreirano {0} tablica bodova za {1} između:" @@ -13674,15 +13679,15 @@ msgstr "Kreiranje {0} nije uspjelo.\n" msgid "Credit" msgstr "Kredit" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "Kredit (Transakcija)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "Kredit ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "Kreditni Račun" @@ -13877,7 +13882,7 @@ msgstr "Koeficijent Obrta Povjerilaca" msgid "Creditors" msgstr "Povjerioci" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "Krediti" @@ -14175,7 +14180,7 @@ msgstr "Trenutni Serijski / Šarža Paket" msgid "Current Serial No" msgstr "Trenutni Serijski Broj" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "Trenutna Serija Imenovanja" @@ -14376,7 +14381,7 @@ msgstr "Prilagođeni Razdjelnici" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15149,7 +15154,7 @@ msgstr "Datumi za Obradu" msgid "Day Of Week" msgstr "Dan u Sedmici" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "Dan u mesecu" @@ -15265,11 +15270,11 @@ msgstr "Diler" msgid "Debit" msgstr "Debit" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "Debit (Transakcija)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "Debit ({0})" @@ -15279,7 +15284,7 @@ msgstr "Debit ({0})" msgid "Debit / Credit Note Posting Date" msgstr "Datum knjiženja Debitne / Kreditne Fakture" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "Debitni Račun" @@ -15390,7 +15395,7 @@ msgstr "Debit-Kredit je neusklađeno" msgid "Debit/Credit" msgstr "Debit/Kredit" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "Debiti" @@ -15532,7 +15537,7 @@ msgstr "Standard Raspon Starenja" msgid "Default BOM" msgstr "Standard Sastavnica" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "Standard Sastavnica ({0}) mora biti aktivna za ovaj artikal ili njegov šablon" @@ -15889,15 +15894,15 @@ msgstr "Standard Distrikt" msgid "Default Unit of Measure" msgstr "Standard Jedinica" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "Standard Jedinica za artikal {0} ne može se promijeniti direktno jer ste već izvršili neke transakcije sa drugom Jedinicom. Morate ili otkazati povezane dokumente ili kreirati novi artikal." -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "Standard Jedinica za artikal {0} ne može se promijeniti direktno jer ste već izvršili neke transakcije sa drugom Jedinicom. Morat ćete kreirati novi artikal da biste koristili drugu Jedinicu." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "Standard Jedinica za Varijantu '{0}' mora biti ista kao u Šablonu '{1}'" @@ -16198,7 +16203,7 @@ msgstr "Dostavi Sekundarne Artikle" msgid "Delivered" msgstr "Dostavljeno" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Dostavljeni Iznos" @@ -16248,8 +16253,8 @@ msgstr "Isporučeni Artikli za Fakturisanje" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16260,11 +16265,11 @@ msgstr "Dostavljena Količina" msgid "Delivered Qty (in Stock UOM)" msgstr "Isporučena količina (u Jedinici Zaliha)" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "Dostavna količina se ne može povećati za više od {0} za artikal {1}" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "Dostavna količina ne može se smanjiti za više od {0} za artikal {1}" @@ -16353,7 +16358,7 @@ msgstr "Upravitelj Dostave" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16878,7 +16883,7 @@ msgstr "Račun Razlike u Postavkama Artikla" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "Razlika u računu mora biti tip računa Imovine/Obaveza (Privremeno Otvaranje), budući da je ovaj unos zaliha početni unos" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "Račun razlike mora biti račun tipa Imovina/Obaveze, budući da je ovo usaglašavanje Zaliha Početni Unos" @@ -17042,11 +17047,9 @@ msgstr "Onemogući Kumulativni Prag" msgid "Disable In Words" msgstr "Onemogući U Riječima" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "Onemogući posljednju Nabavnu Cijenu" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "Onemogući Izračunavanje Početnog Stanja" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17087,6 +17090,12 @@ msgstr "Onemogući Serijski i Šaržni Odabirač" msgid "Disable Transaction Threshold" msgstr "Onemogući Transakcijski Prag" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "Onemogući posljednju Nabavnu Cijenu" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17143,7 +17152,7 @@ msgstr "Rastavi" msgid "Disassemble Order" msgstr "Nalog Rastavljanja" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "Količina rastavljenih dijelova ne može biti manja ili jednaka 0." @@ -17668,6 +17677,12 @@ msgstr "Ne koristi Šaržno Vrijednovanje" msgid "Do Not Use Batchwise Valuation" msgstr "Ne Koristi Šaržno Vrijednovanje" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "Ne preuzimaj nabavnu cijenu iz Serijskog Broja" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17758,9 +17773,12 @@ msgstr "Pretraga Dokumenata" msgid "Document Count" msgstr "Broj Dokumenata" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "Imenovanje Dokumenata" @@ -17778,6 +17796,10 @@ msgstr "Tip Dokumenta " msgid "Document Type already used as a dimension" msgstr "Tip dokumenta se već koristi kao dimenzija" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "Dokumentacija" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18082,7 +18104,7 @@ msgstr "Kopiraj Projekt sa Zadatcima" msgid "Duplicate Sales Invoices found" msgstr "Pronađeni su duplikati Prodajnih Faktura" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "Greška dupliciranog serijskog broja" @@ -18202,8 +18224,8 @@ msgstr "ID Korisnika" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "Sistem će napraviti unos u registar zaliha za svaku transakciju ovog artikla. Ostavite onemogućeno za artikle koji nisu na zalihi ili su usluge." -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18426,7 +18448,7 @@ msgstr "E-pošta" msgid "Email Sent to Supplier {0}" msgstr "E-pošta poslana Dobavljaču {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "Za kreiranje korisnika obaveza je e-pošta" @@ -18616,7 +18638,7 @@ msgstr "Korisnički ID Personala" msgid "Employee cannot report to himself." msgstr "Personal ne može da izvještava sam sebe." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "Potreban je Personal" @@ -18624,7 +18646,7 @@ msgstr "Potreban je Personal" msgid "Employee is required while issuing Asset {0}" msgstr "Personal je obavezan prilikom izdavanja Imovine {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "Personal {0} već ima povezanog korisnika" @@ -18637,7 +18659,7 @@ msgstr "Personal {0} ne pripada {1}" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "{0} trenutno radi na drugoj radnoj stanici. Dodijeli drugi personal." -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "Personal {0} nije pronađen" @@ -18680,7 +18702,7 @@ msgstr "Omogući Zakazivanje Termina" msgid "Enable Auto Email" msgstr "Omogući Automatsku e-poštu" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "Omogući Automatsku Ponovnu Naložbu" @@ -19286,7 +19308,7 @@ msgstr "Greška: Ova imovina već ima {0} periode amortizacije.\n" "\t\t\t\t\tDatum `početka amortizacije` mora biti najmanje {1} perioda nakon datuma `dostupno za upotrebu`.\n" "\t\t\t\t\tMolimo ispravite datume u skladu s tim." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "Greška: {0} je obavezno polje" @@ -19332,7 +19354,7 @@ msgstr "Ex Works" msgid "Example URL" msgstr "Primjer URL-a" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "Primjer povezanog dokumenta: {0}" @@ -19362,7 +19384,7 @@ msgstr "Primjer: Serijski Broj {0} je rezervisan u {1}." msgid "Exception Budget Approver Role" msgstr "Uloga Odobravatelja Izuzetka Proračuna" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "Prekomjerna Demontaža" @@ -19721,7 +19743,7 @@ msgstr "Očekivana vrijednost nakon korisnog vijeka trajanja" msgid "Expense" msgstr "Troškovi" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "Račun Rashoda/ Razlike ({0}) mora biti račun 'Dobitka ili Gubitka'" @@ -19769,7 +19791,7 @@ msgstr "Račun Rashoda/ Razlike ({0}) mora biti račun 'Dobitka ili Gubitka'" msgid "Expense Account" msgstr "Račun Troškova" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "Nedostaje Račun Troškova" @@ -20232,7 +20254,7 @@ msgstr "Filtriraj gdje je ukupna količina nula" msgid "Filter by Reference Date" msgstr "Filtriraj po Referentnom Datumu" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "Filtriraj po iznosu" @@ -20562,7 +20584,7 @@ msgstr "Skladište Gotovog Proizvoda" msgid "Finished Goods based Operating Cost" msgstr "Operativni troškovi zasnovani na Gotovom Proizvodu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "Gotov Proizvod {0} ne odgovara Radnom Nalogu {1}" @@ -20657,7 +20679,7 @@ msgstr "Fiskalni režim je obavezan, ljubazno postavite fiskalni režim za {0}" msgid "Fiscal Year" msgstr "Fiskalna Godina" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "Fiskalna Godina (potrebno je instalirati Sistem)" @@ -20721,7 +20743,7 @@ msgstr "Račun Fiksne Imovine" msgid "Fixed Asset Defaults" msgstr "Standard Postavke Fiksne Imovine" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "Artikal Fiksne Imovine mora biti artikal koja nije na zalihama." @@ -20871,7 +20893,7 @@ msgstr "Za Poduzeće" msgid "For Item" msgstr "Za Artikal" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "Za Artikal {0} ne može se primiti više od {1} količine naspram {2} {3}" @@ -20902,7 +20924,7 @@ msgstr "Za Cijenovnik" msgid "For Production" msgstr "Za Proizvodnju" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "Za Količinu (Proizvedena Količina) je obavezna" @@ -20986,6 +21008,12 @@ msgstr "Za artikal {0}, samo {1} imovina je kreirana ili povezana msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "Za artikal {0}, cijena mora biti pozitivan broj. Da biste omogućili negativne cijene, omogućite {1} u {2}" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "Za stare serijske brojeve, nemojte preuzimati nabvnu cijenu iz serijskog broja i izračunavajte je na osnovu nabavne transakcije" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "Za operaciju {0} u redu {1}, molimo dodajte sirovine ili postavite Sastavnicu naspram nje." @@ -21007,7 +21035,7 @@ msgstr "Za projekat - {0}, ažuriraj vaš status" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "Za projicirane i prognozirane količine, sistem će uzeti u obzir sva podređena skladišta unutar odabranog nadređenog skladišta." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "Za količinu {0} ne bi trebalo da bude veća od dozvoljene količine {1}" @@ -21016,7 +21044,7 @@ msgstr "Za količinu {0} ne bi trebalo da bude veća od dozvoljene količine {1} msgid "For reference" msgstr "Za Referencu" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "Za red {0} u {1}. Da biste uključili {2} u cijenu artikla, redovi {3} također moraju biti uključeni" @@ -21040,7 +21068,7 @@ msgstr "Za uslov 'Primijeni Pravilo na Drugo' polje {0} je obavezno" msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "Za praktičnost Klienta, ovi kodovi se mogu koristiti u formatima za ispisivanje kao što su Fakture i Dostavnice" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "Za artikal {0}, potrošena količina bi trebala biti {1} prema Sastavnici {2}." @@ -21049,7 +21077,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 "Da bi novi {0} stupio na snagu, želite li izbrisati trenutni {1}?" -#: erpnext/controllers/stock_controller.py:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "Za {0} nema raspoloživih zaliha za povrat u skladištu {1}." @@ -21662,7 +21690,7 @@ msgstr "G - D" msgid "GENERAL LEDGER" msgstr "KNJIGOVODSTVENI REGISTAR" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "Knjigovodstveni Račun" @@ -21674,7 +21702,7 @@ msgstr "Stanje Knjigovodstvenog Registra" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "Stavka Knjigovodstvenog Registra" @@ -22189,7 +22217,7 @@ msgstr "Proizvod u Tranzitu" msgid "Goods Transferred" msgstr "Proizvod je Prenesen" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "Proizvod je već primljen naspram unosa izlaza {0}" @@ -22372,7 +22400,7 @@ msgstr "Ukupni iznos mora odgovarati zbiru referenci plaćanja" msgid "Grant Commission" msgstr "Odobri Proviziju" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "Veće od Iznosa" @@ -23013,10 +23041,10 @@ msgstr "Koliko Često?" msgid "How many units of the final product this BOM makes." msgstr "Koliko jedinica konačnog proizvoda proizvodi ova Sastavnica." -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "Koliko često treba ažurirati Projekat od Ukupnih Troškova Nabave?" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23172,7 +23200,7 @@ msgstr "Ako je operacija podijeljena na podoperacije, one se mogu dodati ovdje." msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "Ako je prazno, u transakcijama će se uzeti u obzir Nadređeni Račun Skladišta ili Standard Skladište poduzeća" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23357,7 +23385,7 @@ msgstr "Ako je omogućeno, sistem će dozvoliti izbor jedinica u transakcijama p msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "Ako je omogućeno, sistem će dozvoliti korisnicima da uređuju sirovine i njihove količine u radnom nalogu. Sistem neće resetovati količine prema BOM-u ako ih je korisnik promijenio." -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23529,11 +23557,11 @@ msgstr "Ako je ovo nepoželjno, otkaži odgovarajući Unos Plaćanja." msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "Ako ovaj artikal ima varijante, onda se ne može odabrati u prodajnim nalozima itd." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "Ako je ova opcija konfigurirana kao 'Da', Sistem će vas spriječiti da kreirate Nabavnu Fakturu ili Račun bez prethodnog kreiranja Nabavnog Naloga. Ova konfiguracija se može zaobići za određenog dobavljača tako što će se omogućiti 'Dozvoli kreiranje Nabavne Fakture bez Nabavnog Naloga' u Postavkama Dobavljača." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "Ako je ova opcija konfigurirana kao 'Da', Sistem će vas spriječiti da kreirate Nabavnu Fakturu bez prethodnog kreiranja Nabavnog Računa. Ova konfiguracija se može poništiti za određenog dobavljača tako što će se omogućiti 'Dozvoli kreiranje Nabavne Fakture bez Nabavnog Računa' u Postavkama Dobavljača." @@ -23649,7 +23677,7 @@ msgstr "Zanemari Prazne Zalihe" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "Zanemari dnevnike revalorizacije deviznog kursa i rezultata" @@ -23701,7 +23729,7 @@ msgstr "Zanemari da je Pravilnik Cijena omogućen. Nije moguće primijeniti kod #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "Zanemari Sistemske Kreditne/Debitne Napomene" @@ -23744,7 +23772,7 @@ msgstr "Zanemari preklapanje vremena Radne Stanice" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "Zanemaruje naslijeđe polje 'Početno' u unosu Knjigovodstva koje omogućava dodavanje početnog stanja nakon što je sistem u upotrebi prilikom generiranja izvještaja" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "Slika u opisu je uklonjena. Da biste onemogućili ovo ponašanje, poništite oznaku \"{0}\" u {1}." @@ -23758,6 +23786,7 @@ msgid "Implementation Partner" msgstr "Partner Implementacije" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24111,7 +24140,7 @@ msgstr "Uključi standard Finansijski Registar Imovinu" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24365,7 +24394,7 @@ msgstr "Netačna količina stanja nakon transakcije" msgid "Incorrect Batch Consumed" msgstr "Potrošena Pogrešna Šarža" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "Netačno prijavljivanje (grupno) skladište za ponovnu narudžbu" @@ -24373,7 +24402,7 @@ msgstr "Netačno prijavljivanje (grupno) skladište za ponovnu narudžbu" msgid "Incorrect Company" msgstr "Pogrešno Poduzeće" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "Netačna Količina Komponenti" @@ -24583,14 +24612,14 @@ msgstr "Pokrenut" msgid "Inspected By" msgstr "Inspektor" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "Inspekcija Odbijena" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "Inspekcija Obavezna" @@ -24607,7 +24636,7 @@ msgstr "Inspekcija Obavezna prije Dostave" msgid "Inspection Required before Purchase" msgstr "Inspekcija Obavezna prije Nabave" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "Podnošenje Kontrole" @@ -24689,8 +24718,8 @@ msgstr "Nedovoljne Dozvole" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "Nedovoljne Zalihe" @@ -24910,7 +24939,7 @@ msgstr "Interni Prenosi" msgid "Internal Work History" msgstr "Interna Radna Istorija" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "Interni prenosi se mogu vršiti samo u standard valuti poduzeća" @@ -25003,7 +25032,7 @@ msgstr "Nevažeći Datum Dostave" msgid "Invalid Discount" msgstr "Nevažeći Popust" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "Nevažeći Iznos Popusta" @@ -25033,7 +25062,7 @@ msgstr "Nevažeća Grupa po" msgid "Invalid Item" msgstr "Nevažeći Artikal" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "Nevažeće Standard Postavke Artikla" @@ -25119,12 +25148,12 @@ msgstr "Nevažeći Raspored" msgid "Invalid Selling Price" msgstr "Nevažeća Prodajna Cijena" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "Nevažeći Serijski i Šaržni Paket" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "Nevažeće izvorno i ciljno skladište" @@ -25161,7 +25190,7 @@ msgstr "Nevažeća formula filtera. Molimo provjerite sintaksu." msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "Nevažeći izgubljeni razlog {0}, kreiraj novi izgubljeni razlog" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Nevažeća serija imenovanja (. nedostaje) za {0}" @@ -25290,7 +25319,6 @@ msgstr "Otkazivanje Fakture" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "Datum Fakture" @@ -25311,10 +25339,6 @@ msgstr "Pogreška Odabira Faktura Tipa Dokumenta" msgid "Invoice Grand Total" msgstr "Ukupni Iznos Fakture" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "Faktura" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25836,12 +25860,12 @@ msgstr "Je Fantomski Artikal" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" msgstr "Da li je Nabavni Nalog Obavezan za kreiranje Nabavne Fakture i Nabavnog Računa?" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" msgstr "Da li je Nabavni Račun obavezan za kreiranje Nabavne Fakture?" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' @@ -26114,7 +26138,7 @@ msgstr "Slučajevi" msgid "Issuing Date" msgstr "Datum Izdavanja" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "Može potrajati i do nekoliko sati da tačne vrijednosti zaliha budu vidljive nakon spajanja artikala." @@ -26184,7 +26208,7 @@ msgstr "Kurzivni tekst za međuzbirove ili napomene" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26231,6 +26255,7 @@ msgstr "Kurzivni tekst za međuzbirove ili napomene" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26246,7 +26271,6 @@ msgstr "Kurzivni tekst za međuzbirove ili napomene" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -27010,6 +27034,7 @@ msgstr "Proizvođač Artikla" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -27020,7 +27045,6 @@ msgstr "Proizvođač Artikla" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27280,11 +27304,11 @@ msgstr "Postavke Varijante Artikla" msgid "Item Variant {0} already exists with same attributes" msgstr "Varijanta Artikla {0} već postoji sa istim atributima" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "Varijante Artikla Ažurirane" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "Omogućeno je ponovno knjiženje Artikala na osnovi Skladišta." @@ -27323,6 +27347,15 @@ msgstr "Specifikacija Artikla Web Stranice" msgid "Item Weight Details" msgstr "Detalji Težine Artikla" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "Potrošnja po Artiklima" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27352,7 +27385,7 @@ msgstr "PDV Detalji po Artiklu" msgid "Item Wise Tax Details" msgstr "PDV Detalji po Artiklu" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "PDV Detalji po Artiklu nisu usklađeni se s PDV i Naknadama u sljedećim redovima:" @@ -27372,11 +27405,11 @@ msgstr "Artikal i Skladište" msgid "Item and Warranty Details" msgstr "Detalji Artikla i Garancija" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "Artikal za red {0} ne odgovara Materijalnom Nalogu" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "Artikal ima Varijante." @@ -27406,7 +27439,7 @@ msgstr "Artikal Operacija" msgid "Item qty can not be updated as raw materials are already processed." msgstr "Količina artikla se ne može ažurirati jer su sirovine već obrađene." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "Cijena Artikla je ažurirana na nulu jer je Dozvoli Nultu Stopu Vrednovanja označena za artikal {0}" @@ -27425,10 +27458,14 @@ msgstr "Stopa vrednovanja artikla se preračunava s obzirom na iznos verifikata msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "Ponovno knjiženje vrijednosti artikla je u toku. Izvještaj može prikazati netačnu procjenu artikla." -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "Varijanta Artikla {0} postoji sa istim atributima" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "Artikal s nazivom {0} nije pronađena u Nalogu Nabave" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "Artikal {0} dodan je više puta pod isti nadređeni artikal {1} u redovima {2} i {3}" @@ -27442,7 +27479,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "Artikal {0} se nemože naručiti više od {1} u odnosu na Ugovorni Nalog {2}." #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "Artikal {0} ne postoji" @@ -27450,7 +27487,7 @@ msgstr "Artikal {0} ne postoji" msgid "Item {0} does not exist in the system or has expired" msgstr "Artikal {0} ne postoji u sistemu ili je istekao" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "Artikal {0} ne postoji." @@ -27466,15 +27503,15 @@ msgstr "Artikal {0} je već vraćen" msgid "Item {0} has been disabled" msgstr "Artikal {0} je onemogućen" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "Artikal {0} nema serijski broj. Samo serijski artikli mogu imati dostavu na osnovu serijskog broja" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "Artikal {0} nema promjena u isporučenoj količini. Molimo vas da poništite odabir reda ako ne želite ažurirati njegovu količinu." -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "Artikal {0} je dosego kraj svog vijeka trajanja {1}" @@ -27486,19 +27523,23 @@ msgstr "Artikal {0} zanemaren jer nije artikal na zalihama" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "Artikal {0} je već rezervisan/dostavljen naspram Prodajnog Naloga {1}." -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "Artikal {0} je otkazan" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "Artikal {0} je onemogućen" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "Artikal {0} nije artikl za direktno slanje. Samo artikli za direktno slanje mogu imati ažuriranu dostavnu količinu." + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "Artikal {0} nije serijalizirani Artikal" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "Artikal {0} nije artikal na zalihama" @@ -27506,7 +27547,11 @@ msgstr "Artikal {0} nije artikal na zalihama" msgid "Item {0} is not a subcontracted item" msgstr "Artikal {0} nije podizvođački artikal" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "Artikal {0} nije šablon artikal." + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "Artikal {0} nije aktivan ili je dostignut kraj životnog vijeka" @@ -27522,7 +27567,7 @@ msgstr "Artikal {0} mora biti artikal koji nije na zalihama" msgid "Item {0} must be a non-stock item" msgstr "Artikal {0} mora biti artikal koji nije na zalihama" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "Artikal {0} nije pronađen u tabeli 'Dostavljene Sirovine' u {1} {2}" @@ -27538,7 +27583,7 @@ msgstr "Artikal {0}: Količina Naloga {1} ne može biti manja od minimalne koli msgid "Item {0}: {1} qty produced. " msgstr "Artikal {0}: {1} količina proizvedena. " -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "Atikal {} ne postoji." @@ -27648,7 +27693,7 @@ msgstr "Artikli Materijalnog Naloga Sirovina" msgid "Items not found." msgstr "Artikli nisu pronađeni." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "Cijena Artikala je ažurirana na nulu jer je Dozvoli Nultu Stopu Vrednovanja izabrana za sljedeće artikle: {0}" @@ -28281,7 +28326,7 @@ msgstr "Posljednje Skenirano Skladište" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "Zadnja transakcija zaliha za artikal {0} u skladištu {1} je bila {2}." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "Posljednja Sinhronizirana Transakcija" @@ -28559,7 +28604,7 @@ msgstr "Legenda" msgid "Length (cm)" msgstr "Dužina (cm)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "Manje od Iznosa" @@ -28700,7 +28745,7 @@ msgstr "Povezane Fakture" msgid "Linked Location" msgstr "Povezana Lokacija" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "Povezano sa podnešenim dokumentima" @@ -29095,11 +29140,6 @@ msgstr "Održavanje Imovine" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "Održavaj Istu Stopu tokom cijele interne transakcije" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "Održavaj Istu Stopu Marže tokom Ciklusa Nabave" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29111,6 +29151,11 @@ msgstr "Održavanje Zaliha" msgid "Maintain same rate throughout sales cycle" msgstr "Održavaj istu stopu marže tokom cijelog prodajnog ciklusa" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "Održavaj Istu Stopu Marže tokom Ciklusa Nabave" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29307,7 +29352,7 @@ msgid "Major/Optional Subjects" msgstr "Glavni/Izborni Predmeti" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29476,8 +29521,8 @@ msgstr "Obavezna Sekcija" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29536,8 +29581,8 @@ msgstr "Ručni unos se ne može kreirati! Onemogući automatski unos za odgođen #: 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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29686,7 +29731,7 @@ msgstr "Datum Proizvodnje" msgid "Manufacturing Manager" msgstr "Upravitelj Proizvodnje" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "Proizvodna Količina je obavezna" @@ -29962,7 +30007,7 @@ msgstr "Potrošnja Materijala" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "Potrošnja Materijala za Proizvodnju" @@ -30033,6 +30078,7 @@ msgstr "Priznanica Materijala" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30139,11 +30185,11 @@ msgstr "Artikal Plana Materijalnog Zahtjeva" msgid "Material Request Type" msgstr "Tip Materijalnog Naloga" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "Zahtjev za materijal je već kreiran za naručenu količinu" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "Materijalni Nalog nije kreiran, jer je količina Sirovine već dostupna." @@ -30258,7 +30304,7 @@ msgstr "Prenos Materijala za Proizvodnju" msgid "Material Transferred for Manufacturing" msgstr "Materijal Prenesen za Proizvodnju" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30387,11 +30433,11 @@ msgstr "Maksimalni Iznos Uplate" msgid "Maximum Producible Items" msgstr "Maksimalni broj Proizvodnih Artikala" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "Maksimalni broj Uzoraka - {0} može se zadržati za Šaržu {1} i Artikal {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "Maksimalni broj Uzoraka - {0} su već zadržani za Šaržu {1} i Artikal {2} u Šarži {3}." @@ -30835,11 +30881,11 @@ msgstr "Razno" msgid "Miscellaneous Expenses" msgstr "Razni Troškovi" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "Neusklađeno" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "Nedostaje" @@ -30877,7 +30923,7 @@ msgstr "Nedostajući Filteri" msgid "Missing Finance Book" msgstr "Nedostaje Finansijski Registar" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "Nedostaje Gotov Proizvod" @@ -30885,11 +30931,11 @@ msgstr "Nedostaje Gotov Proizvod" msgid "Missing Formula" msgstr "Nedostaje Formula" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "Nedostaje Artikal" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "Nedostajući Parametar" @@ -30933,10 +30979,6 @@ msgstr "Nedostaje vrijednost" msgid "Mixed Conditions" msgstr "Mješani Uvjeti" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "Mobilni Broj: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31205,7 +31247,7 @@ msgstr "Dostupno je više polja poduzeća: {0}. Molimo odaberite ručno." msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "Za datum {0} postoji više fiskalnih godina. Molimo postavite poduzeće u Fiskalnoj Godini" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "Više artikala se ne mogu označiti kao gotov proizvod" @@ -31284,27 +31326,20 @@ msgstr "Mjesto" msgid "Naming Series Prefix" msgstr "Prefiks Serije Imenovanja" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "Serija Imenovanja & Standard Cijene" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "Serija Imenovanje za {0}" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "Serija Imenovanja je obavezna" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "Opcije Imenovanja Serije" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "Serija Imenovanja ažurirana" @@ -31352,16 +31387,16 @@ msgstr "Treba Analiza" msgid "Negative Batch Report" msgstr "Izvještaj Negativne Šarže" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "Negativna Količina nije dozvoljena" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "Greška Negativne Zalihe" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "Negativna Stopa Vrednovanja nije dozvoljena" @@ -31975,7 +32010,7 @@ msgstr "Nije pronađen Kasa profil. Kreiraj novi Kasa Profil" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "Bez Dozvole" @@ -31988,7 +32023,7 @@ msgstr "Nabavni Nalozi nisu kreirani" msgid "No Records for these settings." msgstr "Nema zapisa za ove postavke." -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "Bez Odabira" @@ -32033,7 +32068,7 @@ msgstr "Nisu pronađene neusaglašene uplate za ovu stranku" msgid "No Work Orders were created" msgstr "Radni Nalozi nisu kreirani" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "Nema knjigovodstvenih unosa za sljedeća skladišta" @@ -32046,7 +32081,7 @@ msgstr "Nema konfiguriranih računa" msgid "No accounts found." msgstr "Nije pronađen nijedan račun." -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "Nije pronađena aktivna Sastavnica za artikal {0}. Ne može se osigurati isporuka na osnovu serijskog broja" @@ -32058,7 +32093,7 @@ msgstr "Nema dostupnih dodatnih polja" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "Nema raspoložive količine za rezervaciju artikla {0} u skladištu {1}" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "Nisu pronađeni bankovni računi" @@ -32066,7 +32101,7 @@ msgstr "Nisu pronađeni bankovni računi" msgid "No bank statements imported yet" msgstr "Još nema uvezenih bankovnih izvoda" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "Nisu pronađene bankovne transakcije" @@ -32160,7 +32195,7 @@ msgstr "Nema više podređenih na Lijevoj strani" msgid "No more children on Right" msgstr "Nema više podređenih na Desnoj strani" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "Nije definirana nijedna serija imenovanja" @@ -32335,7 +32370,7 @@ msgstr "Još nisu postavljena pravila" msgid "No stock available for this batch." msgstr "Nema dostupnih zaliha za ovu šaržu." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "Nisu kreirani unosi u glavnu knjigu zaliha. Molimo Vas da ispravno postavite količinu ili stopu vrednovanja za artikle i pokušate ponovno." @@ -32427,7 +32462,7 @@ msgstr "Ne Nule" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "Ne može se kreirati Šarža koja nije fantomska za artikal koja nije na zalihi {0}." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "Nijedan od artikala nema nikakve promjene u količini ili vrijednosti." @@ -32531,7 +32566,7 @@ msgstr "Nije ovlašteno jer {0} premašuje ograničenja" msgid "Not authorized to edit frozen Account {0}" msgstr "Nije ovlašten za uređivanje zamrznutog računa {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "Nije konfigurirano" @@ -32577,7 +32612,7 @@ msgstr "Napomena: Unos plaćanja neće biti kreiran jer 'Gotovina ili Bankovni R msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "Napomena: Ovaj Centar Troškova je Grupa. Ne mogu se izvršiti knjigovodstveni unosi naspram grupa." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "Napomena: Da biste spojili artikle, kreirajte zasebno Usaglašavanje Zaliha za stari artikal {0}" @@ -33054,7 +33089,7 @@ msgstr "Samo jedan od Uplate ili Isplate ne treba biti nula prilikom primjene Is msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "Samo jedna operacija može imati odabranu opciju 'Je li Gotov Proizvod' kada je omogućeno 'Praćenje Polugotovih Proizvoda'." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "Samo jedan {0} unos se može kreirati naspram Radnog Naloga {1}" @@ -33206,7 +33241,7 @@ msgstr "Otvorite dijalog postavki" msgid "Open {0} in a new tab" msgstr "Otvori {0} u novoj kartici" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "Početno" @@ -33365,16 +33400,16 @@ msgstr "Početne Fakture Prodaje su kreirane." #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Početna Zaliha" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "Unos početnih zaliha stvoren s nultom stopom vrednovanja: {0}" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "Početni Unos Zalha stvoren: {0}" @@ -33731,7 +33766,7 @@ msgstr "Opcija. Ova postavka će se koristiti za filtriranje u raznim transakcij msgid "Optional. Used with Financial Report Template" msgstr "Opcija. Koristi se s Šablonom Financijskog Izvještaja" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "Opcionalno, postavite broj cifara u nizu koristeći tačku (.) nakon koje slijede ljestve (#). Na primjer, '.####' znači da će niz imati četiri cifre. Standard vrijednost je pet cifara." @@ -33865,7 +33900,7 @@ msgstr "Naručena Količina" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "Nalozi" @@ -34073,7 +34108,7 @@ msgstr "Nepodmireno (Valuta Tvrtke)" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34131,7 +34166,7 @@ msgstr "Eksterni Nalog" msgid "Over Billing Allowance (%)" msgstr "Dozvola za prekomjerno Fakturisanje (%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "Dozvoljeni Iznos Prekoračenje Fakturisanja za Artikal Nabavnog Računa prekoračen {0} ({1}) za {2}%" @@ -34149,7 +34184,7 @@ msgstr "Dozvola za prekomjernu Dostavu/Primanje (%)" msgid "Over Picking Allowance" msgstr "Dozvola za prekomjernu Odabir" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "Preko Dostavnice" @@ -34392,7 +34427,6 @@ msgstr "Kasa Polje" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "Kasa Fakture" @@ -34663,7 +34697,7 @@ msgstr "Upakovani Artikal" msgid "Packed Items" msgstr "Upakovani Artikli" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "Upakovani Artikli se ne mogu interno prenositi" @@ -35111,7 +35145,7 @@ msgstr "Djelimično Primljeno" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35247,7 +35281,7 @@ msgstr "Dijelova na Milion" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35373,7 +35407,7 @@ msgstr "Šarža se ne poklapa" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35459,7 +35493,7 @@ msgstr "Specifični Artikal Stranke" #: 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:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35762,7 +35796,6 @@ msgstr "Unosi Plaćanja {0} nisu povezani" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -36020,7 +36053,7 @@ msgstr "Reference Uplate" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36099,10 +36132,6 @@ msgstr "Zahtjevi za plaćanje na osnovu rasporeda plaćanja ne mogu se kreirati msgid "Payment Schedules" msgstr "Rasporedi Plaćanja" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "Status Plaćanja" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37123,7 +37152,7 @@ msgstr "Postavi Prioritet" msgid "Please Set Supplier Group in Buying Settings." msgstr "Podstavi Grupu Dobavljača u Postavkama Nabave." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "Navedi Račun" @@ -37155,11 +37184,11 @@ msgstr "Dodaj Račun za Privremeno Otvaranje u Kontni Plan" msgid "Please add an account for the Bank Entry rule." msgstr "Dodaj račun za pravilo bankovnog unosa." -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "Dodaj barem jednu seriju imenovanja." -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "Molimo dodaj barem jedan Serijski Broj/Šaržni Broj" @@ -37179,7 +37208,7 @@ msgstr "Dodaj Račun Matičnom Poduzeću - {}" msgid "Please add {1} role to user {0}." msgstr "Dodaj {1} ulogu korisniku {0}." -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "Podesi količinu ili uredi {0} da nastavite." @@ -37286,7 +37315,7 @@ msgstr "Kreiraj nabavu iz interne prodaje ili samog dokumenta dostave" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "Kreiraj Nabavni Račun ili Nabavnu Fakturu za artikal {0}" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "Izbriši Artikal Paket {0}, prije spajanja {1} u {2}" @@ -37355,11 +37384,11 @@ msgstr "Unesi Račun za Kusur" msgid "Please enter Approving Role or Approving User" msgstr "Unesi Odobravajuća Uloga ili Odobravajućeg Korisnika" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "Molimo unesite broj Šarže" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "Unesi Centar Troškova" @@ -37371,7 +37400,7 @@ msgstr "Unesi Datum Dostave" msgid "Please enter Employee Id of this sales person" msgstr "Unesi Personal Id ovog Prodavača" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "Unesi Račun Troškova" @@ -37416,7 +37445,7 @@ msgstr "Unesi Referentni Datum" msgid "Please enter Root Type for account- {0}" msgstr "Unesi Kontnu Klasu za račun- {0}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "Molimo unesite Serijski broj" @@ -37493,7 +37522,7 @@ msgstr "Unesi prvi datum dostave" msgid "Please enter the phone number first" msgstr "Unesi broj telefona" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "Unesi {schedule_date}." @@ -37607,12 +37636,12 @@ msgstr "Sačuvaj Prodajni Nalog prije dodavanja rasporeda dostave." msgid "Please select Template Type to download template" msgstr "Odaberi Tip Šablona za preuzimanje šablona" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "Odaberi Primijeni Popust na" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "Odaberi Sastavnicu naspram Artikla {0}" @@ -37628,13 +37657,13 @@ msgstr "Odaberi Bankovni Račun" msgid "Please select Category first" msgstr "Odaberi Kategoriju" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "Odaberi Tip Naknade" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "Odaberi Poduzeće" @@ -37643,7 +37672,7 @@ msgstr "Odaberi Poduzeće" msgid "Please select Company and Posting Date to getting entries" msgstr "Odaberi Poduzeće i datum knjiženja da biste preuzeli unose" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "Odaberi Poduzeće" @@ -37692,7 +37721,7 @@ msgstr "Odaberi Račun Razlike za Periodični Unos" msgid "Please select Posting Date before selecting Party" msgstr "Odaberi Datum knjiženja prije odabira Stranke" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "Odaberi Datum Knjiženja" @@ -37700,11 +37729,11 @@ msgstr "Odaberi Datum Knjiženja" msgid "Please select Price List" msgstr "Odaberi Cjenovnik" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "Odaberi Količina naspram Artikla {0}" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "Odaberi Skladište za Zadržavanje Uzoraka u Postavkama Zaliha" @@ -37757,7 +37786,7 @@ msgstr "Odaberi Podizvođački Nabavni Nalog." msgid "Please select a Supplier" msgstr "Odaberi Dobavljača" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "Odaberi Skladište" @@ -37818,7 +37847,7 @@ msgstr "Odaberi red za kreiranje Unosa Ponovnog Knjiženje" msgid "Please select a supplier for fetching payments." msgstr "Odaberi Dobavljača za preuzimanje plaćanja." -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "Odaberi Transakciju." @@ -37838,7 +37867,7 @@ msgstr "Odaberite kod artikla prije postavljanja skladišta." msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "Odaberi barem jedan filter: Šifra Artikla, Šarža ili Serijski Broj." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "Molimo odaberite barem jedan artikal za ažuriranje isporučene količine." @@ -37945,7 +37974,7 @@ msgstr "Odaberi važeći tip dokumenta." msgid "Please select weekly off day" msgstr "Odaberi sedmične neradne dane" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "Odaberi {0}" @@ -38085,7 +38114,7 @@ msgstr "Postavi stvarnu potražnju ili prognozu prodaje kako biste generirali Iz msgid "Please set an Address on the Company '%s'" msgstr "Postavi Adresu Poduzeća '%s'" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "Postavi Račun Troškova u tabeli Artikala" @@ -38129,7 +38158,7 @@ msgstr "Postavi Standard Račun Troškova u {0}" msgid "Please set default UOM in Stock Settings" msgstr "Postavi Standard Jedinicu u Postavkama Zaliha" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "Postavi standardni račun troška prodanog proizvoda u {0} za zaokruživanje knjiženja rezultata tokom prijenosa zaliha" @@ -38248,7 +38277,7 @@ msgstr "Navedi {0}." msgid "Please specify at least one attribute in the Attributes table" msgstr "Navedi barem jedan atribut u tabeli Atributa" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "Navedi ili Količinu ili Stopu Vrednovanja ili oboje" @@ -38419,7 +38448,7 @@ msgstr "Objavljeno" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38444,7 +38473,7 @@ msgstr "Objavljeno" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38559,7 +38588,7 @@ msgstr "Datuma Knjiženja" msgid "Posting Time" msgstr "Vrijeme Knjiženja" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "Datum i vrijeme knjiženja su obavezni" @@ -38738,6 +38767,12 @@ msgstr "Preventivno Održavanje" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "Sprečava automatsku rezervaciju količina zaliha iz prodajnih naloga prilikom obrade povrata prodaje." +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "Sprječava sistem da automatski koristi cijenu iz posljednje transakcije nabave prilikom kreiranja novih naloga nabave ili transakcija nabave." + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39031,7 +39066,9 @@ msgstr "Tabele sa Cijenama ili Popustom su obevezne" msgid "Price per Unit (Stock UOM)" msgstr "Cijena po Jedinici (Jedinica Zaliha)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40386,6 +40423,7 @@ msgstr "Trošak Nabave Artikla {0}" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40422,6 +40460,12 @@ msgstr "Predujam Nabavne Fakture" msgid "Purchase Invoice Item" msgstr "Artikal Nabavne Fakture" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "Postavke Nabavne Fakture" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40473,6 +40517,7 @@ msgstr "Nabavne Fakture" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40482,7 +40527,7 @@ msgstr "Nabavne Fakture" #: 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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40599,7 +40644,7 @@ msgstr "Nabavni Nalog {0} je izrađen" msgid "Purchase Order {0} is not submitted" msgstr "Nabavni Nalog {0} nije podnešen" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "Nabavni Nalozi" @@ -40662,6 +40707,7 @@ msgstr "Nabavni Cijenovnik" #: 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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40676,7 +40722,7 @@ msgstr "Nabavni Cijenovnik" msgid "Purchase Receipt" msgstr "Nabavni Račun" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40942,7 +40988,6 @@ msgstr "K4" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41530,7 +41575,7 @@ msgstr "Pregled Kvaliteta" msgid "Quality Review Objective" msgstr "Cilj Revizije Kvaliteta" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "Količine su uspješno ažurirane." @@ -41591,7 +41636,7 @@ msgstr "Količine su uspješno ažurirane." #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41785,7 +41830,7 @@ msgstr "Niz Rute Upita" msgid "Queue Size should be between 5 and 100" msgstr "Veličina Reda čekanja treba biti između 5 i 100" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "Brzi Nalog Knjiženja" @@ -41840,7 +41885,7 @@ msgstr "Ponuda/Potencijalni Klijent %" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -42003,7 +42048,6 @@ msgstr "Podigao (e-pošta)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42413,8 +42457,8 @@ msgstr "Sirovine za Klijenta" msgid "Raw SQL" msgstr "Sirovi SQL" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "Količina utrošenih sirovina bit će validirana na osnovu potrebne količine iz Sastavnice." @@ -42822,11 +42866,10 @@ msgstr "Usaglasi Bankovnu Transakciju" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43350,7 +43393,7 @@ msgstr "Odbijen Serijski i Šaržni Paket" msgid "Rejected Warehouse" msgstr "Odbijeno Skladište" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "Odbijeno i Prihvaćeno Skladište ne mogu biti isto." @@ -43400,7 +43443,7 @@ msgid "Remaining Balance" msgstr "Preostalo Stanje" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43454,7 +43497,7 @@ msgstr "Napomena" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43493,7 +43536,7 @@ msgstr "Ukloni nula brojeva" msgid "Remove item if charges is not applicable to that item" msgstr "Ukloni artikal ako se na taj artikal ne naplaćuju naknade" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "Uklonjeni artikli bez promjene Količine ili Vrijednosti." @@ -43898,6 +43941,7 @@ msgstr "Zahtjev za Informacijama" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44171,7 +44215,7 @@ msgstr "Rezerviši za Podsklop" msgid "Reserved" msgstr "Rezervisano" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "Konflikt Rezervirane Šarže" @@ -44784,7 +44828,7 @@ msgstr "Prihodi primljeni unaprijed (npr. godišnja pretplata) ovdje se evidenti msgid "Reversal Of" msgstr "Suprotno od" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "Suprotni Nalog Knjiženja" @@ -44933,10 +44977,7 @@ msgstr "Uloga dozvoljena za prekomjernu Dostavu/Primanje" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "Uloga dozvoljena da Poništi Akciju Zaustavljanja" @@ -44951,8 +44992,11 @@ msgstr "Uloga dozvoljena da zaobiđe Kreditno Ograničenje" msgid "Role allowed to bypass period restrictions." msgstr "Uloga kojoj je dozvoljeno zaobilaženje ograničenja perioda." +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "Uloga dozvoljena da poništi radnju zaustavljanja" @@ -45153,8 +45197,8 @@ msgstr "Dozvola Zaokruživanja Gubitka" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "Dozvola Zaokruživanje Gubitka treba da bude između 0 i 1" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "Unos Zaokruživanja Rezultat za Prijenos Zaliha" @@ -45181,11 +45225,11 @@ msgstr "Naziv Redoslijeda Operacija" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "Red # {0}: Ne može se vratiti više od {1} za artikal {2}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "Red # {0}: Dodaj Serijski i Šaržni Paket za Artikal {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "Red br. {0}: Unesi količinu za artikal {1} jer nije nula." @@ -45211,7 +45255,7 @@ msgstr "Red #{0} (Tabela Plaćanja): Iznos mora da je negativan" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "Red #{0} (Tabela Plaćanja): Iznos mora da je pozitivan" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "Red #{0}: Unos ponovnog naručivanja već postoji za skladište {1} sa tipom ponovnog naručivanja {2}." @@ -45412,7 +45456,7 @@ msgstr "Red #{0}: Duplikat unosa u Referencama {1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "Red #{0}: Očekivani Datum Isporuke ne može biti prije datuma Nabavnog Naloga" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "Red #{0}: Račun Troškova nije postavljen za artikal {1}. {2}" @@ -45472,7 +45516,7 @@ msgstr "Red #{0}: Polja Od i Do su obavezna" msgid "Row #{0}: Item added" msgstr "Red #{0}: Artikel je dodan" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "Red #{0}: Artikal {1} se ne može prenijeti više od {2} u odnosu na {3} {4}" @@ -45500,7 +45544,7 @@ msgstr "Red #{0}: Artikal {1} u skladištu {2}: Dostupno {3}, Potrebno {4}." msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "Red #{0}: Artikal {1} nije Klijent Dostavljen Artikal." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "Red #{0}: Artikal {1} nije Serijalizirani/Šaržirani Artikal. Ne može imati Serijski Broj / Broj Šarže naspram sebe." @@ -45553,7 +45597,7 @@ msgstr "Red #{0}: Samo {1} je dostupno za rezervisanje za artikal {2}" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "Red #{0}: Početna akumulirana amortizacija mora biti manja ili jednaka {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "Red #{0}: Operacija {1} nije završena za {2} količinu gotovog proizvoda u Radnom Nalogu {3}. Ažuriraj status rada putem Radne Kartice {4}." @@ -45578,7 +45622,7 @@ msgstr "Red #{0}: Odaberi Artikal Gotovog Proizvoda za koju će se koristiti ova msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Red #{0}: Odaberi Skladište Podmontaže" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "Red #{0}: Postavite količinu za ponovnu narudžbu" @@ -45604,15 +45648,15 @@ msgstr "Red #{0}: Količina mora biti pozitivan broj" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "Red #{0}: Količina bi trebala biti manja ili jednaka Dostupnoj Količini za Rezervaciju (stvarna količina - rezervisana količina) {1} za artikal {2} naspram Šarže {3} u Skladištu {4}." -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "Red #{0}: Kontrola Kvaliteta je obavezna za artikal {1}" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "Red #{0}: Kontrola Kvaliteta {1} nije dostavljena za artikal: {2}" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "Red #{0}: Kontrola Kvaliteta {1} je odbijena za artikal {2}" @@ -45643,11 +45687,11 @@ msgstr "Red #{0}: Količina koju treba rezervisati za artikal {1} treba biti ve msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "Red #{0}: Cijena mora biti ista kao {1}: {2} ({3} / {4})" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "Red #{0}: Tip referentnog dokumenta mora biti jedan od Nabavni Nalog, Nabavna Faktura ili Nalog Knjiženja" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "Red #{0}: Tip referentnog dokumenta mora biti jedan od Prodajni Nalog, Prodajna Faktura, Nalog Knjiženja ili Opomena" @@ -45693,7 +45737,7 @@ msgstr "Red #{0}: Prodajna cijena za artikal {1} je niža od njegove {2}.\n" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "Red #{0}: ID Sekvence mora biti {1} ili {2} za Operaciju {3}." -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "Red #{0}: Serijski Broj {1} ne pripada Šarži {2}" @@ -45741,11 +45785,11 @@ msgstr "Red #{0}: Izvorno skladište {1} za artikal {2} ne može biti skladište msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "Red #{0}: Izvorno Skladište {1} za artikal {2} mora biti isto kao i Izvorno Skladište {3} u Radnom Nalogu." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "Red #{0}: Izvorno i ciljno skladište ne mogu biti isto za prijenos materijala" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "Red #{0}: Izvor, Ciljno Skladište i Dimenzije Zaliha ne mogu biti potpuno iste za Prijenos Materijala" @@ -45798,11 +45842,11 @@ msgstr "Red #{0}: Količina zaliha {1} ({2}) za artikal {3} ne može biti veća msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "Red #{0}: Ciljano skladište mora biti isto kao i skladište klijenta {1} iz povezanog Podizvođačkog Naloga" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "Red #{0}: Šarža {1} je već istekla." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "Red #{0}: Skladište {1} nije podređeno skladište grupnog skladišta {2}" @@ -45830,7 +45874,7 @@ msgstr "Red #{0}: Iznos Odbitka {1} ne odgovara izračunatom iznosu {2}." msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "Red #{0}: Radni Nalog postoji za punu ili djelomičnu količinu artiikla {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "Red #{0}: Ne možete koristiti dimenziju zaliha '{1}' u usaglašavanju zaliha za izmjenu količine ili stope vrednovanja. Usaglašavanje zaliha sa dimenzijama zaliha namijenjeno je isključivo za obavljanje početnih unosa." @@ -45866,23 +45910,23 @@ msgstr "Red #{1}: Skladište je obavezno za artikal {0}" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "Red #{idx}: Ne može se odabrati Skladište Dobavljača dok isporučuje sirovine podizvođaču." -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "Red #{idx}: Cijena artikla je ažurirana prema stopi vrednovanja zato što je ovo interni prijenos zaliha." -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "Red #{idx}: Unesi lokaciju za imovinski artikal {item_code}." -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "Red #{idx}: Primljena količina mora biti jednaka Prihvaćenoj + Odbijenoj količini za Artikal {item_code}." -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "Red #{idx}: {field_label} ne može biti negativan za artikal {item_code}." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "Red #{idx}: {field_label} je obavezan." @@ -45890,7 +45934,7 @@ msgstr "Red #{idx}: {field_label} je obavezan." msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "Red #{idx}: {from_warehouse_field} i {to_warehouse_field} ne mogu biti isti." -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "Red #{idx}: {schedule_date} ne može biti prije {transaction_date}." @@ -45955,7 +45999,7 @@ msgstr "Red #{}: {}" msgid "Row #{}: {} {} does not exist." msgstr "Red #{}: {} {} ne postoji." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "Red #{}: {} {} ne pripada {}. Odaberi važeći {}." @@ -45971,7 +46015,7 @@ msgstr "Red {0} : Operacija je obavezna naspram artikla sirovine {1}" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "Red {0} odabrana količina je manja od potrebne količine, potrebno je dodatno {1} {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "Red {0}# Artikal {1} nije pronađen u tabeli 'Isporučene Sirovine' u {2} {3}" @@ -46003,7 +46047,7 @@ msgstr "Red {0}: Dodijeljeni iznos {1} mora biti manji ili jednak nepodmirenom i msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "Red {0}: Dodijeljeni iznos {1} mora biti manji ili jednak preostalom iznosu plaćanja {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "Red {0}: Kako je {1} omogućen, sirovine se ne mogu dodati u {2} unos. Koristite {3} unos za potrošnju sirovina." @@ -46062,7 +46106,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "Red {0}: Ili je Artikal Dostavnice ili Pakirani Artikal referenca obavezna." #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "Red {0}: Devizni Kurs je obavezan" @@ -46103,7 +46147,7 @@ msgstr "Red {0}: Od vremena i do vremena je obavezano." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "Red {0}: Od vremena i do vremena {1} se preklapa sa {2}" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "Red {0}: Iz skladišta je obavezano za interne prijenose" @@ -46227,7 +46271,7 @@ msgstr "Red {0}: Količina mora biti veća od 0." msgid "Row {0}: Quantity cannot be negative." msgstr "Red {0}: Količina ne može biti negativna." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "Red {0}: Količina nije dostupna za {4} u skladištu {1} u vrijeme knjiženja unosa ({2} {3})" @@ -46239,11 +46283,11 @@ msgstr "Red {0}: Prodajna Faktura {1} je već kreirana za {2}" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "Red {0}: Smjena se ne može promijeniti jer je amortizacija već obrađena" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "Red {0}: Podizvođački Artikal je obavezan za sirovinu {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "Red {0}: Ciljno Skladište je obavezno za interne transfere" @@ -46267,7 +46311,7 @@ msgstr "Red {0}: {3} Račun {1} ne pripada {2}" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "Red {0}: Za postavljanje {1} periodičnosti, razlika između od i do datuma mora biti veća ili jednaka {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "Red {0}: Prenesena količina ne može biti veća od tražene količine." @@ -46320,7 +46364,7 @@ msgstr "Red {0}: {2} Artikal {1} ne postoji u {2} {3}" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "Red {1}: Količina ({0}) ne može biti razlomak. Da biste to omogućili, onemogućite '{2}' u Jedinici {3}." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "Red {idx}: Serija Imenovanja Imovine je obavezna za automatsko kreiranje sredstava za artikal {item_code}." @@ -46350,7 +46394,7 @@ msgstr "Redovi sa unosom istog računa će se spojiti u Registru" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "Pronađeni su redovi sa dupliranim rokovima u drugim redovima: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "Redovi: {0} imaju 'Unos Plaćanja' kao Tip Reference. Ovo ne treba postavljati ručno." @@ -46416,7 +46460,7 @@ msgstr "Procjena pravila završena" msgid "Rules evaluation started" msgstr "Procjena pravila je započeta" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "Pravila za konfiguriranje Serija Imenovanja" @@ -46713,7 +46757,7 @@ msgstr "Prodajna Ulazna Cijena" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46887,7 +46931,7 @@ msgstr "Mogućnos Prodaje prema Izvoru" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -47010,8 +47054,8 @@ msgstr "Prodajni Nalog je obavezan za Artikal {0}" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "Prodajni Nalog {0} već postoji naspram Nabavnog Naloga Klijenta {1}. Da dozvolite višestruke Prodajne Naloge, omogući {2} u {3}" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "Prodajni Nalog {0} nije dostupan za proizvodnju" @@ -47422,7 +47466,7 @@ msgstr "Isti Artikal" msgid "Same day" msgstr "Isti dan" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "Ista kombinacija artikla i skladišta je već unesena." @@ -47459,7 +47503,7 @@ msgstr "Skladište Zadržavanja Uzoraka" msgid "Sample Size" msgstr "Veličina Uzorka" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "Količina uzorka {0} ne može biti veća od primljene količine {1}" @@ -47750,7 +47794,7 @@ msgstr "Pretražuj po kodu artikla, serijskom broju ili barkodu" msgid "Search company..." msgstr "Pretraži poduzeće..." -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "Pretražite transakcije" @@ -47895,7 +47939,7 @@ msgstr "Odaberi Marku..." msgid "Select Columns and Filters" msgstr "Odaberi Kolone i Filtere" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "Odaberi Poduzeće" @@ -48591,7 +48635,7 @@ msgstr "Serijski Broj Raspon" msgid "Serial No Reserved" msgstr "Rezervisan Serijski Broj" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "Preklapa se Serijski broj Šarže" @@ -48652,7 +48696,7 @@ msgstr "Serijski Broj je Obavezan" msgid "Serial No is mandatory for Item {0}" msgstr "Serijski Broj je obavezan za artikal {0}" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "Serijski Broj {0} već postoji" @@ -48938,7 +48982,7 @@ msgstr "Serijski brojevi nedostupni za artikal {0} u skladištu {1}. Pokušaj pr #: 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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48964,7 +49008,7 @@ msgstr "Serijski brojevi nedostupni za artikal {0} u skladištu {1}. Pokušaj pr #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49362,12 +49406,6 @@ msgstr "Postavi Ciljano Skladište" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "Postavi Stopu Vrednovanja na osnovu Izvornog Skladišta" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "Postavi stopu procjene za odbijeni materijal" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "Postavi Skladište" @@ -49473,6 +49511,12 @@ msgstr "Postavite ovu vrijednost na 0 da biste onemogućili funkciju." msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "Postavite pravila za automatsku klasifikaciju transakcija. Povucite i ispustite pravila kako biste promijenili njihov prioritet." +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "Postavi stopu vrednovanja za odbijene materijale" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "Postavi {0} u kategoriju imovine {1} za {2}" @@ -49643,7 +49687,7 @@ msgstr "Registar Dionica" #: erpnext/desktop_icon/share_management.json #: erpnext/workspace_sidebar/share_management.json msgid "Share Management" -msgstr "Upravljanje Dionicama" +msgstr "Dionice" #. Name of a DocType #. Label of a Link in the Invoicing Workspace @@ -49971,7 +50015,7 @@ msgstr "Prikaz Stanja u Kontnom Planu" msgid "Show Barcode Field in Stock Transactions" msgstr "Prikaži polje Barkoda u Transakcijama Artikala" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "Prikaži Otkazane Unose" @@ -49979,7 +50023,7 @@ msgstr "Prikaži Otkazane Unose" msgid "Show Completed" msgstr "Prikaži Završeno" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "Prikaži Kredit / Debit u valuti poduzeća" @@ -50062,7 +50106,7 @@ msgstr "Prikaži Povezane Dostavnice" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "Prikaži Neto Vrijednosti na Računu Stranke" @@ -50074,7 +50118,7 @@ msgstr "Prikaži samo tačan iznos" msgid "Show Open" msgstr "Prikaži Otvoreno" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "Prikaži Početne Unose" @@ -50087,11 +50131,6 @@ msgstr "Prikaži Početno i Završno Stanje" msgid "Show Operations" msgstr "Prikaži Operacije" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "Prikaži Dugme za Plaćanje na Portalu Nabavnog Naloga" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "Prikaži Detalje Plaćanja" @@ -50107,7 +50146,7 @@ msgstr "Prikaži Raspored Plaćanja u ispisu" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "Prikaži Napomene" @@ -50174,6 +50213,11 @@ msgstr "Prikaži samo Kasu" msgid "Show only the Immediate Upcoming Term" msgstr "Prikaži samo Neposredan Predstojeći Uslov" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "Prikaži Dugme za Plaćanje na Portalu Nabavnog Naloga" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "Prikaži unose na čekanju" @@ -50462,11 +50506,11 @@ msgstr "Izvor Unosa Proizvodnje" msgid "Source Stock Entry (Manufacture)" msgstr "Izvor Unosa Zaliha (Proizvodnja)" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "Izvor Unos Zaliha {0} pripada radnom nalogu {1}, a ne {2}. Koristi unos proizvodnje iz istog radnog naloga." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "Izvor Unosa Zaliha {0} nema količinu gotovih proizvoda" @@ -50532,7 +50576,7 @@ msgstr "Izvorno skladište {0} mora biti isto kao i skladište klijenta {1} u Po msgid "Source and Target Location cannot be same" msgstr "Izvorna i Ciljna lokacija ne mogu biti iste" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "Izvorno i ciljno skladište ne mogu biti isto za red {0}" @@ -50546,8 +50590,8 @@ msgid "Source of Funds (Liabilities)" msgstr "Izvor Sredstava (Obaveze)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "Izvorno skladište je obavezno za red {0}" @@ -50712,8 +50756,8 @@ msgstr "Standard Ocenjeni Troškovi" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "Standard Prodaja" @@ -51046,7 +51090,7 @@ msgstr "Zapisnik Zaključavanja Zaliha" msgid "Stock Details" msgstr "Detalji Zaliha" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "Unosi Zaliha su već kreirani za Radni Nalog {0}: {1}" @@ -51317,7 +51361,7 @@ msgstr "Zaliha Primljena, ali nije Fakturisana" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51329,7 +51373,7 @@ msgstr "Popis Zaliha" msgid "Stock Reconciliation Item" msgstr "Artikal Popisa Zaliha" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "Popisi Zaliha" @@ -51367,7 +51411,7 @@ msgstr "Postavke Ponovnog Knjiženja Zaliha" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51395,7 +51439,7 @@ msgstr "Otkazani Unosi Rezervacije Zaliha" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "Kreirani Unosi Rezervacija Zaliha" @@ -51777,7 +51821,7 @@ msgstr "Zaustavljeni Radni Nalog se ne može otkazati, prvo ga prekini da biste #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "Prodavnice" @@ -51855,10 +51899,6 @@ msgstr "Podoperacije" msgid "Sub Procedure" msgstr "Podprocedura" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "Podzbir" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "Nedostaju reference artikla podsklopa. Ponovo preuzmi podsklopove i sirovine." @@ -52075,7 +52115,7 @@ msgstr "Servisni Artikal Podizvođačkog Naloga" msgid "Subcontracting Order" msgstr "Podizvođački Nalog" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52101,7 +52141,7 @@ msgstr "Servisni Artikal Podizvođačkog Naloga" msgid "Subcontracting Order Supplied Item" msgstr "Dostavljeni Artikal Podizvođačkog Naloga" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "Podizvođački Nalog {0} je kreiran." @@ -52190,7 +52230,7 @@ msgstr "Postavljanje Podizvođača" msgid "Subdivision" msgstr "Pododjeljenje" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "Radnja Podnošenja Neuspješna" @@ -52365,7 +52405,7 @@ msgstr "Uspješno Usaglašeno" msgid "Successfully Set Supplier" msgstr "Uspješno Postavljen Dobavljač" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "Uspješno promijenjena Jedinica Zaliha, redefinirajte faktore konverzije za novu Jedinicu." @@ -52521,6 +52561,7 @@ msgstr "Dostavljena Količina" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52562,8 +52603,8 @@ msgstr "Dostavljena Količina" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52611,6 +52652,12 @@ msgstr "Adrese i Kontakti Dobavljača" msgid "Supplier Contact" msgstr "Kontakt Dobavljača" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "Standard Vrijednosti Dobavljača" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52705,7 +52752,7 @@ msgstr "Datum Fakture Dobavljaća" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "Broj Fakture Dobavljača" @@ -52985,19 +53032,10 @@ msgstr "Dobavljač Proizvoda ili Usluga." msgid "Supplier {0} not found in {1}" msgstr "Dobavljač {0} nije pronađen u {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Dobavljač(i)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "Analiza Prodaje naspram Dobavljača" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53059,7 +53097,7 @@ msgstr "Tim Podrške" msgid "Support Tickets" msgstr "Slučajevi Podrške" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "Podržane Varijable:" @@ -53319,8 +53357,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "Skladište {0} mora biti isto kao i Skladište Dostave {1} u Internom Podizvođačkom Nalogu." #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "Skladište je obavezno za red {0}" @@ -53789,7 +53827,7 @@ msgstr "PDV se odbija samo za iznos koji premašuje kumulativni prag" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "Oporezivi Iznos" @@ -53950,7 +53988,7 @@ msgstr "Odbijeni PDV i Naknade" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "Odbijeni PDV i Naknade (Valuta Poduzeća)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "PDV red #{0}: {1} ne može biti manji od {2}" @@ -54140,7 +54178,6 @@ msgstr "Šablon Uslova" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54332,7 +54369,7 @@ msgstr "Pristup zahtjevu za ponudu sa portala je onemogućen. Da biste omogućil msgid "The BOM which will be replaced" msgstr "Sastavnica koja će biti zamijenjena" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "Šarža {0} ima negativnu količinu {1}. Da biste to riješili, idite na Postavke Šarže i kliknite na Ponovno izračunaj količinu Šarže. Ako problem i dalje postoji, kreiraj unutrašnji unos." @@ -54376,7 +54413,7 @@ msgstr "Uslov Plaćanja u redu {0} je možda duplikat." 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 "Lista Odabira koja ima Unose Rezervacije Zaliha ne može se ažurirati. Ako trebate unijeti promjene, preporučujemo da otkažete postojeće Unose Rezervacije Zaliha prije ažuriranja Liste Odabira." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "Količinski Gubitak Procesa je poništen prema Radnim Karticama Količinskog Gubitka Procesa" @@ -54392,7 +54429,7 @@ msgstr "Serijski Broj u redu #{0}: {1} nije dostupan u skladištu {2}." msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "Serijski Broj {0} je rezervisan naspram {1} {2} i ne može se koristiti za bilo koju drugu transakciju." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "Serijski i Šaržni Paket {0} ne važi za ovu transakciju. 'Tip transakcije' bi trebao biti 'Vani' umjesto 'Unutra' u Serijskom i Šaržnom Paketu {0}" @@ -54428,7 +54465,7 @@ msgstr "Bankovni račun je onemogućen. Molimo omogućite ga" msgid "The bank account is not a company account. Please select a company account" msgstr "Bankovni račun nije račun poduzeća. Molimo odaberite račun poduzeća" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "Šarža {0} je već rezervisana u {1} {2}. Dakle, ne može se nastaviti sa {3} {4}, koja je kreirana za {5} {6}." @@ -54534,7 +54571,7 @@ msgstr "Sljedeće šarže su istekle, obnovi zalihe:
{0}" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "Sljedeći otkazani unosi ponovnog objavljivanja postoje za {0}:

{1}

Molimo vas da izbrišete ove unose prije nego što nastavite." -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "Sljedeći izbrisani atributi postoje u varijantama, ali ne i u šablonu. Možete ili izbrisati Varijante ili zadržati Atribut(e) u šablonu." @@ -54579,15 +54616,15 @@ msgstr "Praznik {0} nije između Od Datuma i Do Datuma" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "Faktura nije u potpunosti dodijeljena jer postoji razlika od {0}." -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "Artikal {item} nije označen kao {type_of} artikal. Možete ga omogućiti kao {type_of} Artikal u Postavkama Artikla." -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "Artikli {0} i {1} se nalaze u sljedećem {2} :" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "Artikli {items} nisu označeni kao {type_of} artikli. Možete ih omogućiti kao {type_of} artikle u Postavkama Artikala." @@ -54743,7 +54780,7 @@ msgstr "Dionice ne postoje sa {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "Zaliha za artikal {0} u {1} skladištu je bila negativna na {2}. Trebali biste kreirati pozitivan unos {3} prije datuma {4} i vremena {5} da biste knjižili ispravnu Stopu Vrednovanja. Za više detalja, molimo pročitaj dokumentaciju." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "Zalihe su rezervirane za sljedeće artikle i skladišta, poništite ih za {0} Usglašavanje Zaliha:

{1}" @@ -54765,11 +54802,11 @@ msgstr "Sistem će pokušati automatski uskladiti stranku s bankovnom transakcij 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 "Sistem će kreirati Prodajnu Fakturu ili Kasa Fkturu iz Kase na osnovu ove postavke. Za transakcije velikog obima preporučuje se korištenje Kasa Fakture." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "Zadatak je stavljen u red kao pozadinski posao. U slučaju da postoji bilo kakav problem u obradi u pozadini, sistem će dodati komentar o grešci na ovom usaglašavanja zaliha i vratiti se u stanje nacrta" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "Zadatak je stavljen u red kao pozadinski posao. U slučaju da postoji bilo kakav problem sa obradom u pozadini, sistem će dodati komentar o grešci na ovom usklađivanju zaliha i vratiti se na fazu Poslano" @@ -54841,7 +54878,7 @@ msgstr "{0} ({1}) mora biti jednako {2} ({3})" msgid "The {0} contains Unit Price Items." msgstr "{0} sadrži Artikle s Jediničnom Cijenom." -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "Prefiks {0} '{1}' već postoji. Molimo vas da promijenite serijski broj šarže, u suprotnom će biti grešku o dupliranom unosu." @@ -54894,7 +54931,7 @@ msgstr "U sistemu nema unosa kod kojih je datum odobravanja prije datuma knjiže msgid "There are no slots available on this date" msgstr "Za ovaj datum nema slobodnih termina" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "U sistemu nema transakcija za odabrani bankovni račun i datume koji odgovaraju filterima." @@ -54938,7 +54975,7 @@ msgstr "Nije pronađena Šarža naspram {0}: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "Postoji jedna neusklađena transakcija prije {0}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "U ovom Unosu Zaliha mora biti najmanje jedan gotov proizvod" @@ -54994,11 +55031,11 @@ msgstr "Artikal je Varijanta {0} (Šablon)." msgid "This Month's Summary" msgstr "Sažetak ovog Mjeseca" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "Ovaj Nabavni Nalog je u potpunosti podugovoren." -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "Ovaj Prodajnii Nalog je u potpunosti podugovoren." @@ -55799,7 +55836,7 @@ msgstr "Za uključivanje troškova podsklopova i sekundarnih artikala u gotove p msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "Da biste uključili PDV u red {0} u cijenu artikla, PDV u redovima {1} također moraju biti uključeni" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "Za spajanje, sljedeća svojstva moraju biti ista za obje stavke" @@ -55834,7 +55871,7 @@ msgstr "Da biste koristili drugi Finansijski Registar, poništi 'Uključi Standa #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "Da biste koristili drugi Finansijski Registar, poništite oznaku 'Obuhvati standard Finansijski Registar unose'" @@ -55985,7 +56022,7 @@ msgstr "Ukupno Dodjeljeno" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Ukupan Iznos" @@ -56408,7 +56445,7 @@ msgstr "Ukupni iznos zahtjeva za plaćanje ne može biti veći od {0} iznosa" msgid "Total Payments" msgstr "Ukupno za Platiti" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "Ukupna Odabrana Količina {0} je veća od naručene količine {1}. Dozvolu za prekoračenje možete postaviti u Postavkama Zaliha." @@ -56440,7 +56477,7 @@ msgstr "Ukupni Trošak Nabave (preko Nabavne Fakture)" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Ukupna Količina" @@ -56826,7 +56863,7 @@ msgstr "URL Praćenja" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56837,7 +56874,7 @@ msgstr "Transakcija" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "Valuta Transakcije" @@ -57509,11 +57546,11 @@ msgstr "Postavke PDV-a UAE" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57585,7 +57622,7 @@ msgstr "Faktor Konverzije Jedinice je obavezan u redu {0}" msgid "UOM Name" msgstr "Naziv Jedinice" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "Faktor Konverzije je obavezan za Jedinicu: {0} za Artikal: {1}" @@ -57661,7 +57698,7 @@ msgstr "Nije moguće pronaći rezultat koji počinje od {0}. Morate imati stalne msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "Nije moguće pronaći vremenski termin u narednih {0} dana za operaciju {1}. Molimo povećajte 'Planiranje Kapaciteta za (Dana)' u {2}." -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "Nije moguće pronaći varijablu:" @@ -57780,7 +57817,7 @@ msgstr "Jedinica Mjere" msgid "Unit of Measure (UOM)" msgstr "Jedinica Mjere" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "Jedinica mjere {0} je unesena više puta u Tablicu Faktora Konverzije" @@ -57900,10 +57937,9 @@ msgid "Unreconcile Transaction" msgstr "Otkaži Usaglašavanje Transakcije" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "Neusaglašeno" @@ -57926,10 +57962,6 @@ msgstr "Neusaglašeni Unosi" msgid "Unreconciled Transactions" msgstr "Neusklađene Transakcije" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "Usklađivanje uspješno poništeno" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57975,7 +58007,7 @@ msgstr "Neplanirano" msgid "Unsecured Loans" msgstr "Neosigurani Krediti" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "OtkažiI Usklađeni Zahtjev Plaćanje" @@ -58190,12 +58222,6 @@ msgstr "Ažuriraj Zalihe" msgid "Update Type" msgstr "Ažuriraj Tip" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "Ažuriraj Učestalost Projekta" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58236,7 +58262,7 @@ msgstr "Ažurirani {0} red(ovi) finansijskog izvještaja s novim nazivom kategor msgid "Updating Costing and Billing fields against this Project..." msgstr "Ažuriranje Troškova i Fakturisanje za Projekat..." -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "Ažuriranje Varijanti u toku..." @@ -58694,12 +58720,6 @@ msgstr "Potvrdi Primijenjeno Pravilo" msgid "Validate Components and Quantities Per BOM" msgstr "Potvrdi Komponente i Količine po Listi Materijala" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "Potvrdi Potrošenu Količinu (Prema Sastavnici)" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58723,6 +58743,12 @@ msgstr "Potvrdi Pravilo Cijena" msgid "Validate Stock on Save" msgstr "Potvrdi Zalihe na Spremi" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "Potvrdi Potrošenu Količinu (Prema Sastavnici)" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58829,11 +58855,11 @@ msgstr "Nedostaje Stopa Vrednovanja" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "Stopa Vrednovanja za artikal {0}, je obavezna za knjigovodstvene unose za {1} {2}." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "Procijenjano Vrijednovanje je obavezno ako se unese Početna Zaliha" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "Stopa Vrednovanja je obavezna za artikal {0} u redu {1}" @@ -58843,7 +58869,7 @@ msgstr "Stopa Vrednovanja je obavezna za artikal {0} u redu {1}" msgid "Valuation and Total" msgstr "Vrednovanje i Ukupno" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "Stopa Vrednovanja za Klijent Dostavljene Artikle postavljena je na nulu." @@ -58993,7 +59019,7 @@ msgstr "Odstupanje ({})" msgid "Variant" msgstr "Varijanta" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "Greška Atributa Varijante" @@ -59012,7 +59038,7 @@ msgstr "Varijanta Sastavnice" msgid "Variant Based On" msgstr "Varijanta zasnovana na" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "Varijanta zasnovana na nemože se promijeniti" @@ -59030,7 +59056,7 @@ msgstr "Polje Varijante" msgid "Variant Item" msgstr "Varijanta Artikla" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "Varijanta Artikli" @@ -59411,7 +59437,7 @@ msgstr "Naziv Verifikata" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59451,7 +59477,7 @@ msgstr "Količina" #. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "Podtip Verifikata" @@ -59483,7 +59509,7 @@ msgstr "Podtip Verifikata" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59718,7 +59744,7 @@ msgstr "Skladište {0} ne postoji" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "Skladište {0} nije dozvoljeno za Prodajni Nalog {1}, trebalo bi da bude {2}" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "Skladište {0} nije povezano ni sa jednim računom, navedi račun u zapisu skladišta ili postavi standard račun zaliha u {1}." @@ -59765,7 +59791,7 @@ msgstr "Skladišta sa postojećom transakcijom ne mogu se pretvoriti u Registar. #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59821,6 +59847,12 @@ msgstr "Upozori pri novim Zahtjevima za Ponudu" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "Upozori ili zaustavi ako se cijena artikla promijeni u Otpremnicama i Prodajnim Fakturama stvorenih iz Prodajnog Naloga." +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "Upozori ili zaustavi ako se cijena artikla promijeni u fakturi ili potvrdi o kupovini stvorenoj iz naloga nabave." + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "Upozorenje - Red {0}: Sati naplate su više od stvarnih sati" @@ -60004,7 +60036,7 @@ msgstr "Specifikacija Web Stranice" msgid "Website:" msgstr "Web Stranica:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "Sedmica u godini" @@ -60378,7 +60410,7 @@ msgstr "Potrošeni Materijali Radnog Naloga" msgid "Work Order Item" msgstr "Artikal Radnog Naloga" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "Neusklađenost Radnog Naloga" @@ -60440,11 +60472,11 @@ msgstr "Radni Nalog nije kreiran" msgid "Work Order {0} created" msgstr "Radni nalog {0} izrađen" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "Radni nalog {0} nema proizvedenu količinu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "Radni Nalog {0}: Radna Kartica nije pronađena za operaciju {1}" @@ -60760,11 +60792,11 @@ msgstr "Naziv Godine" msgid "Year Start Date" msgstr "Datum Početka Godine" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "Godina u 2 cifre" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "Godina u 4 cifre" @@ -60817,7 +60849,7 @@ msgstr "Takođe možete kopirati i zalijepiti ovu vezu u svoj pretraživač" msgid "You can also set default CWIP account in Company {}" msgstr "Također možete postaviti standard Račun Kapitalnog Posla u Toku u {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "Također možete koristiti varijable u nazivu serije tako što ćete ih staviti između tačaka (.)" @@ -60971,6 +61003,10 @@ msgstr "Nemate dozvolu za kreiranje adrese poduzeća. Kontaktiraj Odgovornog Sis msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "Nemate dozvolu za ažuriranje podataka poduzeća . Kontaktiraj Odgovornog Sistema." +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "Nemate dozvolu za ažuriranje dokumenta Primljena Količina za artikal {0}" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "Nemate dozvolu za ažuriranje ovog dokumenta.Kontaktiraj Odgovornog Sistema." @@ -60999,7 +61035,7 @@ msgstr "Omogućili ste {0} i {1} u {2}. Ovo može dovesti do umetanja cijena iz msgid "You have entered a duplicate Delivery Note on Row" msgstr "Unijeli ste duplikat Dostavnice u red" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "Niste dodali nijedan bankovni račun poduzeća." @@ -61007,7 +61043,7 @@ msgstr "Niste dodali nijedan bankovni račun poduzeća." msgid "You have not performed any reconciliations in this session yet." msgstr "Još niste izvršili nijedno usklađivanje u ovoj sesiji." -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "Morate omogućiti automatsko ponovno naručivanje u Postavkama Zaliha kako biste održali nivoe ponovnog naručivanja." @@ -61078,8 +61114,11 @@ msgstr "Nulta Stopa" msgid "Zero quantity" msgstr "Nulta Količina" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "Artikli Nulte Količine" @@ -61191,7 +61230,7 @@ msgstr "exchangerate.host" msgid "fieldname" msgstr "naziv polja" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "naziv polja u dokumentu, npr." @@ -61409,6 +61448,10 @@ msgstr "odabrane transakcije" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "jedinstveni npr. SAVE20 Koristi se za popust" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "ažurirana dostavljena količina za artikal {0} na {1}" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "odstupanje" @@ -61467,7 +61510,8 @@ msgstr "{0} Korišteni kupon je {1}. Dozvoljena količina je iskorištena" msgid "{0} Digest" msgstr "{0} Sažetak" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "{0} Serija Imenovanja" @@ -61487,7 +61531,7 @@ msgstr "{0} Operacije: {1}" msgid "{0} Request for {1}" msgstr "{0} Zahtjev za {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} Zadržani Uzorak se zasniva na Šarži, provjeri Ima Broj Šarže da zadržite uzorak artikla" @@ -61600,7 +61644,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} uneseno dvaput u PDV Artikla" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "{0} uneseno dvaput {1} u PDV Artikla" @@ -61768,7 +61812,7 @@ msgstr "{0} parametar je nevažeći" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} unose plaćanja ne može filtrirati {1}" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "{0} količina artikla {1} se prima u Skladište {2} kapaciteta {3}." @@ -61781,7 +61825,7 @@ msgstr "{0} do {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "{0} transakcija će biti uvezeno u sistem. Molimo Vas da pregledate detalje ispod i kliknete na dugme 'Uvezi' da biste nastavili." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "{0} jedinica je rezervisano za artikal {1} u Skladištu {2}, poništi rezervaciju iste za {3} Popis Zaliha." @@ -61983,7 +62027,7 @@ msgstr "{0} {1}: Račun {2} je neaktivan" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: Knjigovodstveni Unos za {2} može se izvršiti samo u valuti: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: Centar Troškova je obavezan za Artikal {2}" @@ -62069,23 +62113,23 @@ msgstr "{0}: {1} ne postoji" msgid "{0}: {1} is a group account." msgstr "{0}: {1} je grupni račun." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} mora biti manje od {2}" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "{count} Imovina kreirana za {item_code}" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} je otkazan ili zatvoren." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "{item_name} Veličina Uzorka ({sample_size}) ne može biti veća od Prihvaćene Količina ({accepted_quantity})" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "{ref_doctype} {ref_name} je {status}." diff --git a/erpnext/locale/cs.po b/erpnext/locale/cs.po index 27d2c3f23ff..e28210919f4 100644 --- a/erpnext/locale/cs.po +++ b/erpnext/locale/cs.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:20\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:20\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr "" msgid " Summary" msgstr "" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "" @@ -302,7 +302,7 @@ msgstr "" msgid "'From Date' must be after 'To Date'" msgstr "" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "" @@ -338,7 +338,7 @@ msgstr "" msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "Účet {0} již používá {1}. Použijte jiný účet." @@ -999,7 +999,7 @@ msgstr "" msgid "A logical Warehouse against which stock entries are made." msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1211,7 +1211,7 @@ msgstr "" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1881,8 +1881,8 @@ msgstr "" msgid "Accounting Entry for Asset" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1890,7 +1890,7 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "" @@ -1903,16 +1903,16 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "" @@ -2210,12 +2210,6 @@ msgstr "" msgid "Action If Quality Inspection Is Rejected" msgstr "" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "" @@ -2274,6 +2268,12 @@ msgstr "" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2541,7 +2541,7 @@ msgstr "" msgid "Actual qty in stock" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "" @@ -2555,7 +2555,7 @@ msgstr "" msgid "Add / Edit Prices" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "" @@ -2709,7 +2709,7 @@ msgstr "" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -2954,7 +2954,7 @@ msgstr "" msgid "Additional Discount Amount (Company Currency)" msgstr "Částka dodatečné slevy (měna společnosti)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -3239,7 +3239,7 @@ msgstr "" msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3352,7 +3352,7 @@ msgstr "" msgid "Advance amount" msgstr "Částka zálohy" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Částka zálohy nemůže být větší než {0} {1}" @@ -3421,7 +3421,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "" @@ -3539,7 +3539,7 @@ msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "" @@ -3563,7 +3563,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "" @@ -3844,7 +3844,7 @@ msgstr "" msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "" @@ -3852,7 +3852,7 @@ msgstr "" msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "" @@ -3901,7 +3901,7 @@ msgstr "" msgid "Allocate Advances Automatically (FIFO)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "" @@ -3911,7 +3911,7 @@ msgstr "" msgid "Allocate Payment Based On Payment Terms" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "" @@ -3941,7 +3941,7 @@ msgstr "" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4062,15 +4062,15 @@ msgstr "" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4099,12 +4099,6 @@ msgstr "" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4317,8 +4311,11 @@ msgstr "" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4410,7 +4407,7 @@ msgstr "" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4607,7 +4604,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4637,7 +4634,6 @@ msgstr "" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4807,10 +4803,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5430,7 +5422,7 @@ msgstr "" msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "" -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "" @@ -5580,7 +5572,7 @@ msgstr "" msgid "Asset Category Name" msgstr "" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "" @@ -5976,7 +5968,7 @@ msgstr "" msgid "Asset {0} must be submitted" msgstr "" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6014,11 +6006,11 @@ msgstr "" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "" -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "" @@ -6091,7 +6083,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "" @@ -6123,7 +6115,7 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "" @@ -6187,7 +6179,11 @@ msgstr "" msgid "Attribute Value" msgstr "" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "" @@ -6195,11 +6191,19 @@ msgstr "" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "" @@ -6259,24 +6263,12 @@ msgstr "" msgid "Auto Create Exchange Rate Revaluation" msgstr "" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6395,6 +6387,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6612,7 +6616,7 @@ msgstr "" msgid "Available for use date is required" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "" @@ -6711,7 +6715,7 @@ msgstr "" msgid "BIN Qty" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -6984,7 +6988,7 @@ msgstr "" msgid "BOM Website Operation" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7075,7 +7079,7 @@ msgstr "" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" +msgid "Backflush raw materials of subcontract based on" msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' @@ -7096,7 +7100,7 @@ msgstr "" msgid "Balance (Dr - Cr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "" @@ -7627,11 +7631,11 @@ msgstr "" msgid "Barcode Type" msgstr "" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "" @@ -7998,12 +8002,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -8076,7 +8080,7 @@ msgstr "" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" +msgid "Bill for rejected quantity in Purchase Invoice" msgstr "" #. Label of a Card Break in the Manufacturing Workspace @@ -8417,8 +8421,11 @@ msgstr "" msgid "Blanket Order Rate" msgstr "" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -8933,7 +8940,7 @@ msgstr "" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "" @@ -9298,7 +9305,7 @@ msgstr "" msgid "Can only make payment against unbilled {0}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9354,9 +9361,9 @@ msgstr "" msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "" @@ -9384,7 +9391,7 @@ msgstr "" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "" @@ -9420,7 +9427,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9428,7 +9435,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "" -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "" @@ -9440,7 +9447,7 @@ msgstr "" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "" @@ -9468,11 +9475,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9498,7 +9505,7 @@ msgstr "" msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -9535,7 +9542,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9543,8 +9550,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "" @@ -9588,7 +9595,7 @@ msgstr "" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9606,8 +9613,8 @@ msgstr "" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9623,7 +9630,7 @@ msgstr "" msgid "Cannot set authorization on basis of Discount for {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "" @@ -10534,7 +10541,7 @@ msgstr "" msgid "Closing (Dr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "" @@ -10995,7 +11002,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11277,7 +11284,7 @@ msgstr "" msgid "Company Abbreviation" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11290,7 +11297,7 @@ msgstr "" msgid "Company Account" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "" @@ -11466,7 +11473,7 @@ msgstr "" msgid "Company is mandatory" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "" @@ -11737,7 +11744,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11750,7 +11757,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11768,13 +11777,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "" @@ -11952,7 +11961,7 @@ msgstr "" msgid "Consumed" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "" @@ -11996,7 +12005,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12169,10 +12178,6 @@ msgstr "" msgid "Contact:" msgstr "Kontakt:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "" - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12350,7 +12355,7 @@ msgstr "" msgid "Conversion Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "" @@ -12622,7 +12627,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12717,7 +12722,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "" @@ -13055,7 +13060,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "" @@ -13428,7 +13433,7 @@ msgstr "" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "" @@ -13569,15 +13574,15 @@ msgstr "" msgid "Credit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "" @@ -13772,7 +13777,7 @@ msgstr "" msgid "Creditors" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14070,7 +14075,7 @@ msgstr "" msgid "Current Serial No" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14271,7 +14276,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15044,7 +15049,7 @@ msgstr "" msgid "Day Of Week" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15160,11 +15165,11 @@ msgstr "" msgid "Debit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "" @@ -15174,7 +15179,7 @@ msgstr "" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "" @@ -15285,7 +15290,7 @@ msgstr "" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15427,7 +15432,7 @@ msgstr "" msgid "Default BOM" msgstr "" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "" @@ -15784,15 +15789,15 @@ msgstr "" msgid "Default Unit of Measure" msgstr "" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "" -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "" @@ -16093,7 +16098,7 @@ msgstr "" msgid "Delivered" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "" @@ -16143,8 +16148,8 @@ msgstr "" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16155,11 +16160,11 @@ msgstr "" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16248,7 +16253,7 @@ msgstr "" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16773,7 +16778,7 @@ msgstr "" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "" @@ -16937,10 +16942,8 @@ msgstr "" msgid "Disable In Words" msgstr "" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' @@ -16982,6 +16985,12 @@ msgstr "" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17038,7 +17047,7 @@ msgstr "" msgid "Disassemble Order" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "Množství k rozebrání nemůže být menší nebo rovno 0." @@ -17563,6 +17572,12 @@ msgstr "" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17653,9 +17668,12 @@ msgstr "" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17673,6 +17691,10 @@ msgstr "" msgid "Document Type already used as a dimension" msgstr "" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -17977,7 +17999,7 @@ msgstr "" msgid "Duplicate Sales Invoices found" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18097,8 +18119,8 @@ msgstr "" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18321,7 +18343,7 @@ msgstr "" msgid "Email Sent to Supplier {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18511,7 +18533,7 @@ msgstr "" msgid "Employee cannot report to himself." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "Zaměstnanec je povinný" @@ -18519,7 +18541,7 @@ msgstr "Zaměstnanec je povinný" msgid "Employee is required while issuing Asset {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18532,7 +18554,7 @@ msgstr "" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "Zaměstnanec {0} nebyl nalezen" @@ -18575,7 +18597,7 @@ msgstr "" msgid "Enable Auto Email" msgstr "" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "" @@ -19173,7 +19195,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "" @@ -19219,7 +19241,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "" @@ -19248,7 +19270,7 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19607,7 +19629,7 @@ msgstr "" msgid "Expense" msgstr "" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "" @@ -19655,7 +19677,7 @@ msgstr "" msgid "Expense Account" msgstr "" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "" @@ -20118,7 +20140,7 @@ msgstr "" msgid "Filter by Reference Date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20448,7 +20470,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20543,7 +20565,7 @@ msgstr "" msgid "Fiscal Year" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20607,7 +20629,7 @@ msgstr "" msgid "Fixed Asset Defaults" msgstr "" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "" @@ -20757,7 +20779,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20788,7 +20810,7 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "" @@ -20872,6 +20894,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20893,7 +20921,7 @@ msgstr "U projektu - {0} aktualizujte svůj stav" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -20902,7 +20930,7 @@ msgstr "" msgid "For reference" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" @@ -20926,7 +20954,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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -20935,7 +20963,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -21548,7 +21576,7 @@ msgstr "" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21560,7 +21588,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "" @@ -22075,7 +22103,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -22258,7 +22286,7 @@ msgstr "" msgid "Grant Commission" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "" @@ -22899,10 +22927,10 @@ msgstr "" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23057,7 +23085,7 @@ msgstr "" msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23239,7 +23267,7 @@ msgstr "" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23411,11 +23439,11 @@ msgstr "" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "" @@ -23531,7 +23559,7 @@ msgstr "" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23583,7 +23611,7 @@ msgstr "" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "" @@ -23626,7 +23654,7 @@ msgstr "" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23640,6 +23668,7 @@ msgid "Implementation Partner" msgstr "" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -23993,7 +24022,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24247,7 +24276,7 @@ msgstr "" msgid "Incorrect Batch Consumed" msgstr "" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" @@ -24255,7 +24284,7 @@ msgstr "" msgid "Incorrect Company" msgstr "Nesprávná společnost" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "" @@ -24465,14 +24494,14 @@ msgstr "" msgid "Inspected By" msgstr "" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "" @@ -24489,7 +24518,7 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "" @@ -24571,8 +24600,8 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "" @@ -24792,7 +24821,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -24885,7 +24914,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -24915,7 +24944,7 @@ msgstr "" msgid "Invalid Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "" @@ -25001,12 +25030,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25043,7 +25072,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "" @@ -25172,7 +25201,6 @@ msgstr "" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "" @@ -25193,10 +25221,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25718,12 +25742,12 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' @@ -25996,7 +26020,7 @@ msgstr "" msgid "Issuing Date" msgstr "" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" @@ -26066,7 +26090,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26113,6 +26137,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26128,7 +26153,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26892,6 +26916,7 @@ msgstr "" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26902,7 +26927,6 @@ msgstr "" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27162,11 +27186,11 @@ msgstr "" msgid "Item Variant {0} already exists with same attributes" msgstr "" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "" @@ -27205,6 +27229,15 @@ msgstr "" msgid "Item Weight Details" msgstr "" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27234,7 +27267,7 @@ msgstr "" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27254,11 +27287,11 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "" @@ -27288,7 +27321,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27307,10 +27340,14 @@ msgstr "" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27324,7 +27361,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "" @@ -27332,7 +27369,7 @@ msgstr "" msgid "Item {0} does not exist in the system or has expired" msgstr "" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "" @@ -27348,15 +27385,15 @@ msgstr "" msgid "Item {0} has been disabled" msgstr "Položka {0} byla zakázána" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "" @@ -27368,19 +27405,23 @@ msgstr "" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "" @@ -27388,7 +27429,11 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -27404,7 +27449,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27420,7 +27465,7 @@ msgstr "" msgid "Item {0}: {1} qty produced. " msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "" @@ -27530,7 +27575,7 @@ msgstr "" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -28163,7 +28208,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28441,7 +28486,7 @@ msgstr "" msgid "Length (cm)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "" @@ -28582,7 +28627,7 @@ msgstr "" msgid "Linked Location" msgstr "" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "" @@ -28977,11 +29022,6 @@ msgstr "" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -28993,6 +29033,11 @@ msgstr "" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29189,7 +29234,7 @@ msgid "Major/Optional Subjects" msgstr "" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29358,8 +29403,8 @@ msgstr "" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29418,8 +29463,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29568,7 +29613,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "" @@ -29844,7 +29889,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -29915,6 +29960,7 @@ msgstr "" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30021,11 +30067,11 @@ msgstr "" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "" @@ -30140,7 +30186,7 @@ msgstr "" msgid "Material Transferred for Manufacturing" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30269,11 +30315,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -30717,11 +30763,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "" @@ -30759,7 +30805,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "" @@ -30767,11 +30813,11 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30815,10 +30861,6 @@ msgstr "" msgid "Mixed Conditions" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "" - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31087,7 +31129,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:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31166,27 +31208,20 @@ msgstr "" msgid "Naming Series Prefix" msgstr "" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31234,16 +31269,16 @@ msgstr "" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "" @@ -31857,7 +31892,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "" @@ -31870,7 +31905,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "" @@ -31915,7 +31950,7 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "" @@ -31928,7 +31963,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "" @@ -31940,7 +31975,7 @@ msgstr "" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -31948,7 +31983,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32042,7 +32077,7 @@ msgstr "" msgid "No more children on Right" msgstr "" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32217,7 +32252,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32309,7 +32344,7 @@ msgstr "" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "" @@ -32413,7 +32448,7 @@ msgstr "" msgid "Not authorized to edit frozen Account {0}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32459,7 +32494,7 @@ msgstr "" msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "" -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -32936,7 +32971,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33087,7 +33122,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "" @@ -33246,16 +33281,16 @@ msgstr "" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33612,7 +33647,7 @@ msgstr "" msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33746,7 +33781,7 @@ msgstr "" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "" @@ -33954,7 +33989,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34012,7 +34047,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34030,7 +34065,7 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "" @@ -34273,7 +34308,6 @@ msgstr "" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "" @@ -34544,7 +34578,7 @@ msgstr "" msgid "Packed Items" msgstr "" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -34992,7 +35026,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35128,7 +35162,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35254,7 +35288,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35340,7 +35374,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35643,7 +35677,6 @@ msgstr "" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35901,7 +35934,7 @@ msgstr "" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -35980,10 +36013,6 @@ msgstr "" msgid "Payment Schedules" msgstr "Platební plány" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37003,7 +37032,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "" @@ -37035,11 +37064,11 @@ msgstr "" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "" @@ -37059,7 +37088,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -37166,7 +37195,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "" @@ -37235,11 +37264,11 @@ msgstr "" msgid "Please enter Approving Role or Approving User" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "" @@ -37251,7 +37280,7 @@ msgstr "" msgid "Please enter Employee Id of this sales person" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "" @@ -37296,7 +37325,7 @@ msgstr "" msgid "Please enter Root Type for account- {0}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "" @@ -37373,7 +37402,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37487,12 +37516,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "" @@ -37508,13 +37537,13 @@ msgstr "" msgid "Please select Category first" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "" @@ -37523,7 +37552,7 @@ msgstr "" msgid "Please select Company and Posting Date to getting entries" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "" @@ -37572,7 +37601,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "" @@ -37580,11 +37609,11 @@ msgstr "" msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "" @@ -37637,7 +37666,7 @@ msgstr "" msgid "Please select a Supplier" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "" @@ -37698,7 +37727,7 @@ msgstr "Vyberte prosím řádek pro vytvoření záznamu přeúčtování" msgid "Please select a supplier for fetching payments." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37718,7 +37747,7 @@ msgstr "" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37825,7 +37854,7 @@ msgstr "" msgid "Please select weekly off day" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "" @@ -37965,7 +37994,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -38009,7 +38038,7 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" @@ -38128,7 +38157,7 @@ msgstr "" msgid "Please specify at least one attribute in the Attributes table" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "" @@ -38299,7 +38328,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38324,7 +38353,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38439,7 +38468,7 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "" @@ -38618,6 +38647,12 @@ msgstr "" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -38911,7 +38946,9 @@ msgstr "" msgid "Price per Unit (Stock UOM)" msgstr "" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40266,6 +40303,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40302,6 +40340,12 @@ msgstr "" msgid "Purchase Invoice Item" msgstr "" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40353,6 +40397,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40362,7 +40407,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40479,7 +40524,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "" @@ -40542,6 +40587,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40556,7 +40602,7 @@ msgstr "" msgid "Purchase Receipt" msgstr "" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40822,7 +40868,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41410,7 +41455,7 @@ msgstr "" msgid "Quality Review Objective" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41471,7 +41516,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41665,7 +41710,7 @@ msgstr "" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "" @@ -41720,7 +41765,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41883,7 +41928,6 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42293,8 +42337,8 @@ msgstr "" msgid "Raw SQL" msgstr "" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42702,11 +42746,10 @@ msgstr "" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43230,7 +43273,7 @@ msgstr "" msgid "Rejected Warehouse" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "" @@ -43280,7 +43323,7 @@ msgid "Remaining Balance" msgstr "" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43334,7 +43377,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43373,7 +43416,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "" @@ -43777,6 +43820,7 @@ msgstr "" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44050,7 +44094,7 @@ msgstr "" msgid "Reserved" msgstr "" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44663,7 +44707,7 @@ msgstr "" msgid "Reversal Of" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "" @@ -44812,10 +44856,7 @@ msgstr "" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "" @@ -44830,8 +44871,11 @@ msgstr "" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45032,8 +45076,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -45060,11 +45104,11 @@ msgstr "" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45090,7 +45134,7 @@ msgstr "" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "" @@ -45291,7 +45335,7 @@ msgstr "" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -45351,7 +45395,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45379,7 +45423,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "" @@ -45432,7 +45476,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "" @@ -45457,7 +45501,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Řádek č. {0}: Vyberte prosím sklad podsestavy" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "" @@ -45483,15 +45527,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45522,11 +45566,11 @@ msgstr "" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "" @@ -45569,7 +45613,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "" @@ -45617,11 +45661,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45674,11 +45718,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "" -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "" @@ -45706,7 +45750,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "" @@ -45742,23 +45786,23 @@ msgstr "" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45766,7 +45810,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45831,7 +45875,7 @@ msgstr "" msgid "Row #{}: {} {} does not exist." msgstr "" -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" @@ -45847,7 +45891,7 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -45879,7 +45923,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:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -45937,7 +45981,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "" @@ -45978,7 +46022,7 @@ msgstr "" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -46102,7 +46146,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "" @@ -46114,11 +46158,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:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -46142,7 +46186,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:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46195,7 +46239,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:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -46225,7 +46269,7 @@ msgstr "" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" @@ -46291,7 +46335,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46588,7 +46632,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46762,7 +46806,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46885,8 +46929,8 @@ msgstr "" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47297,7 +47341,7 @@ msgstr "" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "" @@ -47334,7 +47378,7 @@ msgstr "" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -47623,7 +47667,7 @@ msgstr "" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47768,7 +47812,7 @@ msgstr "" msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "" @@ -48463,7 +48507,7 @@ msgstr "" msgid "Serial No Reserved" msgstr "" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48524,7 +48568,7 @@ msgstr "" msgid "Serial No is mandatory for Item {0}" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "" @@ -48810,7 +48854,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48836,7 +48880,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49234,12 +49278,6 @@ msgstr "" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "" @@ -49345,6 +49383,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "" @@ -49843,7 +49887,7 @@ msgstr "" msgid "Show Barcode Field in Stock Transactions" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "" @@ -49851,7 +49895,7 @@ msgstr "" msgid "Show Completed" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -49934,7 +49978,7 @@ msgstr "" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "" @@ -49946,7 +49990,7 @@ msgstr "" msgid "Show Open" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "" @@ -49959,11 +50003,6 @@ msgstr "" msgid "Show Operations" msgstr "" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "" @@ -49979,7 +50018,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "" @@ -50046,6 +50085,11 @@ msgstr "" msgid "Show only the Immediate Upcoming Term" msgstr "" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "" @@ -50332,11 +50376,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50402,7 +50446,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "" @@ -50416,8 +50460,8 @@ msgid "Source of Funds (Liabilities)" msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "" @@ -50582,8 +50626,8 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "" @@ -50916,7 +50960,7 @@ msgstr "" msgid "Stock Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -51187,7 +51231,7 @@ msgstr "" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51199,7 +51243,7 @@ msgstr "" msgid "Stock Reconciliation Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "" @@ -51237,7 +51281,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51265,7 +51309,7 @@ msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "" @@ -51647,7 +51691,7 @@ msgstr "" #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "" @@ -51725,10 +51769,6 @@ msgstr "" msgid "Sub Procedure" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -51945,7 +51985,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -51971,7 +52011,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "" @@ -52060,7 +52100,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "" @@ -52235,7 +52275,7 @@ msgstr "" msgid "Successfully Set Supplier" msgstr "" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "" @@ -52391,6 +52431,7 @@ msgstr "" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52432,8 +52473,8 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52481,6 +52522,12 @@ msgstr "" msgid "Supplier Contact" msgstr "" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52575,7 +52622,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "" @@ -52855,19 +52902,10 @@ msgstr "" msgid "Supplier {0} not found in {1}" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -52929,7 +52967,7 @@ msgstr "" msgid "Support Tickets" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53188,8 +53226,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "" @@ -53657,7 +53695,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "" @@ -53818,7 +53856,7 @@ msgstr "" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "" @@ -54008,7 +54046,6 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54200,7 +54237,7 @@ msgstr "" msgid "The BOM which will be replaced" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54244,7 +54281,7 @@ msgstr "" msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54260,7 +54297,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "" @@ -54296,7 +54333,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54402,7 +54439,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "" @@ -54446,15 +54483,15 @@ msgstr "" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54610,7 +54647,7 @@ msgstr "" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "" @@ -54632,11 +54669,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -54708,7 +54745,7 @@ msgstr "" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54761,7 +54798,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54805,7 +54842,7 @@ msgstr "" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54861,11 +54898,11 @@ msgstr "" msgid "This Month's Summary" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55666,7 +55703,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "" @@ -55701,7 +55738,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "" @@ -55852,7 +55889,7 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "" @@ -56275,7 +56312,7 @@ msgstr "" msgid "Total Payments" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56307,7 +56344,7 @@ msgstr "" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "" @@ -56693,7 +56730,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56704,7 +56741,7 @@ msgstr "" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "" @@ -57376,11 +57413,11 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57452,7 +57489,7 @@ msgstr "" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57528,7 +57565,7 @@ msgstr "" msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "" @@ -57647,7 +57684,7 @@ msgstr "" msgid "Unit of Measure (UOM)" msgstr "" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "" @@ -57767,10 +57804,9 @@ msgid "Unreconcile Transaction" msgstr "" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "" @@ -57793,10 +57829,6 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57842,7 +57874,7 @@ msgstr "" msgid "Unsecured Loans" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58057,12 +58089,6 @@ msgstr "" msgid "Update Type" msgstr "" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58103,7 +58129,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "" @@ -58561,12 +58587,6 @@ msgstr "" msgid "Validate Components and Quantities Per BOM" msgstr "" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58590,6 +58610,12 @@ msgstr "" msgid "Validate Stock on Save" msgstr "" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58696,11 +58722,11 @@ msgstr "" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "" -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "" @@ -58710,7 +58736,7 @@ msgstr "" msgid "Valuation and Total" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "" @@ -58860,7 +58886,7 @@ msgstr "" msgid "Variant" msgstr "" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "" @@ -58879,7 +58905,7 @@ msgstr "" msgid "Variant Based On" msgstr "" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "" @@ -58897,7 +58923,7 @@ msgstr "" msgid "Variant Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "" @@ -59278,7 +59304,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59318,7 +59344,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "" @@ -59350,7 +59376,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59585,7 +59611,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "" @@ -59632,7 +59658,7 @@ msgstr "" #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59688,6 +59714,12 @@ msgstr "" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" @@ -59871,7 +59903,7 @@ msgstr "" msgid "Website:" msgstr "Webové stránky:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60245,7 +60277,7 @@ msgstr "" msgid "Work Order Item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60307,11 +60339,11 @@ msgstr "" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "" @@ -60627,11 +60659,11 @@ msgstr "" msgid "Year Start Date" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60684,7 +60716,7 @@ msgstr "" msgid "You can also set default CWIP account in Company {}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60838,6 +60870,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60866,7 +60902,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60874,7 +60910,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "" @@ -60945,8 +60981,11 @@ msgstr "" msgid "Zero quantity" msgstr "" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61058,7 +61097,7 @@ msgstr "" msgid "fieldname" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61276,6 +61315,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "" @@ -61334,7 +61377,8 @@ msgstr "" msgid "{0} Digest" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61354,7 +61398,7 @@ msgstr "" msgid "{0} Request for {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "" @@ -61467,7 +61511,7 @@ msgid "{0} entered twice in Item Tax" msgstr "" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "" @@ -61635,7 +61679,7 @@ msgstr "" msgid "{0} payment entries can not be filtered by {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61648,7 +61692,7 @@ msgstr "{0} do {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" @@ -61850,7 +61894,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -61936,23 +61980,23 @@ msgstr "" msgid "{0}: {1} is a group account." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "" -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" diff --git a/erpnext/locale/da.po b/erpnext/locale/da.po index 2ef5058b2d8..9df59f98acf 100644 --- a/erpnext/locale/da.po +++ b/erpnext/locale/da.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:20\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:20\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr " Underenhed" msgid " Summary" msgstr " Oversigt" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"Kunde Leverede Artikel\" kan ikke være Indkøbe Artikel" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"Kunde Leverede Artikel\" kan ikke have Værdiansættelsesrate" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "\"Er anlægsaktiv\" kan ikke afkrydses, da der findes aktiv post for artikel" @@ -302,7 +302,7 @@ msgstr "'Fra Dato' er påkrævet" msgid "'From Date' must be after 'To Date'" msgstr "'Fra Dato' skal være efter 'Til Dato'" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "'Har Serienummer' kan ikke være 'Ja' for ikke Lager Artikel" @@ -338,7 +338,7 @@ msgstr "'Opdater Lager' kan ikke kontrolleres, fordi artikler ikke leveres via { msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "'Opdater Lager' kan ikke vælges for salg af anlæg aktiver" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "'{0}' konto bruges allerede af {1}. Brug en anden konto." @@ -995,7 +995,7 @@ msgstr "" msgid "A logical Warehouse against which stock entries are made." msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1207,7 +1207,7 @@ msgstr "" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "I henhold til CEFACT/ICG/2010/IC013 eller CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1877,8 +1877,8 @@ msgstr "Bogføring Poster" msgid "Accounting Entry for Asset" msgstr "Bogføring Post for Aktiv" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1886,7 +1886,7 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "" @@ -1899,16 +1899,16 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "" @@ -2206,12 +2206,6 @@ msgstr "" msgid "Action If Quality Inspection Is Rejected" msgstr "" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "" @@ -2270,6 +2264,12 @@ msgstr "" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2537,7 +2537,7 @@ msgstr "" msgid "Actual qty in stock" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "" @@ -2551,7 +2551,7 @@ msgstr "" msgid "Add / Edit Prices" msgstr "Tilføj / Rediger Priser" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "Tilføj Kolonner i Transaktionsvaluta" @@ -2705,7 +2705,7 @@ msgstr "" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -2950,7 +2950,7 @@ msgstr "" msgid "Additional Discount Amount (Company Currency)" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -3235,7 +3235,7 @@ msgstr "" msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3348,7 +3348,7 @@ msgstr "" msgid "Advance amount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "" @@ -3417,7 +3417,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "" @@ -3535,7 +3535,7 @@ msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "" @@ -3559,7 +3559,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "" @@ -3840,7 +3840,7 @@ msgstr "" msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "" @@ -3848,7 +3848,7 @@ msgstr "" msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "" @@ -3897,7 +3897,7 @@ msgstr "" msgid "Allocate Advances Automatically (FIFO)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "" @@ -3907,7 +3907,7 @@ msgstr "" msgid "Allocate Payment Based On Payment Terms" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "" @@ -3937,7 +3937,7 @@ msgstr "" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4058,15 +4058,15 @@ msgstr "" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4095,12 +4095,6 @@ msgstr "" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4313,8 +4307,11 @@ msgstr "" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4406,7 +4403,7 @@ msgstr "" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4603,7 +4600,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4633,7 +4630,6 @@ msgstr "" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4803,10 +4799,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5426,7 +5418,7 @@ msgstr "" msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "" -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "" @@ -5576,7 +5568,7 @@ msgstr "" msgid "Asset Category Name" msgstr "" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "" @@ -5972,7 +5964,7 @@ msgstr "" msgid "Asset {0} must be submitted" msgstr "" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6010,11 +6002,11 @@ msgstr "" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "" -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "" @@ -6087,7 +6079,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "" @@ -6119,7 +6111,7 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "" @@ -6183,7 +6175,11 @@ msgstr "" msgid "Attribute Value" msgstr "" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "" @@ -6191,11 +6187,19 @@ msgstr "" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "" @@ -6255,24 +6259,12 @@ msgstr "" msgid "Auto Create Exchange Rate Revaluation" msgstr "" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6391,6 +6383,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6608,7 +6612,7 @@ msgstr "" msgid "Available for use date is required" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "" @@ -6707,7 +6711,7 @@ msgstr "" msgid "BIN Qty" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -6980,7 +6984,7 @@ msgstr "" msgid "BOM Website Operation" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7071,7 +7075,7 @@ msgstr "" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" +msgid "Backflush raw materials of subcontract based on" msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' @@ -7092,7 +7096,7 @@ msgstr "" msgid "Balance (Dr - Cr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "" @@ -7623,11 +7627,11 @@ msgstr "" msgid "Barcode Type" msgstr "" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "" @@ -7994,12 +7998,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -8072,7 +8076,7 @@ msgstr "" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" +msgid "Bill for rejected quantity in Purchase Invoice" msgstr "" #. Label of a Card Break in the Manufacturing Workspace @@ -8413,8 +8417,11 @@ msgstr "" msgid "Blanket Order Rate" msgstr "" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -8929,7 +8936,7 @@ msgstr "" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "" @@ -9294,7 +9301,7 @@ msgstr "" msgid "Can only make payment against unbilled {0}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9350,9 +9357,9 @@ msgstr "" msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "" @@ -9380,7 +9387,7 @@ msgstr "" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "" @@ -9416,7 +9423,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9424,7 +9431,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "" -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "" @@ -9436,7 +9443,7 @@ msgstr "" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "" @@ -9464,11 +9471,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9494,7 +9501,7 @@ msgstr "Kan ikke erklæres tabt, fordi der er afgivet tilbud." msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -9531,7 +9538,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9539,8 +9546,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "" @@ -9584,7 +9591,7 @@ msgstr "" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9602,8 +9609,8 @@ msgstr "" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9619,7 +9626,7 @@ msgstr "" msgid "Cannot set authorization on basis of Discount for {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "" @@ -10530,7 +10537,7 @@ msgstr "" msgid "Closing (Dr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "" @@ -10991,7 +10998,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11273,7 +11280,7 @@ msgstr "Selskab" msgid "Company Abbreviation" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11286,7 +11293,7 @@ msgstr "" msgid "Company Account" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "" @@ -11462,7 +11469,7 @@ msgstr "" msgid "Company is mandatory" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "" @@ -11733,7 +11740,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11746,7 +11753,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11764,13 +11773,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "" @@ -11948,7 +11957,7 @@ msgstr "" msgid "Consumed" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "" @@ -11992,7 +12001,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12165,10 +12174,6 @@ msgstr "" msgid "Contact:" msgstr "Kontakt:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "" - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12346,7 +12351,7 @@ msgstr "" msgid "Conversion Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "" @@ -12618,7 +12623,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12713,7 +12718,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "" @@ -13051,7 +13056,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "" @@ -13424,7 +13429,7 @@ msgstr "" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "" @@ -13565,15 +13570,15 @@ msgstr "" msgid "Credit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "" @@ -13768,7 +13773,7 @@ msgstr "" msgid "Creditors" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14066,7 +14071,7 @@ msgstr "" msgid "Current Serial No" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14267,7 +14272,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15040,7 +15045,7 @@ msgstr "" msgid "Day Of Week" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15156,11 +15161,11 @@ msgstr "" msgid "Debit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "" @@ -15170,7 +15175,7 @@ msgstr "" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "" @@ -15281,7 +15286,7 @@ msgstr "" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15423,7 +15428,7 @@ msgstr "" msgid "Default BOM" msgstr "" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "" @@ -15780,15 +15785,15 @@ msgstr "" msgid "Default Unit of Measure" msgstr "" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "" -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "" @@ -16089,7 +16094,7 @@ msgstr "" msgid "Delivered" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "" @@ -16139,8 +16144,8 @@ msgstr "" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16151,11 +16156,11 @@ msgstr "" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16244,7 +16249,7 @@ msgstr "" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16769,7 +16774,7 @@ msgstr "" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "" @@ -16933,10 +16938,8 @@ msgstr "" msgid "Disable In Words" msgstr "" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' @@ -16978,6 +16981,12 @@ msgstr "" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17034,7 +17043,7 @@ msgstr "" msgid "Disassemble Order" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17559,6 +17568,12 @@ msgstr "" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17649,9 +17664,12 @@ msgstr "" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17669,6 +17687,10 @@ msgstr "" msgid "Document Type already used as a dimension" msgstr "" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -17973,7 +17995,7 @@ msgstr "" msgid "Duplicate Sales Invoices found" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18093,8 +18115,8 @@ msgstr "" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18317,7 +18339,7 @@ msgstr "" msgid "Email Sent to Supplier {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18507,7 +18529,7 @@ msgstr "" msgid "Employee cannot report to himself." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18515,7 +18537,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18528,7 +18550,7 @@ msgstr "" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18571,7 +18593,7 @@ msgstr "" msgid "Enable Auto Email" msgstr "" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "" @@ -19169,7 +19191,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "" @@ -19215,7 +19237,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "" @@ -19244,7 +19266,7 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19603,7 +19625,7 @@ msgstr "" msgid "Expense" msgstr "" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "" @@ -19651,7 +19673,7 @@ msgstr "" msgid "Expense Account" msgstr "" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "" @@ -20114,7 +20136,7 @@ msgstr "" msgid "Filter by Reference Date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20444,7 +20466,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20539,7 +20561,7 @@ msgstr "" msgid "Fiscal Year" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20603,7 +20625,7 @@ msgstr "" msgid "Fixed Asset Defaults" msgstr "" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "" @@ -20753,7 +20775,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20784,7 +20806,7 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "" @@ -20868,6 +20890,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20889,7 +20917,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -20898,7 +20926,7 @@ msgstr "" msgid "For reference" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" @@ -20922,7 +20950,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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -20931,7 +20959,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -21544,7 +21572,7 @@ msgstr "" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21556,7 +21584,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "" @@ -22071,7 +22099,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -22254,7 +22282,7 @@ msgstr "" msgid "Grant Commission" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "" @@ -22895,10 +22923,10 @@ msgstr "" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23053,7 +23081,7 @@ msgstr "" msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23235,7 +23263,7 @@ msgstr "" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23407,11 +23435,11 @@ msgstr "" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "" @@ -23527,7 +23555,7 @@ msgstr "" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23579,7 +23607,7 @@ msgstr "" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "" @@ -23622,7 +23650,7 @@ msgstr "" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23636,6 +23664,7 @@ msgid "Implementation Partner" msgstr "" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -23989,7 +24018,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24243,7 +24272,7 @@ msgstr "" msgid "Incorrect Batch Consumed" msgstr "" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" @@ -24251,7 +24280,7 @@ msgstr "" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "" @@ -24461,14 +24490,14 @@ msgstr "" msgid "Inspected By" msgstr "" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "" @@ -24485,7 +24514,7 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "" @@ -24567,8 +24596,8 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "" @@ -24788,7 +24817,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -24881,7 +24910,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -24911,7 +24940,7 @@ msgstr "" msgid "Invalid Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "" @@ -24997,12 +25026,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25039,7 +25068,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "" @@ -25168,7 +25197,6 @@ msgstr "" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "" @@ -25189,10 +25217,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25714,12 +25738,12 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' @@ -25992,7 +26016,7 @@ msgstr "" msgid "Issuing Date" msgstr "" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" @@ -26062,7 +26086,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26109,6 +26133,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26124,7 +26149,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26888,6 +26912,7 @@ msgstr "" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26898,7 +26923,6 @@ msgstr "" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27158,11 +27182,11 @@ msgstr "" msgid "Item Variant {0} already exists with same attributes" msgstr "" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "" @@ -27201,6 +27225,15 @@ msgstr "" msgid "Item Weight Details" msgstr "" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27230,7 +27263,7 @@ msgstr "" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27250,11 +27283,11 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "" @@ -27284,7 +27317,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27303,10 +27336,14 @@ msgstr "" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27320,7 +27357,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "" @@ -27328,7 +27365,7 @@ msgstr "" msgid "Item {0} does not exist in the system or has expired" msgstr "" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "" @@ -27344,15 +27381,15 @@ msgstr "" msgid "Item {0} has been disabled" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "" @@ -27364,19 +27401,23 @@ msgstr "" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "" @@ -27384,7 +27425,11 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -27400,7 +27445,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27416,7 +27461,7 @@ msgstr "" msgid "Item {0}: {1} qty produced. " msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "" @@ -27526,7 +27571,7 @@ msgstr "" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -28159,7 +28204,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28437,7 +28482,7 @@ msgstr "" msgid "Length (cm)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "" @@ -28578,7 +28623,7 @@ msgstr "" msgid "Linked Location" msgstr "" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "" @@ -28973,11 +29018,6 @@ msgstr "" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -28989,6 +29029,11 @@ msgstr "" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29185,7 +29230,7 @@ msgid "Major/Optional Subjects" msgstr "" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29354,8 +29399,8 @@ msgstr "" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29414,8 +29459,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29564,7 +29609,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "" @@ -29840,7 +29885,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -29911,6 +29956,7 @@ msgstr "" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30017,11 +30063,11 @@ msgstr "" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "" @@ -30136,7 +30182,7 @@ msgstr "" msgid "Material Transferred for Manufacturing" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30265,11 +30311,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -30713,11 +30759,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "" @@ -30755,7 +30801,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "" @@ -30763,11 +30809,11 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30811,10 +30857,6 @@ msgstr "" msgid "Mixed Conditions" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "" - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31083,7 +31125,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:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31162,27 +31204,20 @@ msgstr "" msgid "Naming Series Prefix" msgstr "" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31230,16 +31265,16 @@ msgstr "" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "" @@ -31853,7 +31888,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "" @@ -31866,7 +31901,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "" @@ -31911,7 +31946,7 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "" @@ -31924,7 +31959,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "" @@ -31936,7 +31971,7 @@ msgstr "" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -31944,7 +31979,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32038,7 +32073,7 @@ msgstr "" msgid "No more children on Right" msgstr "" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32213,7 +32248,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32305,7 +32340,7 @@ msgstr "" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "" @@ -32409,7 +32444,7 @@ msgstr "" msgid "Not authorized to edit frozen Account {0}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32455,7 +32490,7 @@ msgstr "" msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "" -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -32932,7 +32967,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33083,7 +33118,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "" @@ -33242,16 +33277,16 @@ msgstr "" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33608,7 +33643,7 @@ msgstr "" msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33742,7 +33777,7 @@ msgstr "" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "" @@ -33950,7 +33985,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34008,7 +34043,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34026,7 +34061,7 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "" @@ -34269,7 +34304,6 @@ msgstr "" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "" @@ -34540,7 +34574,7 @@ msgstr "" msgid "Packed Items" msgstr "" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -34988,7 +35022,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35124,7 +35158,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35250,7 +35284,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35336,7 +35370,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35639,7 +35673,6 @@ msgstr "" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35897,7 +35930,7 @@ msgstr "" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -35976,10 +36009,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -36999,7 +37028,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "" @@ -37031,11 +37060,11 @@ msgstr "" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "" @@ -37055,7 +37084,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -37162,7 +37191,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "" @@ -37231,11 +37260,11 @@ msgstr "" msgid "Please enter Approving Role or Approving User" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "" @@ -37247,7 +37276,7 @@ msgstr "" msgid "Please enter Employee Id of this sales person" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "" @@ -37292,7 +37321,7 @@ msgstr "" msgid "Please enter Root Type for account- {0}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "" @@ -37369,7 +37398,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37483,12 +37512,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "" @@ -37504,13 +37533,13 @@ msgstr "" msgid "Please select Category first" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "" @@ -37519,7 +37548,7 @@ msgstr "" msgid "Please select Company and Posting Date to getting entries" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "" @@ -37568,7 +37597,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "" @@ -37576,11 +37605,11 @@ msgstr "" msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "" @@ -37633,7 +37662,7 @@ msgstr "" msgid "Please select a Supplier" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "" @@ -37694,7 +37723,7 @@ msgstr "" msgid "Please select a supplier for fetching payments." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37714,7 +37743,7 @@ msgstr "" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37821,7 +37850,7 @@ msgstr "" msgid "Please select weekly off day" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "" @@ -37961,7 +37990,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -38005,7 +38034,7 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" @@ -38124,7 +38153,7 @@ msgstr "" msgid "Please specify at least one attribute in the Attributes table" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "" @@ -38295,7 +38324,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38320,7 +38349,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38435,7 +38464,7 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "" @@ -38614,6 +38643,12 @@ msgstr "" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -38907,7 +38942,9 @@ msgstr "" msgid "Price per Unit (Stock UOM)" msgstr "" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40262,6 +40299,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40298,6 +40336,12 @@ msgstr "" msgid "Purchase Invoice Item" msgstr "" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40349,6 +40393,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40358,7 +40403,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40475,7 +40520,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "" @@ -40538,6 +40583,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40552,7 +40598,7 @@ msgstr "" msgid "Purchase Receipt" msgstr "" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40818,7 +40864,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41406,7 +41451,7 @@ msgstr "" msgid "Quality Review Objective" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41467,7 +41512,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41661,7 +41706,7 @@ msgstr "" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "" @@ -41716,7 +41761,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41879,7 +41924,6 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42289,8 +42333,8 @@ msgstr "" msgid "Raw SQL" msgstr "" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42698,11 +42742,10 @@ msgstr "" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43226,7 +43269,7 @@ msgstr "" msgid "Rejected Warehouse" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "" @@ -43276,7 +43319,7 @@ msgid "Remaining Balance" msgstr "" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43330,7 +43373,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43369,7 +43412,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "" @@ -43773,6 +43816,7 @@ msgstr "" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44046,7 +44090,7 @@ msgstr "" msgid "Reserved" msgstr "" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44659,7 +44703,7 @@ msgstr "" msgid "Reversal Of" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "" @@ -44808,10 +44852,7 @@ msgstr "" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "" @@ -44826,8 +44867,11 @@ msgstr "" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45028,8 +45072,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -45056,11 +45100,11 @@ msgstr "" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45086,7 +45130,7 @@ msgstr "" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "" @@ -45287,7 +45331,7 @@ msgstr "" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -45347,7 +45391,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45375,7 +45419,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "" @@ -45428,7 +45472,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "" @@ -45453,7 +45497,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "" @@ -45479,15 +45523,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45518,11 +45562,11 @@ msgstr "" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "" @@ -45565,7 +45609,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "" @@ -45613,11 +45657,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45670,11 +45714,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "" -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "" @@ -45702,7 +45746,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "" @@ -45738,23 +45782,23 @@ msgstr "" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45762,7 +45806,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45827,7 +45871,7 @@ msgstr "" msgid "Row #{}: {} {} does not exist." msgstr "" -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" @@ -45843,7 +45887,7 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -45875,7 +45919,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:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -45933,7 +45977,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "" @@ -45974,7 +46018,7 @@ msgstr "" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -46098,7 +46142,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "" @@ -46110,11 +46154,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:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -46138,7 +46182,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:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46191,7 +46235,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:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -46221,7 +46265,7 @@ msgstr "" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" @@ -46287,7 +46331,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46584,7 +46628,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46758,7 +46802,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46881,8 +46925,8 @@ msgstr "" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47293,7 +47337,7 @@ msgstr "" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "" @@ -47330,7 +47374,7 @@ msgstr "" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -47619,7 +47663,7 @@ msgstr "" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47764,7 +47808,7 @@ msgstr "" msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "" @@ -48459,7 +48503,7 @@ msgstr "" msgid "Serial No Reserved" msgstr "" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48520,7 +48564,7 @@ msgstr "" msgid "Serial No is mandatory for Item {0}" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "" @@ -48806,7 +48850,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48832,7 +48876,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49230,12 +49274,6 @@ msgstr "" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "" @@ -49341,6 +49379,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "" @@ -49839,7 +49883,7 @@ msgstr "" msgid "Show Barcode Field in Stock Transactions" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "" @@ -49847,7 +49891,7 @@ msgstr "" msgid "Show Completed" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -49930,7 +49974,7 @@ msgstr "" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "" @@ -49942,7 +49986,7 @@ msgstr "" msgid "Show Open" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "" @@ -49955,11 +49999,6 @@ msgstr "" msgid "Show Operations" msgstr "" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "" @@ -49975,7 +50014,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "" @@ -50042,6 +50081,11 @@ msgstr "" msgid "Show only the Immediate Upcoming Term" msgstr "" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "" @@ -50328,11 +50372,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50398,7 +50442,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "" @@ -50412,8 +50456,8 @@ msgid "Source of Funds (Liabilities)" msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "" @@ -50578,8 +50622,8 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "" @@ -50912,7 +50956,7 @@ msgstr "" msgid "Stock Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -51183,7 +51227,7 @@ msgstr "" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51195,7 +51239,7 @@ msgstr "" msgid "Stock Reconciliation Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "" @@ -51233,7 +51277,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51261,7 +51305,7 @@ msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "" @@ -51643,7 +51687,7 @@ msgstr "" #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "" @@ -51721,10 +51765,6 @@ msgstr "" msgid "Sub Procedure" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -51941,7 +51981,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -51967,7 +52007,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "" @@ -52056,7 +52096,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "" @@ -52231,7 +52271,7 @@ msgstr "" msgid "Successfully Set Supplier" msgstr "" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "" @@ -52387,6 +52427,7 @@ msgstr "" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52428,8 +52469,8 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52477,6 +52518,12 @@ msgstr "" msgid "Supplier Contact" msgstr "" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52571,7 +52618,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "" @@ -52851,19 +52898,10 @@ msgstr "" msgid "Supplier {0} not found in {1}" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -52925,7 +52963,7 @@ msgstr "" msgid "Support Tickets" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53184,8 +53222,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "" @@ -53653,7 +53691,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "" @@ -53814,7 +53852,7 @@ msgstr "" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "" @@ -54004,7 +54042,6 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54196,7 +54233,7 @@ msgstr "" msgid "The BOM which will be replaced" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54240,7 +54277,7 @@ msgstr "" msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54256,7 +54293,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "" @@ -54292,7 +54329,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54398,7 +54435,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "" @@ -54442,15 +54479,15 @@ msgstr "" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54606,7 +54643,7 @@ msgstr "" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "" @@ -54628,11 +54665,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -54704,7 +54741,7 @@ msgstr "" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54757,7 +54794,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54801,7 +54838,7 @@ msgstr "" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54857,11 +54894,11 @@ msgstr "" msgid "This Month's Summary" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55662,7 +55699,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "" @@ -55697,7 +55734,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "" @@ -55848,7 +55885,7 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "" @@ -56271,7 +56308,7 @@ msgstr "" msgid "Total Payments" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56303,7 +56340,7 @@ msgstr "" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "" @@ -56689,7 +56726,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56700,7 +56737,7 @@ msgstr "" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "" @@ -57372,11 +57409,11 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57448,7 +57485,7 @@ msgstr "" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57524,7 +57561,7 @@ msgstr "" msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "" @@ -57643,7 +57680,7 @@ msgstr "" msgid "Unit of Measure (UOM)" msgstr "" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "" @@ -57763,10 +57800,9 @@ msgid "Unreconcile Transaction" msgstr "" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "" @@ -57789,10 +57825,6 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57838,7 +57870,7 @@ msgstr "" msgid "Unsecured Loans" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58053,12 +58085,6 @@ msgstr "" msgid "Update Type" msgstr "" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58099,7 +58125,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "" @@ -58557,12 +58583,6 @@ msgstr "" msgid "Validate Components and Quantities Per BOM" msgstr "" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58586,6 +58606,12 @@ msgstr "" msgid "Validate Stock on Save" msgstr "" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58692,11 +58718,11 @@ msgstr "" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "" -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "" @@ -58706,7 +58732,7 @@ msgstr "" msgid "Valuation and Total" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "" @@ -58856,7 +58882,7 @@ msgstr "" msgid "Variant" msgstr "" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "" @@ -58875,7 +58901,7 @@ msgstr "" msgid "Variant Based On" msgstr "" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "" @@ -58893,7 +58919,7 @@ msgstr "" msgid "Variant Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "" @@ -59274,7 +59300,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:41 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:33 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:65 @@ -59314,7 +59340,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "" @@ -59346,7 +59372,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59581,7 +59607,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "" @@ -59628,7 +59654,7 @@ msgstr "" #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59684,6 +59710,12 @@ msgstr "" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" @@ -59867,7 +59899,7 @@ msgstr "" msgid "Website:" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60241,7 +60273,7 @@ msgstr "" msgid "Work Order Item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60303,11 +60335,11 @@ msgstr "" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "" @@ -60623,11 +60655,11 @@ msgstr "" msgid "Year Start Date" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60680,7 +60712,7 @@ msgstr "" msgid "You can also set default CWIP account in Company {}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60834,6 +60866,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60862,7 +60898,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60870,7 +60906,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "" @@ -60941,8 +60977,11 @@ msgstr "" msgid "Zero quantity" msgstr "" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61054,7 +61093,7 @@ msgstr "" msgid "fieldname" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61272,6 +61311,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "" @@ -61330,7 +61373,8 @@ msgstr "" msgid "{0} Digest" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61350,7 +61394,7 @@ msgstr "" msgid "{0} Request for {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "" @@ -61463,7 +61507,7 @@ msgid "{0} entered twice in Item Tax" msgstr "" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "" @@ -61631,7 +61675,7 @@ msgstr "" msgid "{0} payment entries can not be filtered by {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61644,7 +61688,7 @@ msgstr "{0} til {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" @@ -61846,7 +61890,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -61932,23 +61976,23 @@ msgstr "" msgid "{0}: {1} is a group account." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "" -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" diff --git a/erpnext/locale/de.po b/erpnext/locale/de.po index 3d32e668788..ff3fbb0e653 100644 --- a/erpnext/locale/de.po +++ b/erpnext/locale/de.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:20\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:20\n" "Last-Translator: hello@frappe.io\n" "Language-Team: German\n" "MIME-Version: 1.0\n" @@ -100,15 +100,15 @@ msgstr " Unterbaugruppe" msgid " Summary" msgstr " Zusammenfassung" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"Vom Kunden beigestellter Artikel\" kann nicht gleichzeitig \"Einkaufsartikel\" sein" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"Vom Kunden beigestellter Artikel\" kann keinen Bewertungssatz haben" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "\"Ist Anlagevermögen\" kann nicht deaktiviert werden, da Anlagebuchung für den Artikel vorhanden" @@ -307,7 +307,7 @@ msgstr "\"Von-Datum\" ist erforderlich" msgid "'From Date' must be after 'To Date'" msgstr "\"Von-Datum\" muss nach \"Bis-Datum\" liegen" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "„Hat Seriennummer“ kann für Artikel ohne Lagerhaltung nicht aktiviert werden" @@ -343,7 +343,7 @@ msgstr "\"Lager aktualisieren\" kann nicht ausgewählt werden, da Artikel nicht msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "„Lagerbestand aktualisieren“ kann für den Verkauf von Anlagevermögen nicht aktiviert werden" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "Das Konto '{0}' wird bereits von {1} verwendet. Verwenden Sie ein anderes Konto." @@ -1104,7 +1104,7 @@ msgstr "Ein Fahrer muss zum Buchen angegeben werden." msgid "A logical Warehouse against which stock entries are made." msgstr "Ein logisches Lager, gegen das Bestandsbuchungen vorgenommen werden." -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "Beim Erstellen von Seriennummern ist ein Namensreihen-Konflikt aufgetreten. Bitte ändern Sie die Namensreihe für den Artikel {0}." @@ -1316,7 +1316,7 @@ msgstr "Zugangsschlüssel ist erforderlich für Dienstanbieter: {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "Gemäß CEFACT/ICG/2010/IC013 oder CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "Laut Stückliste {0} fehlt in der Lagerbuchung die Position '{1}'." @@ -1986,8 +1986,8 @@ msgstr "Buchungen" msgid "Accounting Entry for Asset" msgstr "Buchungseintrag für Vermögenswert" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "Buchhaltungseintrag für Einstandskostenbeleg in Lagerbuchung {0}" @@ -1995,7 +1995,7 @@ msgstr "Buchhaltungseintrag für Einstandskostenbeleg in Lagerbuchung {0}" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "Buchhaltungseintrag für Einstandkostenbeleg für Wareneingang aus Fremdvergabe {0}" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Buchhaltungseintrag für Service" @@ -2008,16 +2008,16 @@ msgstr "Buchhaltungseintrag für Service" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Lagerbuchung" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "Buchungen für {0}" @@ -2315,12 +2315,6 @@ msgstr "Maßnahmen bei Nichtvorlage der Qualitätsprüfung" msgid "Action If Quality Inspection Is Rejected" msgstr "Maßnahmen bei Ablehnung der Qualitätsprüfung" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "Maßnahmen, wenn derselbe Preis nicht beibehalten wird" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "Aktion initialisiert" @@ -2379,6 +2373,12 @@ msgstr "Maßnahmen bei Überschreitung des Jahresbudgets für kumulierte Ausgabe msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "Maßnahmen, wenn derselbe Preis nicht während des gesamten Verkaufszyklus beibehalten wird" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2646,7 +2646,7 @@ msgstr "IST- Zeit in Stunden (aus Zeiterfassung)" msgid "Actual qty in stock" msgstr "Ist-Menge auf Lager" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "Tatsächliche Steuerart kann nicht im Artikelpreis in Zeile {0} beinhaltet sein" @@ -2660,7 +2660,7 @@ msgstr "Ad-hoc Menge" msgid "Add / Edit Prices" msgstr "Preise hinzufügen / bearbeiten" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "Spalten in Transaktionswährung hinzufügen" @@ -2814,7 +2814,7 @@ msgstr "Serien-/Chargennummer hinzufügen" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "Serien-/Chargennummer hinzufügen (Abgelehnte Menge)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -3059,7 +3059,7 @@ msgstr "Zusätzlicher Rabattbetrag" msgid "Additional Discount Amount (Company Currency)" msgstr "Zusätzlicher Rabattbetrag (Unternehmenswährung)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "Der zusätzliche Rabattbetrag ({discount_amount}) darf die Summe vor diesem Rabatt ({total_before_discount}) nicht überschreiten" @@ -3348,7 +3348,7 @@ msgstr "Menge anpassen" msgid "Adjustment Against" msgstr "Anpassung gegen" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "Anpassung basierend auf dem Rechnungspreis" @@ -3461,7 +3461,7 @@ msgstr "Vorschuss-Belegart" msgid "Advance amount" msgstr "Anzahlungsbetrag" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Anzahlung kann nicht größer sein als {0} {1}" @@ -3530,7 +3530,7 @@ msgstr "Zu" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Gegenkonto" @@ -3648,7 +3648,7 @@ msgstr "Gegen Lieferantenrechnung {0}" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "Gegenbeleg" @@ -3672,7 +3672,7 @@ msgstr "Belegnr." #: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "Gegen Belegart" @@ -3953,7 +3953,7 @@ msgstr "Alle Mitteilungen einschließlich und darüber sollen in die neue Anfrag msgid "All items are already requested" msgstr "Alle Artikel sind bereits angefordert" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "Alle Artikel wurden bereits in Rechnung gestellt / zurückgesandt" @@ -3961,7 +3961,7 @@ msgstr "Alle Artikel wurden bereits in Rechnung gestellt / zurückgesandt" msgid "All items have already been received" msgstr "Alle Artikel sind bereits eingegangen" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Alle Positionen wurden bereits für diesen Arbeitsauftrag übertragen." @@ -4010,7 +4010,7 @@ msgstr "Zuweisen" msgid "Allocate Advances Automatically (FIFO)" msgstr "Zuweisungen automatisch zuordnen (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Zahlungsbetrag zuweisen" @@ -4020,7 +4020,7 @@ msgstr "Zahlungsbetrag zuweisen" msgid "Allocate Payment Based On Payment Terms" msgstr "Ordnen Sie die Zahlung basierend auf den Zahlungsbedingungen zu" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "Zahlungsanfrage zuweisen" @@ -4050,7 +4050,7 @@ msgstr "Zugewiesen" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4171,15 +4171,15 @@ msgstr "Rückgabe zulassen" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "Interne Übertragungen zum Fremdvergleichspreis zulassen" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "Zulassen, dass ein Element in einer Transaktion mehrmals hinzugefügt wird" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "Mehrfaches Hinzufügen von Artikeln in einer Transaktion zulassen" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4208,12 +4208,6 @@ msgstr "Negativen Lagerbestand zulassen" msgid "Allow Negative Stock for Batch" msgstr "Negativen Bestand für Chargen zulassen" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "Negative Preise für Artikel zulassen" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4426,8 +4420,11 @@ msgstr "Rechnungswährung darf sich von Kontowährung unterscheiden" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4519,7 +4516,7 @@ msgstr "Erlaubt Transaktionen mit" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "Zulässige Hauptrollen sind „Kunde“ und „Lieferant“. Bitte wählen Sie nur eine dieser Rollen aus." -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4716,7 +4713,7 @@ msgstr "Immer fragen" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4746,7 +4743,6 @@ msgstr "Immer fragen" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4916,10 +4912,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "Betrag in Kontowährung" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "Betrag in Worten" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5539,7 +5531,7 @@ msgstr "Da das Feld {0} aktiviert ist, ist das Feld {1} obligatorisch." msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "Wenn das Feld {0} aktiviert ist, sollte der Wert des Feldes {1} größer als 1 sein." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "Da es bereits gebuchte Transaktionen für den Artikel {0} gibt, können Sie den Wert von {1} nicht ändern." @@ -5689,7 +5681,7 @@ msgstr "Vermögensgegenstand-Kategorie Konto" msgid "Asset Category Name" msgstr "Name der Anlagenkategorie" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "Vermögensgegenstand-Kategorie ist obligatorisch für Artikel des Anlagevermögens" @@ -6085,7 +6077,7 @@ msgstr "Der Vermögensgegenstand {0} ist nicht gebucht. Bitte buchen Sie den Ver msgid "Asset {0} must be submitted" msgstr "Vermögensgegenstand {0} muss gebucht werden" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "Vermögensgegenstand {assets_link} erstellt für {item_code}" @@ -6123,11 +6115,11 @@ msgstr "Vermögenswerte" msgid "Assets Setup" msgstr "Anlageneinrichtung" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "Assets nicht für {item_code} erstellt. Sie müssen das Asset manuell erstellen." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "Vermögensgegenstände {assets_link} erstellt für {item_code}" @@ -6200,7 +6192,7 @@ msgstr "Mindestens ein Rohmaterial-Artikel muss in der Lagerbuchung für den Typ msgid "At least one row is required for a financial report template" msgstr "Mindestens eine Zeile ist für eine Finanzberichtsvorlage erforderlich" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "Mindestens ein Lager ist obligatorisch" @@ -6232,7 +6224,7 @@ msgstr "In der Zeile {0}: Menge ist obligatorisch für die Charge {1}" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "In Zeile {0}: Seriennummer ist obligatorisch für Artikel {1}" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "In Zeile {0}: Serien- und Chargenbündel {1} wurde bereits erstellt. Bitte entfernen Sie die Werte aus den Feldern Seriennummer oder Chargennummer." @@ -6296,7 +6288,11 @@ msgstr "Attributname" msgid "Attribute Value" msgstr "Attributwert" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "Attributtabelle ist obligatorisch" @@ -6304,11 +6300,19 @@ msgstr "Attributtabelle ist obligatorisch" msgid "Attribute value: {0} must appear only once" msgstr "Attributwert: {0} darf nur einmal vorkommen" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "Attribut {0} mehrfach in der Attributtabelle ausgewählt" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Attribute" @@ -6368,24 +6372,12 @@ msgstr "Autorisierter Wert" msgid "Auto Create Exchange Rate Revaluation" msgstr "Wechselkursneubewertung automatisch erstellen" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "Eingangsbeleg automatisch erstellen" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "Seriennummern und Chargenbündel für den Ausgang automatisch erstellen" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "Unterauftrag automatisch erstellen" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6504,6 +6496,18 @@ msgstr "Fehler bei automatischer Benutzererstellung" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "Automatische Schließung der beantworteten Chance nach der oben genannten Anzahl von Tagen" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6721,7 +6725,7 @@ msgstr "Verfügbar ab Datum" msgid "Available for use date is required" msgstr "Verfügbar für das Nutzungsdatum ist erforderlich" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "Die verfügbare Menge ist {0}. Sie benötigen {1}." @@ -6820,7 +6824,7 @@ msgstr "Breitensuche" msgid "BIN Qty" msgstr "BIN Menge" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7093,7 +7097,7 @@ msgstr "Stückliste Webseitenartikel" msgid "BOM Website Operation" msgstr "Stückliste Webseite Vorgang" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "Stückliste und Menge des Fertigprodukts sind für die Demontage erforderlich" @@ -7184,8 +7188,8 @@ msgstr "Rückmeldung von Rohstoffen aus dem Work-in-Progress-Warehouse" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "Rückmeldung der Rohmaterialien des Untervertrages basierend auf" +msgid "Backflush raw materials of subcontract based on" +msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7205,7 +7209,7 @@ msgstr "Saldo" msgid "Balance (Dr - Cr)" msgstr "Saldo (S - H)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Saldo ({0})" @@ -7736,11 +7740,11 @@ msgstr "Bankwesen" msgid "Barcode Type" msgstr "Barcode-Typ" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "Barcode {0} wird bereits für Artikel {1} verwendet" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "Der Barcode {0} ist kein gültiger {1} Code" @@ -8107,12 +8111,12 @@ msgstr "Charge {0} und Lager" msgid "Batch {0} is not available in warehouse {1}" msgstr "Charge {0} ist im Lager {1} nicht verfügbar" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "Die Charge {0} des Artikels {1} ist abgelaufen." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "Charge {0} von Artikel {1} ist deaktiviert." @@ -8185,8 +8189,8 @@ msgstr "Rechnungsnr." #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "Rechnung für abgelehnte Menge in der Eingangsrechnung" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8526,8 +8530,11 @@ msgstr "Rahmenauftragsposition" msgid "Blanket Order Rate" msgstr "Rahmenauftrag Preis" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -9042,7 +9049,7 @@ msgstr "Kaufen und Verkaufen" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "Einkauf muss ausgewählt sein, wenn \"Anwenden auf\" auf {0} gesetzt wurde" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "Standardmäßig wird die ID des Lieferanten basierend auf dem eingegebenen Lieferantennamen festgelegt. Wenn Sie möchten, dass Lieferanten nach einem Nummernkreis benannt werden, wählen Sie die Option 'Nummernkreis'." @@ -9407,7 +9414,7 @@ msgstr "Kann nicht nach Belegnummer filtern, wenn nach Beleg gruppiert" msgid "Can only make payment against unbilled {0}" msgstr "Zahlung kann nur zu einem noch nicht abgerechneten Beleg vom Typ {0} erstellt werden" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9463,9 +9470,9 @@ msgstr "Einstellung des Bestandskontos kann nicht geändert werden" msgid "Cannot Create Return" msgstr "Retoure kann nicht erstellt werden" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "Zusammenführung nicht möglich" @@ -9493,7 +9500,7 @@ msgstr "{0} {1} kann nicht berichtigt werden. Bitte erstellen Sie stattdessen ei msgid "Cannot apply TDS against multiple parties in one entry" msgstr "Quellensteuer (TDS) kann nicht auf mehrere Parteien in einer Buchung angewendet werden" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "Kann keine Anlageposition sein, wenn das Stock Ledger erstellt wird." @@ -9529,7 +9536,7 @@ msgstr "Diese Fertigungslagerbuchung kann nicht storniert werden, da die Menge d msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "Dieses Dokument kann nicht storniert werden, da es mit der gebuchten Anpassung des Vermögenswerts {0} verknüpft ist. Bitte stornieren Sie die Anpassung des Vermögenswerts, um fortzufahren." -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "Dieses Dokument kann nicht storniert werden, da es mit dem gebuchten Vermögensgegenstand {asset_link} verknüpft ist. Bitte stornieren Sie den Vermögensgegenstand, um fortzufahren." @@ -9537,7 +9544,7 @@ msgstr "Dieses Dokument kann nicht storniert werden, da es mit dem gebuchten Ver msgid "Cannot cancel transaction for Completed Work Order." msgstr "Die Transaktion für den abgeschlossenen Arbeitsauftrag kann nicht storniert werden." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "Attribute können nach einer Buchung nicht mehr geändert werden. Es muss ein neuer Artikel erstellt und der Bestand darauf übertragen werden." @@ -9549,7 +9556,7 @@ msgstr "Der Referenzdokumenttyp kann nicht geändert werden." msgid "Cannot change Service Stop Date for item in row {0}" msgstr "Das Servicestoppdatum für das Element in der Zeile {0} kann nicht geändert werden" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "Die Eigenschaften der Variante können nach der Buchung nicht mehr verändert werden. Hierzu muss ein neuer Artikel erstellt werden." @@ -9577,11 +9584,11 @@ msgstr "Kann nicht in eine Gruppe umgewandelt werden, weil Kontentyp ausgewählt msgid "Cannot covert to Group because Account Type is selected." msgstr "Kann nicht in eine Gruppe umgewandelt werden, weil Kontentyp ausgewählt ist." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "Für in der Zukunft datierte Kaufbelege kann keine Bestandsreservierung erstellt werden." -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "Es kann keine Pickliste für den Auftrag {0} erstellt werden, da dieser einen reservierten Bestand hat. Bitte heben Sie die Reservierung des Bestands auf, um eine Pickliste zu erstellen." @@ -9607,7 +9614,7 @@ msgstr "Kann nicht als verloren deklariert werden, da bereits ein Angebot erstel msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "Abzug nicht möglich, wenn Kategorie \"Wertbestimmtung\" oder \"Wertbestimmung und Summe\" ist" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "Zeile „Wechselkursgewinn/-verlust“ kann nicht gelöscht werden" @@ -9644,7 +9651,7 @@ msgstr "{0} kann nicht deaktiviert werden, da dies zu einer fehlerhaften Lagerbe msgid "Cannot disassemble more than produced quantity." msgstr "Es kann nicht mehr als die produzierte Menge zerlegt werden." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9652,8 +9659,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "Artikelbezogenes Bestandskonto kann nicht aktiviert werden, da für das Unternehmen {0} bereits Lagerbucheinträge mit lagerbezogenem Bestandskonto vorhanden sind. Bitte stornieren Sie zuerst die Lagertransaktionen und versuchen Sie es erneut." -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "Die Lieferung per Seriennummer kann nicht sichergestellt werden, da Artikel {0} mit und ohne Lieferung per Seriennummer hinzugefügt wird." @@ -9697,7 +9704,7 @@ msgstr "Negativer Gesamtbetrag kann nicht vom Kunden empfangen werden" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "Die Menge kann nicht unter die bestellte oder eingekaufte Menge reduziert werden" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9715,8 +9722,8 @@ msgstr "Link-Token kann nicht abgerufen werden. Prüfen Sie das Fehlerprotokoll msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "Eine Kundengruppe vom Typ Gruppe kann nicht ausgewählt werden. Bitte wählen Sie eine Kundengruppe ohne Gruppentyp." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9732,7 +9739,7 @@ msgstr "Kann nicht als verloren gekennzeichnet werden, da ein Auftrag dazu exist msgid "Cannot set authorization on basis of Discount for {0}" msgstr "Genehmigung kann nicht auf der Basis des Rabattes für {0} festgelegt werden" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "Es können nicht mehrere Artikelstandards für ein Unternehmen festgelegt werden." @@ -10643,7 +10650,7 @@ msgstr "Schlußstand (Haben)" msgid "Closing (Dr)" msgstr "Schlußstand (Soll)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "Schließen (Eröffnung + Gesamt)" @@ -11104,7 +11111,7 @@ msgstr "Firmen" #: 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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11386,7 +11393,7 @@ msgstr "Unternehmen" msgid "Company Abbreviation" msgstr "Unternehmenskürzel" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11399,7 +11406,7 @@ msgstr "Firmenkürzel darf nicht mehr als 5 Zeichen haben" msgid "Company Account" msgstr "Firmenkonto" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "Unternehmenskonto ist erforderlich" @@ -11575,7 +11582,7 @@ msgstr "Unternehmensfilter nicht gesetzt!" msgid "Company is mandatory" msgstr "Unternehmen ist obligatorisch" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "Wenn das Konto zu einem Unternehmen gehört, muss es einem Unternehmen zugeordnet werden" @@ -11846,7 +11853,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11859,7 +11866,9 @@ msgstr "Kontenplan konfigurieren" msgid "Configure Product Assembly" msgstr "Produktmontage konfigurieren" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11877,13 +11886,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "Konfigurieren Sie die Aktion, um die Transaktion zu stoppen oder nur zu warnen, wenn derselbe Einzelpreis nicht beibehalten wird." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "Konfigurieren Sie die Standardpreisliste beim Erstellen einer neuen Kauftransaktion. Artikelpreise werden aus dieser Preisliste abgerufen." @@ -12061,7 +12070,7 @@ msgstr "" msgid "Consumed" msgstr "Verbraucht" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "Verbrauchte Menge" @@ -12105,7 +12114,7 @@ msgstr "Kosten für verbrauchte Artikel" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12278,10 +12287,6 @@ msgstr "Die Kontaktperson gehört nicht zu {0}" msgid "Contact:" msgstr "Kontakt:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Kontakt: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12459,7 +12464,7 @@ msgstr "Umrechnungsfaktor" msgid "Conversion Rate" msgstr "Wechselkurs" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein" @@ -12731,7 +12736,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12826,7 +12831,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht" @@ -13164,7 +13169,7 @@ msgstr "Fertigerzeugnisse erstellen" msgid "Create Grouped Asset" msgstr "Gruppierte Anlage erstellen" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "Erstellen Sie einen unternehmensübergreifenden Buchungssatz" @@ -13537,7 +13542,7 @@ msgstr "{0} {1} erstellen?" msgid "Created By Migration" msgstr "Durch Migration erstellt" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "Erstellte {0} Bewertungsliste für {1} zwischen:" @@ -13680,15 +13685,15 @@ msgstr "Erstellung von {0} teilweise erfolgreich.\n" msgid "Credit" msgstr "Haben" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "Haben (Transaktion)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "Guthaben ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "Guthabenkonto" @@ -13883,7 +13888,7 @@ msgstr "Kreditorenumschlagsquote" msgid "Creditors" msgstr "Gläubiger" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14181,7 +14186,7 @@ msgstr "Aktuelles Serien-/Chargen-Bündel" msgid "Current Serial No" msgstr "Aktuelle Seriennummer" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14382,7 +14387,7 @@ msgstr "Benutzerdefinierte Trennzeichen" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15155,7 +15160,7 @@ msgstr "Zu verarbeitende Daten" msgid "Day Of Week" msgstr "Wochentag" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15271,11 +15276,11 @@ msgstr "Händler" msgid "Debit" msgstr "Soll" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "Soll (Transaktion)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "Soll ({0})" @@ -15285,7 +15290,7 @@ msgstr "Soll ({0})" msgid "Debit / Credit Note Posting Date" msgstr "Buchungsdatum der Lastschrift-/Gutschrift" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "Sollkonto" @@ -15396,7 +15401,7 @@ msgstr "Soll-Haben-Diskrepanz" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15538,7 +15543,7 @@ msgstr "Standard-Fälligkeitsbereich" msgid "Default BOM" msgstr "Standardstückliste" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "Standardstückliste ({0}) muss für diesen Artikel oder dessen Vorlage aktiv sein" @@ -15895,15 +15900,15 @@ msgstr "Standardregion" msgid "Default Unit of Measure" msgstr "Standardmaßeinheit" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "Die Standardmaßeinheit für Artikel {0} kann nicht direkt geändert werden, da bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt wurden. Sie können entweder die verknüpften Dokumente stornieren oder einen neuen Artikel erstellen." -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "Die Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil Sie bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt haben. Sie müssen einen neuen Artikel erstellen, um eine andere Standard-Maßeinheit verwenden zukönnen." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein" @@ -16204,7 +16209,7 @@ msgstr "" msgid "Delivered" msgstr "Geliefert" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Gelieferte Menge" @@ -16254,8 +16259,8 @@ msgstr "Gelieferte Artikel, die abgerechnet werden müssen" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16266,11 +16271,11 @@ msgstr "Gelieferte Stückzahl" msgid "Delivered Qty (in Stock UOM)" msgstr "Kommissionierte Menge (in Lager ME)" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16359,7 +16364,7 @@ msgstr "Auslieferungsmanager" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16884,7 +16889,7 @@ msgstr "Differenzkonto in der Artikeltabelle" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto (Vorläufige Eröffnung) sein, da diese Lagerbewegung eine Eröffnungsbuchung ist" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist" @@ -17048,11 +17053,9 @@ msgstr "Kumulierten Schwellenwert deaktivieren" msgid "Disable In Words" msgstr "\"Betrag in Worten\" abschalten" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "Letzten Kaufpreis deaktivieren" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17093,6 +17096,12 @@ msgstr "Selektor für Seriennummer und Chargen deaktivieren" msgid "Disable Transaction Threshold" msgstr "Transaktionsschwellenwert deaktivieren" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17149,7 +17158,7 @@ msgstr "Demontage" msgid "Disassemble Order" msgstr "Demontageauftrag" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "Demontage-Menge darf nicht kleiner oder gleich 0 sein." @@ -17674,6 +17683,12 @@ msgstr "Keine chargenweise Bewertung verwenden" msgid "Do Not Use Batchwise Valuation" msgstr "Chargenweise Bewertung nicht verwenden" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17764,9 +17779,12 @@ msgstr "Google Docs-Suche" msgid "Document Count" msgstr "Dokumentenanzahl" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17784,6 +17802,10 @@ msgstr "Art des Dokuments" msgid "Document Type already used as a dimension" msgstr "Dokumenttyp wird bereits als Dimension verwendet" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "Dokumentation" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18088,7 +18110,7 @@ msgstr "Projekt mit Aufgaben duplizieren" msgid "Duplicate Sales Invoices found" msgstr "Doppelte Ausgangsrechnungen gefunden" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "Fehler: Doppelte Seriennummer" @@ -18208,8 +18230,8 @@ msgstr "ERPNext-Benutzer-ID" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18432,7 +18454,7 @@ msgstr "Quittung per E-Mail senden" msgid "Email Sent to Supplier {0}" msgstr "E-Mail an Lieferanten gesendet {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "E-Mail ist erforderlich, um einen Benutzer zu erstellen" @@ -18622,7 +18644,7 @@ msgstr "Benutzer-ID des Mitarbeiters" msgid "Employee cannot report to himself." msgstr "Mitarbeiter können nicht an sich selbst Bericht erstatten" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "Mitarbeiter ist erforderlich" @@ -18630,7 +18652,7 @@ msgstr "Mitarbeiter ist erforderlich" msgid "Employee is required while issuing Asset {0}" msgstr "Mitarbeiter wird bei der Ausstellung des Vermögenswerts {0} benötigt" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "Mitarbeiter {0} hat bereits einen verknüpften Benutzer" @@ -18643,7 +18665,7 @@ msgstr "Mitarbeiter {0} gehört nicht zum Unternehmen {1}" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "Der Mitarbeiter {0} arbeitet derzeit an einem anderen Arbeitsplatz. Bitte weisen Sie einen anderen Mitarbeiter zu." -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "Mitarbeiter {0} nicht gefunden" @@ -18686,7 +18708,7 @@ msgstr "Terminplanung aktivieren" msgid "Enable Auto Email" msgstr "Aktivieren Sie die automatische E-Mail" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "Aktivieren Sie die automatische Nachbestellung" @@ -19287,7 +19309,7 @@ msgstr "Fehler: Für diese Sachanlage sind bereits {0} Abschreibungszeiträume g "\t\t\t\t\tDas Datum „Abschreibungsbeginn“ muss mindestens {1} Zeiträume nach dem Datum „Zeitpunkt der Einsatzbereitschaft“ liegen.\n" "\t\t\t\t\tBitte korrigieren Sie die Daten entsprechend." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "Fehler: {0} ist ein Pflichtfeld" @@ -19333,7 +19355,7 @@ msgstr "Ab Werk" msgid "Example URL" msgstr "Beispiel URL" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "Beispiel für ein verknüpftes Dokument: {0}" @@ -19363,7 +19385,7 @@ msgstr "Beispiel: Seriennummer {0} reserviert in {1}." msgid "Exception Budget Approver Role" msgstr "Ausnahmegenehmigerrolle" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19722,7 +19744,7 @@ msgstr "Erwartungswert nach der Ausmusterung" msgid "Expense" msgstr "Aufwand" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "Aufwands-/Differenz-Konto ({0}) muss ein \"Gewinn oder Verlust\"-Konto sein" @@ -19770,7 +19792,7 @@ msgstr "Aufwands-/Differenz-Konto ({0}) muss ein \"Gewinn oder Verlust\"-Konto s msgid "Expense Account" msgstr "Aufwandskonto" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "Spesenabrechnung fehlt" @@ -20233,7 +20255,7 @@ msgstr "Gesamtmenge filtern" msgid "Filter by Reference Date" msgstr "Nach Referenzdatum filtern" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20563,7 +20585,7 @@ msgstr "Fertigwarenlager" msgid "Finished Goods based Operating Cost" msgstr "Auf Fertigerzeugnissen basierende Betriebskosten" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "Fertigerzeugnis {0} stimmt nicht mit dem Arbeitsauftrag {1} überein" @@ -20658,7 +20680,7 @@ msgstr "Das Steuerregime ist obligatorisch. Bitte legen Sie das Steuerregime im msgid "Fiscal Year" msgstr "Geschäftsjahr" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20722,7 +20744,7 @@ msgstr "Konto für Anlagevermögen" msgid "Fixed Asset Defaults" msgstr " Standards für Anlagevermögen" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "Posten des Anlagevermögens muss ein Artikel ohne Lagerhaltung sein." @@ -20872,7 +20894,7 @@ msgstr "Für Unternehmen" msgid "For Item" msgstr "Für Artikel" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "Für Artikel {0} können nicht mehr als {1} ME gegen {2} {3} in Empfang genommen werden" @@ -20903,7 +20925,7 @@ msgstr "Für Preisliste" msgid "For Production" msgstr "Für die Produktion" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "Für Menge (hergestellte Menge) ist zwingend erforderlich" @@ -20987,6 +21009,12 @@ msgstr "Für Artikel {0} wurden nur {1} Anlagevermögen erstellt o msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "Für den Artikel {0} muss der Einzelpreis eine positive Zahl sein. Um negative Einzelpreise zuzulassen, aktivieren Sie {1} in {2}" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "Für den Vorgang {0} in Zeile {1} bitte Rohmaterialien hinzufügen oder eine Stückliste dafür festlegen." @@ -21008,7 +21036,7 @@ msgstr "Für Projekt - {0}, aktualisieren Sie Ihren Status" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "Für projizierte und prognostizierte Mengen berücksichtigt das System alle untergeordneten Lager unter dem ausgewählten übergeordneten Lager." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "Denn die Menge {0} darf nicht größer sein als die zulässige Menge {1}" @@ -21017,7 +21045,7 @@ msgstr "Denn die Menge {0} darf nicht größer sein als die zulässige Menge {1} msgid "For reference" msgstr "Zu Referenzzwecken" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "Für Zeile {0} in {1}. Um {2} in die Artikel-Bewertung mit einzubeziehen, muss auch Zeile {3} mit enthalten sein" @@ -21041,7 +21069,7 @@ msgstr "Für die Bedingung 'Regel auf andere anwenden' ist das Feld {0} msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "Zur Vereinfachung für Kunden können diese Codes in Druckformaten wie Rechnungen und Lieferscheinen verwendet werden" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "Für den Artikel {0} sollte die verbrauchte Menge gemäß der Stückliste {2} gleich {1} sein." @@ -21050,7 +21078,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 "Möchten Sie die aktuellen Werte für {1} löschen, damit das neue {0} wirksam wird?" -#: erpnext/controllers/stock_controller.py:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "Für {0} ist kein Bestand für die Retoure im Lager {1} verfügbar." @@ -21663,7 +21691,7 @@ msgstr "G - D" msgid "GENERAL LEDGER" msgstr "HAUPTBUCH" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21675,7 +21703,7 @@ msgstr "Hauptbuchsaldo" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "Buchung zum Hauptbuch" @@ -22190,7 +22218,7 @@ msgstr "Waren im Transit" msgid "Goods Transferred" msgstr "Übergebene Ware" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "Waren sind bereits gegen die Ausgangsbuchung {0} eingegangen" @@ -22373,7 +22401,7 @@ msgstr "Gesamtsumme muss der Summe der Zahlungsreferenzen entsprechen" msgid "Grant Commission" msgstr "Provision gewähren" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "Größer als Menge" @@ -23014,11 +23042,11 @@ msgstr "Wie häufig?" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" -msgstr "Wie häufig sollen Projekte hinsichtlich der Gesamteinkaufskosten aktualisiert werden?" +msgid "How often should project be updated of Total Purchase Cost ?" +msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling #. Settings' @@ -23173,7 +23201,7 @@ msgstr "Wenn ein Vorgang in Untervorgänge unterteilt ist, können diese hier hi msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "Wenn leer, wird das übergeordnete Lagerkonto oder der Firmenstandard bei Transaktionen berücksichtigt" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23358,7 +23386,7 @@ msgstr "Wenn aktiviert, erlaubt das System die Auswahl von Maßeinheiten in Verk msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "Wenn aktiviert, können Benutzer die Rohmaterialien und deren Mengen im Arbeitsauftrag bearbeiten. Das System setzt die Mengen nicht gemäß der Stückliste zurück, wenn der Benutzer sie geändert hat." -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23530,11 +23558,11 @@ msgstr "Falls dies nicht erwünscht ist, stornieren Sie bitte die entsprechende msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "Wenn dieser Artikel Varianten hat, dann kann er bei den Aufträgen, etc. nicht ausgewählt werden" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "Wenn diese Option auf 'Ja' gesetzt ist, validiert ERPNext, dass Sie eine Bestellung angelegt haben, bevor Sie eine Eingangsrechnung oder einen Eingangsbeleg erfassen können. Diese Konfiguration kann für einzelne Lieferanten überschrieben werden, indem Sie die Option 'Erstellung von Eingangsrechnungen ohne Bestellung zulassen' im Lieferantenstamm aktivieren." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "Wenn diese Option auf 'Ja' gesetzt ist, validiert ERPNext, dass Sie einen Eingangsbeleg angelegt haben, bevor Sie eine Eingangsrechnung erfassen können. Diese Konfiguration kann für einzelne Lieferanten überschrieben werden, indem Sie die Option 'Erstellung von Kaufrechnungen ohne Eingangsbeleg zulassen' im Lieferantenstamm aktivieren." @@ -23650,7 +23678,7 @@ msgstr "Leeren Bestand ignorieren" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "Wechselkursneubewertung und Gewinn-/Verlust-Journale ignorieren" @@ -23702,7 +23730,7 @@ msgstr "„Preisregel ignorieren“ ist aktiviert. Gutscheincode kann nicht ange #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "Systemgenerierte Gut-/Lastschriften ignorieren" @@ -23745,7 +23773,7 @@ msgstr "Arbeitsplatz-Zeitüberlappung ignorieren" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "Ignoriert das veraltete Ist-Eröffnung-Feld im Hauptbucheintrag, das das Hinzufügen von Eröffnungssalden nach der Inbetriebnahme des Systems bei der Berichterstellung ermöglicht" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "Das Bild in der Beschreibung wurde entfernt. Um dieses Verhalten zu deaktivieren, deaktivieren Sie \"{0}\" in {1}." @@ -23759,6 +23787,7 @@ msgid "Implementation Partner" msgstr "Implementierungspartner" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24112,7 +24141,7 @@ msgstr "Standard-Finanzbuch-Anlagegüter einbeziehen" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24366,7 +24395,7 @@ msgstr "Falsche Saldo-Menge nach Transaktion" msgid "Incorrect Batch Consumed" msgstr "Falsche Charge verbraucht" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "Falsches Aktivieren in (Gruppen-)Lager für Nachbestellung" @@ -24374,7 +24403,7 @@ msgstr "Falsches Aktivieren in (Gruppen-)Lager für Nachbestellung" msgid "Incorrect Company" msgstr "Falsches Unternehmen" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "Falsche Komponentenmenge" @@ -24584,14 +24613,14 @@ msgstr "Initiiert" msgid "Inspected By" msgstr "kontrolliert durch" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "Inspektion abgelehnt" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "Prüfung erforderlich" @@ -24608,7 +24637,7 @@ msgstr "Inspektion vor der Auslieferung erforderlich" msgid "Inspection Required before Purchase" msgstr "Inspektion vor dem Kauf erforderlich" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "Prüfungsübermittlung" @@ -24690,8 +24719,8 @@ msgstr "Nicht ausreichende Berechtigungen" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "Nicht genug Lagermenge." @@ -24911,7 +24940,7 @@ msgstr "Interne Transfers" msgid "Internal Work History" msgstr "Interne Arbeits-Historie" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "Interne Transfers können nur in der Standardwährung des Unternehmens durchgeführt werden" @@ -25004,7 +25033,7 @@ msgstr "Ungültiges Lieferdatum" msgid "Invalid Discount" msgstr "Ungültiger Rabatt" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -25034,7 +25063,7 @@ msgstr "Ungültige Gruppierung" msgid "Invalid Item" msgstr "Ungültiger Artikel" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "Ungültige Artikel-Standardwerte" @@ -25120,12 +25149,12 @@ msgstr "Ungültiger Zeitplan" msgid "Invalid Selling Price" msgstr "Ungültiger Verkaufspreis" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "Ungültiges Serien- und Chargenbündel" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "Ungültiges Quell- und Ziellager" @@ -25162,7 +25191,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "Ungültiger Grund für verlorene(s) {0}, bitte erstellen Sie einen neuen Grund für Verlust" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Ungültige Namensreihe (. Fehlt) für {0}" @@ -25291,7 +25320,6 @@ msgstr "Rechnungsstornierung" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "Rechnungsdatum" @@ -25312,10 +25340,6 @@ msgstr "Fehler bei der Auswahl des Rechnungs-Dokumententyps" msgid "Invoice Grand Total" msgstr "Rechnungssumme" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "Rechnungs-ID" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25837,13 +25861,13 @@ msgstr "Ist Phantom-Artikel" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "Ist für die Erstellung von Eingangsrechnungen und Quittungen eine Bestellung erforderlich?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "Ist für die Erstellung der Eingangsrechnungen ein Eingangsbeleg erforderlich?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -26115,7 +26139,7 @@ msgstr "Probleme" msgid "Issuing Date" msgstr "Ausstellungsdatum" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "Es kann bis zu einigen Stunden dauern, bis nach der Zusammenführung von Artikeln genaue Bestandswerte sichtbar sind." @@ -26185,7 +26209,7 @@ msgstr "Kursiver Text für Zwischensummen oder Anmerkungen" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26232,6 +26256,7 @@ msgstr "Kursiver Text für Zwischensummen oder Anmerkungen" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26247,7 +26272,6 @@ msgstr "Kursiver Text für Zwischensummen oder Anmerkungen" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -27011,6 +27035,7 @@ msgstr "Artikel Hersteller" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -27021,7 +27046,6 @@ msgstr "Artikel Hersteller" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27281,11 +27305,11 @@ msgstr "Einstellungen zur Artikelvariante" msgid "Item Variant {0} already exists with same attributes" msgstr "Artikelvariante {0} mit denselben Attributen existiert bereits" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "Artikelvarianten aktualisiert" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "Artikel-Lager-basierte Neubuchung wurde aktiviert." @@ -27324,6 +27348,15 @@ msgstr "Artikel-Webseitenspezifikation" msgid "Item Weight Details" msgstr "Artikel Gewicht Details" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27353,7 +27386,7 @@ msgstr "Artikelbezogene Steuer-Details" msgid "Item Wise Tax Details" msgstr "Artikelspezifische Steuerdetails" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "Artikelbezogene Steuerdetails stimmen nicht mit den Steuern und Abgaben in den folgenden Zeilen überein:" @@ -27373,11 +27406,11 @@ msgstr "Artikel und Lager" msgid "Item and Warranty Details" msgstr "Einzelheiten Artikel und Garantie" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "Artikel für Zeile {0} stimmt nicht mit Materialanforderung überein" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "Artikel hat Varianten." @@ -27407,7 +27440,7 @@ msgstr "Artikeloperation" msgid "Item qty can not be updated as raw materials are already processed." msgstr "Die Artikelmenge kann nicht aktualisiert werden, da das Rohmaterial bereits verarbeitet werden." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "Artikelpreis wurde auf Null aktualisiert, da „Nullbewertung zulassen“ für Artikel {0} aktiviert ist" @@ -27426,10 +27459,14 @@ msgstr "Der Wertansatz wird unter Berücksichtigung des Einstandskostenbelegbetr msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "Neubewertung der Artikel im Gange. Der Bericht könnte eine falsche Artikelbewertung anzeigen." -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "Artikelvariante {0} mit denselben Attributen existiert" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "Artikel {0} wurde mehrfach unter demselben übergeordneten Artikel {1} in Zeilen {2} und {3} hinzugefügt" @@ -27443,7 +27480,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "Artikel {0} kann nicht mehr als {1} im Rahmenauftrag {2} bestellt werden." #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "Artikel {0} existiert nicht" @@ -27451,7 +27488,7 @@ msgstr "Artikel {0} existiert nicht" msgid "Item {0} does not exist in the system or has expired" msgstr "Artikel {0} ist nicht im System vorhanden oder abgelaufen" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "Artikel {0} existiert nicht." @@ -27467,15 +27504,15 @@ msgstr "Artikel {0} wurde bereits zurück gegeben" msgid "Item {0} has been disabled" msgstr "Artikel {0} wurde deaktiviert" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "Artikel {0} hat keine Seriennummer. Nur Artikel mit Seriennummer können basierend auf der Seriennummer geliefert werden" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}" @@ -27487,19 +27524,23 @@ msgstr "Artikel {0} ignoriert, da es sich nicht um einen Lagerartikel handelt" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "Der Artikel {0} ist bereits für den Auftrag {1} reserviert/geliefert." -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "Artikel {0} wird storniert" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "Artikel {0} ist deaktiviert" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "Artikel {0} ist kein Fortsetzungsartikel" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "Artikel {0} ist kein Lagerartikel" @@ -27507,7 +27548,11 @@ msgstr "Artikel {0} ist kein Lagerartikel" msgid "Item {0} is not a subcontracted item" msgstr "Artikel {0} ist kein unterbeauftragter Artikel" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "Artikel {0} ist nicht aktiv oder hat das Ende der Lebensdauer erreicht" @@ -27523,7 +27568,7 @@ msgstr "Artikel {0} ein Artikel ohne Lagerhaltung sein" msgid "Item {0} must be a non-stock item" msgstr "Artikel {0} muss ein Artikel ohne Lagerhaltung sein" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "Artikel {0} wurde in der Tabelle „Gelieferte Rohstoffe“ in {1} {2} nicht gefunden" @@ -27539,7 +27584,7 @@ msgstr "Artikel {0}: Bestellmenge {1} kann nicht weniger als Mindestbestellmenge msgid "Item {0}: {1} qty produced. " msgstr "Artikel {0}: {1} produzierte Menge." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "Artikel {0} existiert nicht." @@ -27649,7 +27694,7 @@ msgstr "Artikel für Rohstoffanforderung" msgid "Items not found." msgstr "Artikel nicht gefunden." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "Der Artikelpreis wurde auf null aktualisiert, da Null-Bewertungssatz zulassen für folgende Artikel aktiviert ist: {0}" @@ -28282,7 +28327,7 @@ msgstr "Zuletzt gescanntes Lager" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "Die letzte Lagertransaktion für Artikel {0} unter Lager {1} war am {2}." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28561,7 +28606,7 @@ msgstr "Legende" msgid "Length (cm)" msgstr "Länge (cm)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "Weniger als der Betrag" @@ -28702,7 +28747,7 @@ msgstr "Verknüpfte Rechnungen" msgid "Linked Location" msgstr "Verknüpfter Ort" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "Verknüpft mit gebuchten Dokumenten" @@ -29097,11 +29142,6 @@ msgstr "Vermögensgegenstand warten" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "Denselben Satz während interner Transaktion beibehalten" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "Behalten Sie den gleichen Preis während des gesamten Kaufzyklus bei" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29113,6 +29153,11 @@ msgstr "Lager verwalten" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29309,7 +29354,7 @@ msgid "Major/Optional Subjects" msgstr "Wichtiger/wahlweiser Betreff" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29478,8 +29523,8 @@ msgstr "Obligatorischer Abschnitt" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29538,8 +29583,8 @@ msgstr "Manuelle Eingabe kann nicht erstellt werden! Deaktivieren Sie die automa #: 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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29688,7 +29733,7 @@ msgstr "Herstellungsdatum" msgid "Manufacturing Manager" msgstr "Fertigungsleiter" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "Eingabe einer Fertigungsmenge ist erforderlich" @@ -29964,7 +30009,7 @@ msgstr "Materialverbrauch" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "Materialverbrauch für die Herstellung" @@ -30035,6 +30080,7 @@ msgstr "Materialannahme" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30141,11 +30187,11 @@ msgstr "Materialanforderung Planelement" msgid "Material Request Type" msgstr "Materialanfragetyp" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "Materialanfrage für die bestellte Menge wurde bereits erstellt" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "Materialanforderung nicht angelegt, da Menge für Rohstoffe bereits vorhanden." @@ -30260,7 +30306,7 @@ msgstr "Material zur Herstellung übertragen" msgid "Material Transferred for Manufacturing" msgstr "Material zur Herstellung übertragen" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30389,11 +30435,11 @@ msgstr "Maximaler Zahlungsbetrag" msgid "Maximum Producible Items" msgstr "Maximal produzierbare Artikel" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "Maximum Samples - {0} kann für Batch {1} und Item {2} beibehalten werden." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "Maximum Samples - {0} wurden bereits für Batch {1} und Artikel {2} in Batch {3} gespeichert." @@ -30837,11 +30883,11 @@ msgstr "Sonstiges" msgid "Miscellaneous Expenses" msgstr "Sonstige Aufwendungen" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "Keine Übereinstimmung" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "Fehlt" @@ -30879,7 +30925,7 @@ msgstr "Fehlende Filter" msgid "Missing Finance Book" msgstr "Fehlendes Finanzbuch" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "Fehlendes Fertigerzeugnis" @@ -30887,11 +30933,11 @@ msgstr "Fehlendes Fertigerzeugnis" msgid "Missing Formula" msgstr "Fehlende Formel" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "Fehlender Artikel" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "Fehlender Parameter" @@ -30935,10 +30981,6 @@ msgstr "Fehlender Wert" msgid "Mixed Conditions" msgstr "Gemischte Bedingungen" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "Mobil: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31207,7 +31249,7 @@ msgstr "Mehrere Unternehmensfelder verfügbar: {0}. Bitte manuell auswählen." msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "Mehrere Geschäftsjahre existieren für das Datum {0}. Bitte setzen Unternehmen im Geschäftsjahr" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "Mehrere Artikel können nicht als fertiger Artikel markiert werden" @@ -31286,27 +31328,20 @@ msgstr "Benannter Ort" msgid "Naming Series Prefix" msgstr "Präfix Nummernkreis" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "Nummernkreis und Preisvorgaben" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "Nummernkreis ist obligatorisch" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31354,16 +31389,16 @@ msgstr "Muss analysiert werden" msgid "Negative Batch Report" msgstr "Bericht über negative Chargen" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "Negative Menge ist nicht erlaubt" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "Fehler bei negativem Lagerbestand" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "Negative Bewertung ist nicht erlaubt" @@ -31977,7 +32012,7 @@ msgstr "Kein POS-Profil gefunden. Bitte erstellen Sie zunächst ein neues POS-Pr #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "Keine Berechtigung" @@ -31990,7 +32025,7 @@ msgstr "Es wurden keine Bestellungen erstellt" msgid "No Records for these settings." msgstr "Keine Datensätze für diese Einstellungen." -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "Keine Auswahl" @@ -32035,7 +32070,7 @@ msgstr "Für diese Partei wurden keine nicht abgestimmten Zahlungen gefunden" msgid "No Work Orders were created" msgstr "Es wurden keine Arbeitsaufträge erstellt" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "Keine Buchungen für die folgenden Lager" @@ -32048,7 +32083,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "Für Artikel {0} wurde keine aktive Stückliste gefunden. Die Lieferung per Seriennummer kann nicht gewährleistet werden" @@ -32060,7 +32095,7 @@ msgstr "Keine zusätzlichen Felder verfügbar" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "Keine verfügbare Menge zum Reservieren für Artikel {0} im Lager {1}" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -32068,7 +32103,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32162,7 +32197,7 @@ msgstr "Keine Unterknoten mehr auf der linken Seite" msgid "No more children on Right" msgstr "Keine Unterpunkte auf der rechten Seite" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32337,7 +32372,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "Es wurden keine Lagerbuchungen erstellt. Bitte geben Sie die Menge oder den Wertansatz für die Artikel ordnungsgemäß an und versuchen Sie es erneut." @@ -32429,7 +32464,7 @@ msgstr "Nicht-Nullen" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "Keiner der Artikel hat irgendeine Änderung bei Mengen oder Kosten." @@ -32533,7 +32568,7 @@ msgstr "Nicht zugelassen, da {0} die Grenzwerte überschreitet" msgid "Not authorized to edit frozen Account {0}" msgstr "Keine Berechtigung gesperrtes Konto {0} zu bearbeiten" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32579,7 +32614,7 @@ msgstr "Hinweis: Zahlungsbuchung wird nicht erstellt, da kein \"Kassen- oder Ban msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "Hinweis: Diese Kostenstelle ist eine Gruppe. Buchungen können nicht zu Gruppen erstellt werden." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "Hinweis: Um die Artikel zusammenzuführen, erstellen Sie eine separate Bestandsabstimmung für den alten Artikel {0}" @@ -33056,7 +33091,7 @@ msgstr "Nur eines von Einzahlung oder Auszahlung darf ungleich null sein, wenn e msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "Nur ein Arbeitsgang kann 'Ist endgültiges Fertigerzeugnis' aktiviert haben, wenn 'Halbfertigerzeugnisse verfolgen' aktiviert ist." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "Nur ein {0} Eintrag kann gegen den Arbeitsauftrag {1} erstellt werden" @@ -33208,7 +33243,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "Eröffnung" @@ -33367,16 +33402,16 @@ msgstr "Eröffnungsrechnungen wurden erstellt." #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Anfangsbestand" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33733,7 +33768,7 @@ msgstr "Optional. Diese Einstellung wird verwendet, um in verschiedenen Transakt msgid "Optional. Used with Financial Report Template" msgstr "Optional. Wird mit der Finanzberichtsvorlage verwendet." -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33867,7 +33902,7 @@ msgstr "Bestellte Menge" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "Bestellungen" @@ -34075,7 +34110,7 @@ msgstr "Ausstehend (Unternehmenswährung)" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34133,7 +34168,7 @@ msgstr "Ausgangsauftrag" msgid "Over Billing Allowance (%)" msgstr "Erlaubte Mehrabrechnung (%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "Erlaubte Mehrabrechnung (%) für Eingangsbelegposition {0} ({1}) um {2} % überschritten" @@ -34151,7 +34186,7 @@ msgstr "Erlaubte Mehrlieferung/-annahme (%)" msgid "Over Picking Allowance" msgstr "Erlaubte Überkommissionierung" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "Mehreingang" @@ -34394,7 +34429,6 @@ msgstr "POS-Feld" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "POS-Rechnung" @@ -34665,7 +34699,7 @@ msgstr "Verpackter Artikel" msgid "Packed Items" msgstr "Verpackte Artikel" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "Verpackte Artikel können nicht intern transferiert werden" @@ -35113,7 +35147,7 @@ msgstr "Teilweise erhalten" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35249,7 +35283,7 @@ msgstr "Teile pro Million" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35375,7 +35409,7 @@ msgstr "Parteiendiskrepanz" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35461,7 +35495,7 @@ msgstr "Parteispezifischer Artikel" #: 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:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35764,7 +35798,6 @@ msgstr "Zahlungsbuchungen {0} sind nicht verknüpft" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -36022,7 +36055,7 @@ msgstr "Bezahlung Referenzen" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36101,10 +36134,6 @@ msgstr "Zahlungsplan-basierte Zahlungsaufforderungen können nicht erstellt werd msgid "Payment Schedules" msgstr "Zahlungspläne" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "Zahlungsstatus" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37125,7 +37154,7 @@ msgstr "Bitte Priorität festlegen" msgid "Please Set Supplier Group in Buying Settings." msgstr "Bitte legen Sie die Lieferantengruppe in den Kaufeinstellungen fest." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "Bitte Konto angeben" @@ -37157,11 +37186,11 @@ msgstr "Bitte fügen Sie ein vorübergehendes Eröffnungskonto im Kontenplan hin msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "Bitte fügen Sie mindestens eine Serien-/Chargennummer hinzu" @@ -37181,7 +37210,7 @@ msgstr "Bitte fügen Sie das Konto der Root-Ebene Company - {} hinzu" msgid "Please add {1} role to user {0}." msgstr "Bitte fügen Sie dem Benutzer {0} die Rolle {1} hinzu." -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "Bitte passen Sie die Menge an oder bearbeiten Sie {0}, um fortzufahren." @@ -37288,7 +37317,7 @@ msgstr "Bitte erstellen Sie den Kauf aus dem internen Verkaufs- oder Lieferbeleg msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "Bitte erstellen Sie eine Kaufquittung oder eine Eingangsrechnungen für den Artikel {0}" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "Bitte löschen Sie das Produktbündel {0}, bevor Sie {1} mit {2} zusammenführen" @@ -37357,11 +37386,11 @@ msgstr "Bitte geben Sie Konto für Änderungsbetrag" msgid "Please enter Approving Role or Approving User" msgstr "Bitte genehmigende Rolle oder genehmigenden Nutzer eingeben" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "Bitte Chargennummer eingeben" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "Bitte die Kostenstelle eingeben" @@ -37373,7 +37402,7 @@ msgstr "Bitte geben Sie das Lieferdatum ein" msgid "Please enter Employee Id of this sales person" msgstr "Bitte die Mitarbeiter-ID dieses Vertriebsmitarbeiters angeben" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "Bitte das Aufwandskonto angeben" @@ -37418,7 +37447,7 @@ msgstr "Bitte den Stichtag eingeben" msgid "Please enter Root Type for account- {0}" msgstr "Bitte geben Sie den Root-Typ für das Konto ein: {0}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "Bitte Seriennummer eingeben" @@ -37495,7 +37524,7 @@ msgstr "Bitte geben Sie das erste Lieferdatum ein" msgid "Please enter the phone number first" msgstr "Bitte geben Sie zuerst die Telefonnummer ein" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "Bitte geben Sie das {schedule_date} ein." @@ -37609,12 +37638,12 @@ msgstr "Bitte speichern Sie den Auftrag, bevor Sie einen Lieferplan hinzufügen. msgid "Please select Template Type to download template" msgstr "Bitte wählen Sie Vorlagentyp , um die Vorlage herunterzuladen" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "Bitte \"Rabatt anwenden auf\" auswählen" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "Bitte eine Stückliste für Artikel {0} auswählen" @@ -37630,13 +37659,13 @@ msgstr "Bitte wählen Sie ein Bankkonto" msgid "Please select Category first" msgstr "Bitte zuerst eine Kategorie auswählen" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "Bitte zuerst einen Chargentyp auswählen" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "Bitte Unternehmen auswählen" @@ -37645,7 +37674,7 @@ msgstr "Bitte Unternehmen auswählen" msgid "Please select Company and Posting Date to getting entries" msgstr "Bitte wählen Sie Unternehmen und Buchungsdatum, um Einträge zu erhalten" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "Bitte zuerst Unternehmen auswählen" @@ -37694,7 +37723,7 @@ msgstr "Bitte Differenzkonto für periodische Buchung auswählen" msgid "Please select Posting Date before selecting Party" msgstr "Bitte erst Buchungsdatum und dann die Partei auswählen" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "Bitte zuerst ein Buchungsdatum auswählen" @@ -37702,11 +37731,11 @@ msgstr "Bitte zuerst ein Buchungsdatum auswählen" msgid "Please select Price List" msgstr "Bitte eine Preisliste auswählen" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "Bitte wählen Sie Menge für Artikel {0}" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "Bitte wählen Sie in den Lagereinstellungen zuerst das Muster-Aufbewahrungslager aus" @@ -37759,7 +37788,7 @@ msgstr "Bitte wählen Sie eine Unterauftragsbestellung aus." msgid "Please select a Supplier" msgstr "Bitte wählen Sie einen Lieferanten aus" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "Bitte wählen Sie ein Lager" @@ -37820,7 +37849,7 @@ msgstr "Bitte wählen Sie eine Zeile aus, um einen Umbuchungseintrag zu erstelle msgid "Please select a supplier for fetching payments." msgstr "Bitte wählen Sie einen Lieferanten aus, um Zahlungen abzurufen." -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37840,7 +37869,7 @@ msgstr "Bitte wählen Sie einen Artikelcode aus, bevor Sie das Lager festlegen." msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "Bitte wählen Sie mindestens einen Filter: Artikel-Code, Charge oder Seriennummer." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37947,7 +37976,7 @@ msgstr "Bitte wählen Sie einen gültigen Dokumententyp aus." msgid "Please select weekly off day" msgstr "Bitte die wöchentlichen Auszeittage auswählen" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "Bitte zuerst {0} auswählen" @@ -38087,7 +38116,7 @@ msgstr "Bitte legen Sie die tatsächliche Nachfrage oder die Absatzprognose fest msgid "Please set an Address on the Company '%s'" msgstr "Bitte geben Sie eine Adresse für das Unternehmen „%s“ ein" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "Bitte legen Sie in der Artikeltabelle ein Aufwandskonto fest" @@ -38131,7 +38160,7 @@ msgstr "Bitte legen Sie im Unternehmen {0} das Standardaufwandskonto fest" msgid "Please set default UOM in Stock Settings" msgstr "Bitte legen Sie die Standardeinheit in den Materialeinstellungen fest" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "Bitte legen Sie im Unternehmen {0} das Standard-Herstellkostenkonto zum Buchen von Rundungsgewinnen/-verlusten bei Umlagerungen fest" @@ -38250,7 +38279,7 @@ msgstr "Bitte geben Sie zuerst {0} ein." msgid "Please specify at least one attribute in the Attributes table" msgstr "Bitte geben Sie mindestens ein Attribut in der Attributtabelle ein" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "Bitte entweder die Menge oder den Wertansatz oder beides eingeben" @@ -38421,7 +38450,7 @@ msgstr "Gepostet am" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38446,7 +38475,7 @@ msgstr "Gepostet am" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38561,7 +38590,7 @@ msgstr "Buchungszeitpunkt" msgid "Posting Time" msgstr "Buchungszeit" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "Buchungsdatum und Buchungszeit sind zwingend erforderlich" @@ -38740,6 +38769,12 @@ msgstr "Vorbeugende Wartung" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39033,7 +39068,9 @@ msgstr "Preis- oder Produktrabattplatten sind erforderlich" msgid "Price per Unit (Stock UOM)" msgstr "Preis pro Einheit (Lager UOM)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40388,6 +40425,7 @@ msgstr "Einkaufskosten für Artikel {0}" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40424,6 +40462,12 @@ msgstr "Anzahlung auf Eingangsrechnung" msgid "Purchase Invoice Item" msgstr "Eingangsrechnungs-Artikel" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40475,6 +40519,7 @@ msgstr "Eingangsrechnungen" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40484,7 +40529,7 @@ msgstr "Eingangsrechnungen" #: 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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40601,7 +40646,7 @@ msgstr "Bestellung {0} erstellt" msgid "Purchase Order {0} is not submitted" msgstr "Bestellung {0} ist nicht gebucht" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "Bestellungen" @@ -40664,6 +40709,7 @@ msgstr "Einkaufspreisliste" #: 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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40678,7 +40724,7 @@ msgstr "Einkaufspreisliste" msgid "Purchase Receipt" msgstr "Eingangsbeleg" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40944,7 +40990,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41532,7 +41577,7 @@ msgstr "Qualitätsüberprüfung" msgid "Quality Review Objective" msgstr "Qualitätsüberprüfungsziel" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41593,7 +41638,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41787,7 +41832,7 @@ msgstr "Abfrage Route String" msgid "Queue Size should be between 5 and 100" msgstr "Die Größe der Warteschlange sollte zwischen 5 und 100 liegen" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "Schnellbuchung" @@ -41842,7 +41887,7 @@ msgstr "Ang/Inter %" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -42005,7 +42050,6 @@ msgstr "Gemeldet von (E-Mail)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42415,8 +42459,8 @@ msgstr "Rohstoffe an Kunde" msgid "Raw SQL" msgstr "Rohes SQL" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "Die verbrauchte Menge an Rohmaterialien wird anhand der in der Stückliste des Fertigerzeugnisses erforderlichen Menge validiert" @@ -42824,11 +42868,10 @@ msgstr "Banktransaktion abgleichen" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43352,7 +43395,7 @@ msgstr "Abgelehntes Serien- und Chargenbündel" msgid "Rejected Warehouse" msgstr "Ausschusslager" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "Ausschusslager und Annahmelager können nicht identisch sein." @@ -43402,7 +43445,7 @@ msgid "Remaining Balance" msgstr "Verbleibendes Saldo" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43456,7 +43499,7 @@ msgstr "Bemerkung" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43495,7 +43538,7 @@ msgstr "Null-Einträge entfernen" msgid "Remove item if charges is not applicable to that item" msgstr "Entferne Artikel, wenn Gebühren nicht für diesen Artikel anwendbar sind" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "Artikel wurden ohne Veränderung der Menge oder des Wertes entfernt." @@ -43900,6 +43943,7 @@ msgstr "Informationsanfrage" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44173,7 +44217,7 @@ msgstr "Für Unterbaugruppe reservieren" msgid "Reserved" msgstr "Reserviert" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "Konflikt bei reservierter Charge" @@ -44786,7 +44830,7 @@ msgstr "" msgid "Reversal Of" msgstr "Umkehrung von" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "Buchungssatz umkehren" @@ -44935,10 +44979,7 @@ msgstr "Rolle, die mehr liefern/empfangen darf" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "Rolle, die die Stopp-Aktion übergehen darf" @@ -44953,8 +44994,11 @@ msgstr "Rolle, die das Kreditlimit umgehen darf" msgid "Role allowed to bypass period restrictions." msgstr "Rolle, die Periodenbeschränkungen umgehen darf." +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45155,8 +45199,8 @@ msgstr "Rundungsverlusttoleranz" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "Rundungsverlusttoleranz muss zwischen 0 und 1 sein" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "Rundungsgewinn/-verlustbuchung für Umlagerung" @@ -45183,11 +45227,11 @@ msgstr "Routing-Name" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "Zeile {0}: Es kann nicht mehr als {1} für Artikel {2} zurückgegeben werden" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "Zeile {0}: Bitte fügen Sie Serien- und Chargenbündel für Artikel {1} hinzu" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "Zeile {0}: Bitte geben Sie die Menge für Artikel {1} ein, da sie nicht Null ist." @@ -45213,7 +45257,7 @@ msgstr "Zeile {0} (Zahlungstabelle): Betrag muss negativ sein" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "Zeile {0} (Zahlungstabelle): Betrag muss positiv sein" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "Zeile #{0}: Für das Lager {1} mit dem Nachbestellungstyp {2} ist bereits ein Nachbestellungseintrag vorhanden." @@ -45414,7 +45458,7 @@ msgstr "Referenz {1} {2} in Zeile {0} kommt doppelt vor" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "Zeile {0}: Voraussichtlicher Liefertermin kann nicht vor Bestelldatum sein" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "Zeile #{0}: Aufwandskonto für den Artikel nicht festgelegt {1}. {2}" @@ -45474,7 +45518,7 @@ msgstr "Zeile #{0}: Die Felder „Von-Zeit“ und „Bis-Zeit“ sind erforderli msgid "Row #{0}: Item added" msgstr "Zeile {0}: Element hinzugefügt" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "Zeile #{0}: Artikel {1} kann nicht mehr als {2} gegen {3} {4} übertragen werden" @@ -45502,7 +45546,7 @@ msgstr "Zeile #{0}: Artikel {1} im Lager {2}: Verfügbar {3}, Benötigt {4}." msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "Zeile #{0}: Artikel {1} ist kein vom Kunden beigestellter Artikel." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "Zeile {0}: Element {1} ist kein serialisiertes / gestapeltes Element. Es kann keine Seriennummer / Chargennummer dagegen haben." @@ -45555,7 +45599,7 @@ msgstr "Zeile #{0}: Nur {1} zur Reservierung für den Artikel {2} verfügbar" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "Zeile #{0}: Kumulierte Abschreibungen zu Beginn müssen kleiner oder gleich {1} sein" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "Zeile {0}: Vorgang {1} ist für {2} Fertigwarenmenge im Fertigungsauftrag {3} nicht abgeschlossen. Bitte aktualisieren Sie den Betriebsstatus über die Jobkarte {4}." @@ -45580,7 +45624,7 @@ msgstr "Zeile #{0}: Bitte wählen Sie das Fertigerzeugnis aus, für das dieser v msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Zeile #{0}: Bitte wählen Sie das Lager für Unterbaugruppen" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "Zeile {0}: Bitte Nachbestellmenge angeben" @@ -45606,15 +45650,15 @@ msgstr "Zeile #{0}: Menge muss eine positive Zahl sein" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "Zeile #{0}: Die Menge sollte kleiner oder gleich der verfügbaren Menge zum Reservieren sein (Ist-Menge – reservierte Menge) {1} für Artikel {2} der Charge {3} im Lager {4}." -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "Zeile {0}: Für Artikel {1} ist eine Qualitätsprüfung erforderlich" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "Zeile {0}: Qualitätsprüfung {1} wurde für den Artikel {2} nicht gebucht" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "Zeile {0}: Qualitätsprüfung {1} wurde für Artikel {2} abgelehnt" @@ -45645,11 +45689,11 @@ msgstr "Zeile #{0}: Die zu reservierende Menge für den Artikel {1} sollte grö msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "Zeile #{0}: Einzelpreis muss gleich sein wie {1}: {2} ({3} / {4})" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "Zeile {0}: Referenzdokumenttyp muss eine der Bestellung, Eingangsrechnung oder Buchungssatz sein" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "Zeile #{0}: Referenzbelegtyp muss einer der folgenden sein: Auftrag, Ausgangsrechnung, Buchungssatz oder Mahnung" @@ -45695,7 +45739,7 @@ msgstr "Zeile #{0}: Verkaufspreis für Artikel {1} liegt unter {2}.\n" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "Zeile #{0}: Sequenz-ID muss für Arbeitsgang {3} {1} oder {2} sein." -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "Zeile {0}: Seriennummer {1} gehört nicht zu Charge {2}" @@ -45743,11 +45787,11 @@ msgstr "Zeile #{0}: Quelllager {1} für Artikel {2} kann nicht ein Kundenlager s msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "Zeile #{0}: Quelllager {1} für Artikel {2} muss gleich sein wie Quelllager {3} im Arbeitsauftrag." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "Zeile #{0}: Quell- und Ziellager können beim Materialumlagerung nicht identisch sein" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "Zeile #{0}: Quelllager, Ziellager und Lagerbestandsdimensionen dürfen für eine Materialumlagerung nicht identisch sein" @@ -45800,11 +45844,11 @@ msgstr "Zeile #{0}: Lagermenge {1} ({2}) für Artikel {3} kann nicht größer al msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "Zeile #{0}: Ziellager muss dasselbe wie Kundenlager {1} aus der verknüpften Fremdvergabe-Eingangsbestellung sein" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "Zeile {0}: Der Stapel {1} ist bereits abgelaufen." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "Zeile #{0}: Das Lager {1} ist kein untergeordnetes Lager eines Gruppenlagers {2}" @@ -45832,7 +45876,7 @@ msgstr "Zeile #{0}: Einbehaltener Betrag {1} stimmt nicht mit dem berechneten Be msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "Zeile #{0}: Arbeitsauftrag vorhanden für volle oder teilweise Menge von Artikel {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "Zeile #{0}: Sie können die Bestandsdimension '{1}' in der Bestandsabgleich nicht verwenden, um die Menge oder den Wertansatz zu ändern. Die Bestandsabgleich mit Bestandsdimensionen ist ausschließlich für die Durchführung von Eröffnungsbuchungen vorgesehen." @@ -45868,23 +45912,23 @@ msgstr "Zeile #{1}: Lager ist obligatorisch für Artikel {0}" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "Zeile #{idx}: Das Lieferantenlager kann nicht ausgewählt werden, wenn Rohmaterialien an einen Subunternehmer geliefert werden." -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "Zeile #{idx}: Der Einzelpreis wurde gemäß dem Bewertungskurs aktualisiert, da es sich um eine interne Umlagerung handelt." -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "Zeile {idx}: Bitte geben Sie einen Standort für den Vermögensgegenstand {item_code} ein." -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "Zeile #{idx}: Die erhaltene Menge muss gleich der angenommenen + abgelehnten Menge für Artikel {item_code} sein." -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "Zeile {idx}: {field_label} kann für Artikel {item_code} nicht negativ sein." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "Zeile {idx}: {field_label} ist obligatorisch." @@ -45892,7 +45936,7 @@ msgstr "Zeile {idx}: {field_label} ist obligatorisch." msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "Zeile {idx}: {from_warehouse_field} und {to_warehouse_field} dürfen nicht identisch sein." -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "Zeile {idx}: {schedule_date} darf nicht vor {transaction_date} liegen." @@ -45957,7 +46001,7 @@ msgstr "Reihe #{}: {}" msgid "Row #{}: {} {} does not exist." msgstr "Zeile # {}: {} {} existiert nicht." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "Zeile #{}: {} {} gehört nicht zur Firma {}. Bitte wählen Sie eine gültige {} aus." @@ -45973,7 +46017,7 @@ msgstr "Zeile {0}: Vorgang ist für die Rohmaterialposition {1} erforderlich" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "Zeile {0} kommissionierte Menge ist kleiner als die erforderliche Menge, zusätzliche {1} {2} erforderlich." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "Zeile {0}# Artikel {1} wurde in der Tabelle „Gelieferte Rohstoffe“ in {2} {3} nicht gefunden" @@ -46005,7 +46049,7 @@ msgstr "Zeile {0}: Der zugewiesene Betrag {1} muss kleiner oder gleich dem ausst msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "Zeile {0}: Der zugewiesene Betrag {1} muss kleiner oder gleich dem verbleibenden Zahlungsbetrag {2} sein" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "Zeile {0}: Da {1} aktiviert ist, können dem {2}-Eintrag keine Rohstoffe hinzugefügt werden. Verwenden Sie einen {3}-Eintrag, um Rohstoffe zu verbrauchen." @@ -46064,7 +46108,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "Zeile {0}: Entweder die Referenz zu einem \"Lieferschein-Artikel\" oder \"Verpackter Artikel\" ist obligatorisch." #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "Zeile {0}: Wechselkurs ist erforderlich" @@ -46105,7 +46149,7 @@ msgstr "Zeile {0}: Von Zeit und zu Zeit ist obligatorisch." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "Zeile {0}: Zeitüberlappung in {1} mit {2}" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "Zeile {0}: Von Lager ist obligatorisch für interne Transfers" @@ -46229,7 +46273,7 @@ msgstr "Zeile {0}: Menge muss größer als 0 sein." msgid "Row {0}: Quantity cannot be negative." msgstr "Zeile {0}: Die Menge darf nicht negativ sein." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "Zeile {0}: Menge für {4} in Lager {1} zum Buchungszeitpunkt des Eintrags nicht verfügbar ({2} {3})" @@ -46241,11 +46285,11 @@ msgstr "Zeile {0}: Ausgangsrechnung {1} wurde bereits für {2} erstellt" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "Zeile {0}: Schicht kann nicht geändert werden, da die Abschreibung bereits verarbeitet wurde" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "Zeile {0}: Unterauftragsartikel sind für den Rohstoff {1} obligatorisch." -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "Zeile {0}: Ziellager ist für interne Transfers obligatorisch" @@ -46269,7 +46313,7 @@ msgstr "Zeile {0}: Das {3}-Konto {1} gehört nicht zum Unternehmen {2}" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "Zeile {0}: Um die Periodizität {1} festzulegen, muss die Differenz zwischen dem Von- und Bis-Datum größer oder gleich {2} sein" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "Zeile {0}: Die übertragene Menge darf die angeforderte Menge nicht überschreiten." @@ -46322,7 +46366,7 @@ msgstr "Zeile {0}: {2} Artikel {1} existiert nicht in {2} {3}" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "Zeile {1}: Menge ({0}) darf kein Bruch sein. Deaktivieren Sie dazu '{2}' in UOM {3}." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "Zeile {idx}: Der Nummernkreis des Vermögensgegenstandes ist obligatorisch für die automatische Erstellung von Vermögenswerten für den Artikel {item_code}." @@ -46352,7 +46396,7 @@ msgstr "Zeilen mit denselben Konten werden im Hauptbuch zusammengefasst" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "Zeilen mit doppelten Fälligkeitsdaten in anderen Zeilen wurden gefunden: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "Zeilen: {0} haben „Zahlungseintrag“ als Referenztyp. Dies sollte nicht manuell festgelegt werden." @@ -46418,7 +46462,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46715,7 +46759,7 @@ msgstr "Eingangsbewertung aus Ausgangsrechnung" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46889,7 +46933,7 @@ msgstr "Verkaufschancen nach Quelle" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -47012,8 +47056,8 @@ msgstr "Auftrag für den Artikel {0} erforderlich" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "Auftrag {0} existiert bereits für die Kundenbestellung {1}. Um mehrere Verkaufsaufträge zuzulassen, aktivieren Sie {2} in {3}" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47424,7 +47468,7 @@ msgstr "Gleicher Artikel" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "Dieselbe Artikel- und Lagerkombination wurde bereits eingegeben." @@ -47461,7 +47505,7 @@ msgstr "Beispiel Retention Warehouse" msgid "Sample Size" msgstr "Stichprobenumfang" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "Die Beispielmenge {0} darf nicht mehr als die empfangene Menge {1} sein" @@ -47752,7 +47796,7 @@ msgstr "Suche nach Artikelcode, Seriennummer oder Barcode" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47897,7 +47941,7 @@ msgstr "Marke auswählen ..." msgid "Select Columns and Filters" msgstr "Spalten und Filter auswählen" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "Unternehmen auswählen" @@ -48593,7 +48637,7 @@ msgstr "Seriennummernbereich" msgid "Serial No Reserved" msgstr "Seriennummer reserviert" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "Überschneidung der Seriennummernreihe" @@ -48654,7 +48698,7 @@ msgstr "Seriennummer ist obligatorisch" msgid "Serial No is mandatory for Item {0}" msgstr "Seriennummer ist für Artikel {0} zwingend erforderlich" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "Die Seriennummer {0} existiert bereits" @@ -48940,7 +48984,7 @@ msgstr "Seriennummern für Artikel {0} unter Lager {1} nicht verfügbar. Bitte v #: 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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48966,7 +49010,7 @@ msgstr "Seriennummern für Artikel {0} unter Lager {1} nicht verfügbar. Bitte v #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49364,12 +49408,6 @@ msgstr "Festlegen des Ziellagers" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "Bewertungssatz basierend auf dem Quelllager festlegen" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "Bewertungssatz für abgelehnte Materialien festlegen" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "Lager festlegen" @@ -49475,6 +49513,12 @@ msgstr "Setzen Sie diesen Wert auf 0, um die Funktion zu deaktivieren." msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "Legen Sie {0} in die Vermögensgegenstand-Kategorie {1} für das Unternehmen {2} fest" @@ -49973,7 +50017,7 @@ msgstr "Saldo in Kontenplan anzeigen" msgid "Show Barcode Field in Stock Transactions" msgstr "Barcode-Feld in Lagerbewegungen anzeigen" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "Abgebrochene Einträge anzeigen" @@ -49981,7 +50025,7 @@ msgstr "Abgebrochene Einträge anzeigen" msgid "Show Completed" msgstr "Show abgeschlossen" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "Soll/Haben in Unternehmenswährung anzeigen" @@ -50064,7 +50108,7 @@ msgstr "Verknüpfte Lieferscheine anzeigen" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "Nettowerte im Konto der Partei anzeigen" @@ -50076,7 +50120,7 @@ msgstr "" msgid "Show Open" msgstr "zeigen open" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "Eröffnungsbeiträge anzeigen" @@ -50089,11 +50133,6 @@ msgstr "Anfangs- und Endsaldo anzeigen" msgid "Show Operations" msgstr "zeigen Operationen" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "Schaltfläche „Bezahlen“ im Bestellportal anzeigen" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "Zahlungsdetails anzeigen" @@ -50109,7 +50148,7 @@ msgstr "Zeige Zahlungstermin in Drucken" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "Bemerkungen anzeigen" @@ -50176,6 +50215,11 @@ msgstr "Zeige nur POS" msgid "Show only the Immediate Upcoming Term" msgstr "Nur die nächstfällige Zahlungsbedingung anzeigen" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "Ausstehende Einträge anzeigen" @@ -50464,11 +50508,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50534,7 +50578,7 @@ msgstr "Quelllager {0} muss dasselbe wie Kundenlager {1} in der Fremdvergabe-Ein msgid "Source and Target Location cannot be same" msgstr "Quelle und Zielort können nicht identisch sein" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "Ausgangs- und Eingangslager können nicht gleich sein für die Zeile {0}" @@ -50548,8 +50592,8 @@ msgid "Source of Funds (Liabilities)" msgstr "Mittelherkunft (Verbindlichkeiten)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "Ausgangslager ist für Zeile {0} zwingend erforderlich" @@ -50714,8 +50758,8 @@ msgstr "Ausgaben mit Normalsteuersatz" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "Standard-Vertrieb" @@ -51048,7 +51092,7 @@ msgstr "Bestandsabschluss-Protokoll" msgid "Stock Details" msgstr "Lagerdetails" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "Lagerbuchungen bereits erstellt für Fertigungsauftrag {0}: {1}" @@ -51319,7 +51363,7 @@ msgstr "Empfangener, aber nicht berechneter Lagerbestand" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51331,7 +51375,7 @@ msgstr "Bestandsabgleich" msgid "Stock Reconciliation Item" msgstr "Bestandsabgleich-Artikel" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "Bestandsabstimmungen" @@ -51369,7 +51413,7 @@ msgstr "Bestandsumbuchungs-Einstellungen" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51397,7 +51441,7 @@ msgstr "Bestandsreservierungen storniert" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "Bestandsreservierungen erstellt" @@ -51779,7 +51823,7 @@ msgstr "Der angehaltene Arbeitsauftrag kann nicht abgebrochen werden. Stoppen Si #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "Lagerräume" @@ -51857,10 +51901,6 @@ msgstr "Teilarbeitsgänge" msgid "Sub Procedure" msgstr "Unterprozedur" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "Zwischensumme" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "Unterbaugruppen-Artikelreferenzen fehlen. Bitte laden Sie die Unterbaugruppen und Rohmaterialien erneut." @@ -52077,7 +52117,7 @@ msgstr "Fremdvergabe-Eingangsbestellung Dienstleistungsartikel" msgid "Subcontracting Order" msgstr "Unterauftrag" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52103,7 +52143,7 @@ msgstr "Dienstleistung für Unterauftrag" msgid "Subcontracting Order Supplied Item" msgstr "Unterauftrag Gelieferter Artikel" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "Unterauftrag {0} erstellt." @@ -52192,7 +52232,7 @@ msgstr "Unterauftragsvergabe einrichten" msgid "Subdivision" msgstr "Teilgebiet" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "Aktion Buchen fehlgeschlagen" @@ -52367,7 +52407,7 @@ msgstr "Erfolgreich abgestimmt" msgid "Successfully Set Supplier" msgstr "Setzen Sie den Lieferanten erfolgreich" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "Lager-ME erfolgreich geändert. Bitte passen Sie nun die Umrechnungsfaktoren an." @@ -52523,6 +52563,7 @@ msgstr "Gelieferte Anzahl" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52564,8 +52605,8 @@ msgstr "Gelieferte Anzahl" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52613,6 +52654,12 @@ msgstr "Lieferanten-Adressen und Kontaktdaten" msgid "Supplier Contact" msgstr "Lieferantenkontakt" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52707,7 +52754,7 @@ msgstr "Lieferantenrechnungsdatum" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "Lieferantenrechnungsnr." @@ -52987,19 +53034,10 @@ msgstr "Lieferant von Waren oder Dienstleistungen." msgid "Supplier {0} not found in {1}" msgstr "Lieferant {0} nicht in {1} gefunden" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Lieferant(en)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "Lieferantenbezogene Analyse der Verkäufe" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53061,7 +53099,7 @@ msgstr "Support-Team" msgid "Support Tickets" msgstr "Support-Tickets" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53321,8 +53359,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "Ziellager {0} muss mit dem Lieferlager {1} in der Fremdvergabe-Eingangsbestellungsposition übereinstimmen." #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "Eingangslager ist für Zeile {0} zwingend erforderlich" @@ -53791,7 +53829,7 @@ msgstr "Steuer wird nur für den Betrag einbehalten, der den kumulativen Schwell #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "Steuerpflichtiger Betrag" @@ -53952,7 +53990,7 @@ msgstr "Steuern und Gebühren abgezogen" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "Steuern und Gebühren abgezogen (Unternehmenswährung)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "Steuerzeile #{0}: {1} kann nicht kleiner als {2} sein" @@ -54142,7 +54180,6 @@ msgstr "Vorlage für Geschäftsbedingungen" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54334,7 +54371,7 @@ msgstr "Der Zugriff auf die Angebotsanfrage vom Portal ist deaktiviert. Um den Z msgid "The BOM which will be replaced" msgstr "Die Stückliste (BOM) wird ersetzt." -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "Die Charge {0} weist eine negative Chargenmenge {1} auf. Um dies zu beheben, öffnen Sie die Charge und klicken Sie auf „Chargenmenge neu berechnen“. Falls das Problem weiterhin besteht, erstellen Sie eine eingehende Lagerbuchung." @@ -54378,7 +54415,7 @@ msgstr "Die Zahlungsbedingung in Zeile {0} ist möglicherweise ein Duplikat." 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 "Die Entnahmeliste mit Bestandsreservierungseinträgen kann nicht aktualisiert werden. Wenn Sie Änderungen vornehmen müssen, empfehlen wir Ihnen, die bestehenden Bestandsreservierungseinträge zu stornieren, bevor Sie die Entnahmeliste aktualisieren." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "Die Prozessverlustmenge wurde gemäß den Jobkarten zurückgesetzt" @@ -54394,7 +54431,7 @@ msgstr "Die Seriennummer in Zeile #{0}: {1} ist im Lager {2} nicht verfügbar." msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "Die Seriennummer {0} ist für {1} {2} reserviert und kann für keine andere Transaktion verwendet werden." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "Das Serien- und Chargenbündel {0} ist für diese Transaktion nicht gültig. Die 'Art der Transaktion' sollte 'Nach außen' anstatt 'Nach innen' im Serien- und Chargenbündel {0} sein" @@ -54430,7 +54467,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "Die Charge {0} ist bereits in {1} {2} reserviert. Daher kann mit {3} {4}, das gegen {5} {6} erstellt wurde, nicht fortgefahren werden." @@ -54536,7 +54573,7 @@ msgstr "Die folgenden Chargen sind abgelaufen, bitte füllen Sie sie wieder auf: msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "Die folgenden stornierten Neubuchungseinträge existieren für {0}:

{1}

Bitte löschen Sie diese Einträge, bevor Sie fortfahren." -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "Die folgenden gelöschten Attribute sind in Varianten vorhanden, jedoch nicht in der Vorlage. Sie können entweder die Varianten löschen oder die Attribute in der Vorlage behalten." @@ -54581,15 +54618,15 @@ msgstr "Der Urlaub am {0} ist nicht zwischen dem Von-Datum und dem Bis-Datum" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "Der Artikel {item} ist nicht als {type_of} Artikel gekennzeichnet. Sie können ihn als {type_of} Artikel in seinem Artikelstamm aktivieren." -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "Die Artikel {0} und {1} sind im folgenden {2} zu finden:" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "Die Artikel {items} sind nicht als {type_of} Artikel gekennzeichnet. Sie können sie in den Stammdaten der Artikel als {type_of} Artikel aktivieren." @@ -54745,7 +54782,7 @@ msgstr "Die Anteile existieren nicht mit der {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "Der Bestand für den Artikel {0} im Lager {1} war am {2} negativ. Sie sollten einen positiven Eintrag {3} vor dem Datum {4} und der Uhrzeit {5} erstellen, um den korrekten Bewertungssatz zu buchen. Weitere Informationen finden Sie in der Dokumentation." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "Der Bestand wurde für die folgenden Artikel und Lager reserviert. Bitte heben Sie die Reservierung auf, um den Bestandsabgleich zu {0}:

{1}" @@ -54767,11 +54804,11 @@ 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 "Das System erstellt eine Ausgangsrechnung oder eine POS-Rechnung über die POS-Oberfläche basierend auf dieser Einstellung. Bei Transaktionen mit hohem Volumen wird empfohlen, POS-Rechnung zu verwenden." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "Die Aufgabe wurde als Hintergrundjob in die Warteschlange gestellt. Falls bei der Verarbeitung im Hintergrund Probleme auftreten, fügt das System einen Kommentar zum Fehler in dieser Bestandsabstimmung hinzu und kehrt zum Entwurfsstadium zurück" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "Die Aufgabe wurde als Hintergrundjob in die Warteschlange gestellt. Falls bei der Verarbeitung im Hintergrund ein Problem auftritt, fügt das System einen Kommentar über den Fehler bei dieser Bestandsabstimmung hinzu und kehrt zur Stufe Gebucht zurück" @@ -54843,7 +54880,7 @@ msgstr "Die {0} ({1}) muss gleich {2} ({3}) sein." msgid "The {0} contains Unit Price Items." msgstr "{0} enthält Artikel mit Stückpreis." -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "Das {0}-Präfix '{1}' ist bereits vorhanden. Bitte ändern Sie die Seriennummernkreis, da Sie sonst einen Fehler wegen doppeltem Eintrag erhalten." @@ -54896,7 +54933,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "Für dieses Datum sind keine Plätze verfügbar" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54940,7 +54977,7 @@ msgstr "Es wurde kein Stapel für {0} gefunden: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "Es muss mindestens 1 Fertigerzeugnis in dieser Lagerbewegung vorhanden sein" @@ -54996,11 +55033,11 @@ msgstr "Dieser Artikel ist eine Variante von {0} (Vorlage)." msgid "This Month's Summary" msgstr "Zusammenfassung dieses Monats" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "Diese Bestellung wurde vollständig untervergeben." -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "Dieser Auftrag wurde vollständig an Subunternehmer vergeben." @@ -55801,7 +55838,7 @@ msgstr "Um Unterbaugruppen-Kosten und Sekundärartikel in Fertigerzeugnissen ein msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein" @@ -55836,7 +55873,7 @@ msgstr "Um ein anderes Finanzbuch zu verwenden, deaktivieren Sie bitte 'Standard #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "Um ein anderes Finanzbuch zu verwenden, deaktivieren Sie bitte 'Standardbucheinträge einschließen'" @@ -55987,7 +56024,7 @@ msgstr "Gesamte Zuteilungen" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Gesamtsumme" @@ -56410,7 +56447,7 @@ msgstr "Der Gesamtbetrag der Zahlungsanforderung darf nicht größer als {0} sei msgid "Total Payments" msgstr "Gesamtzahlungen" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "Die gesamte kommissionierte Menge {0} ist größer als die bestellte Menge {1}. Sie können die Zulässigkeit der Überkommissionierung in den Lagereinstellungen festlegen." @@ -56442,7 +56479,7 @@ msgstr "Einkaufskosten (Eingangsrechnung)" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Gesamtmenge" @@ -56828,7 +56865,7 @@ msgstr "Tracking-URL" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56839,7 +56876,7 @@ msgstr "Transaktion" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "Transaktionswährung" @@ -57511,11 +57548,11 @@ msgstr "VAE VAT Einstellungen" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57587,7 +57624,7 @@ msgstr "Maßeinheit-Umrechnungsfaktor ist erforderlich in der Zeile {0}" msgid "UOM Name" msgstr "Maßeinheit-Name" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "ME Umrechnungsfaktor erforderlich für ME: {0} in Artikel: {1}" @@ -57663,7 +57700,7 @@ msgstr "Es konnte keine Punktzahl gefunden werden, die bei {0} beginnt. Sie ben msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "Es ist nicht möglich, ein Zeitfenster in den nächsten {0} Tagen für die Operation {1} zu finden. Bitte erhöhen Sie die 'Kapazitätsplanung für (Tage)' in der {2}." -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "Variable kann nicht gefunden werden:" @@ -57782,7 +57819,7 @@ msgstr "Maßeinheit" msgid "Unit of Measure (UOM)" msgstr "Maßeinheit (ME)" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "Die Mengeneinheit {0} wurde mehr als einmal in die Umrechnungsfaktortabelle eingetragen." @@ -57902,10 +57939,9 @@ msgid "Unreconcile Transaction" msgstr "Transaktion rückgängig machen" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "Unversöhnt" @@ -57928,10 +57964,6 @@ msgstr "Nicht abgeglichene Einträge" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57977,7 +58009,7 @@ msgstr "Außerplanmäßig" msgid "Unsecured Loans" msgstr "Ungesicherte Kredite" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "Zugeordnete Zahlungsanforderung aufheben" @@ -58192,12 +58224,6 @@ msgstr "Lagerbestand aktualisieren" msgid "Update Type" msgstr "Aktualisierungsart" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "Aktualisierungshäufigkeit des Projekts" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58238,7 +58264,7 @@ msgstr "{0} Finanzberichtszeile(n) mit neuem Kategorienamen aktualisiert" msgid "Updating Costing and Billing fields against this Project..." msgstr "Kosten- und Abrechnungsfelder für dieses Projekt werden aktualisiert..." -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "Varianten werden aktualisiert ..." @@ -58696,12 +58722,6 @@ msgstr "Angewandte Regel validieren" msgid "Validate Components and Quantities Per BOM" msgstr "Komponenten und Mengen je Stückliste validieren" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "Verbrauchte Menge validieren (gemäß Stückliste)" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58725,6 +58745,12 @@ msgstr "Preisregel validieren" msgid "Validate Stock on Save" msgstr "Lagerbestand beim Speichern validieren" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58831,11 +58857,11 @@ msgstr "Bewertungsrate fehlt" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "Der Bewertungssatz für den Posten {0} ist erforderlich, um Buchhaltungseinträge für {1} {2} vorzunehmen." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "Bewertungskurs ist obligatorisch, wenn Öffnung Stock eingegeben" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "Bewertungssatz für Position {0} in Zeile {1} erforderlich" @@ -58845,7 +58871,7 @@ msgstr "Bewertungssatz für Position {0} in Zeile {1} erforderlich" msgid "Valuation and Total" msgstr "Bewertung und Summe" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "Die Bewertungsrate für von Kunden beigestellte Artikel wurde auf Null gesetzt." @@ -58995,7 +59021,7 @@ msgstr "Varianz ({})" msgid "Variant" msgstr "Variante" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "Variantenattributfehler" @@ -59014,7 +59040,7 @@ msgstr "Variantenstückliste" msgid "Variant Based On" msgstr "Variante basierend auf" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "Variant Based On kann nicht geändert werden" @@ -59032,7 +59058,7 @@ msgstr "Variantenfeld" msgid "Variant Item" msgstr "Variantenartikel" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "Variantenartikel" @@ -59413,7 +59439,7 @@ msgstr "Beleg" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59453,7 +59479,7 @@ msgstr "Beleg Menge" #. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "Beleg Untertyp" @@ -59485,7 +59511,7 @@ msgstr "Beleg Untertyp" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59720,7 +59746,7 @@ msgstr "Lager {0} existiert nicht" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "Lager {0} ist für den Auftrag {1} nicht zulässig, es sollte {2} sein" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "Das Lager {0} ist mit keinem Konto verknüpft. Bitte geben Sie das Konto im Lagerdatensatz an oder legen Sie im Unternehmen {1} das Standardbestandskonto fest." @@ -59767,7 +59793,7 @@ msgstr "Lagerhäuser mit bestehenden Transaktion kann nicht in Ledger umgewandel #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59823,6 +59849,12 @@ msgstr "Warnung für neue Angebotsanfrage" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "Warnung - Zeile {0}: Abgerechnete Stunden sind mehr als tatsächliche Stunden" @@ -60006,7 +60038,7 @@ msgstr "Webseiten-Spezifikationen" msgid "Website:" msgstr "Webseite:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60380,7 +60412,7 @@ msgstr "In Arbeitsauftrag verbrauchtes Material" msgid "Work Order Item" msgstr "Arbeitsauftragsposition" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60442,11 +60474,11 @@ msgstr "Arbeitsauftrag wurde nicht erstellt" msgid "Work Order {0} created" msgstr "Arbeitsauftrag {0} erstellt" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "Fertigungsauftrag {0}: Auftragskarte für den Vorgang {1} nicht gefunden" @@ -60762,11 +60794,11 @@ msgstr "Name des Jahrs" msgid "Year Start Date" msgstr "Startdatum des Geschäftsjahres" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60819,7 +60851,7 @@ msgstr "Sie können diese Verknüpfung in Ihren Browser kopieren" msgid "You can also set default CWIP account in Company {}" msgstr "Sie können auch das Standard-CWIP-Konto in Firma {} festlegen" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60973,6 +61005,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -61001,7 +61037,7 @@ msgstr "Sie haben {0} und {1} in {2} aktiviert. Dies kann dazu führen, dass Pre msgid "You have entered a duplicate Delivery Note on Row" msgstr "Sie haben mehrere Lieferscheine eingegeben" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -61009,7 +61045,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "Sie müssen die automatische Nachbestellung in den Lagereinstellungen aktivieren, um den Nachbestellungsstand beizubehalten." @@ -61080,8 +61116,11 @@ msgstr "Lieferungen zum Nullsatz" msgid "Zero quantity" msgstr "Nullmenge" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61193,7 +61232,7 @@ msgstr "exchangerate.host" msgid "fieldname" msgstr "feldname" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61411,6 +61450,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "einzigartig zB SAVE20 Um Rabatt zu bekommen" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "abweichung" @@ -61469,7 +61512,8 @@ msgstr "Verwendeter {0} -Coupon ist {1}. Zulässige Menge ist erschöpft" msgid "{0} Digest" msgstr "{0} Zusammenfassung" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61489,7 +61533,7 @@ msgstr "{0} Operationen: {1}" msgid "{0} Request for {1}" msgstr "{0} Anfrage für {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} Probe aufbewahren basiert auf Charge. Bitte aktivieren Sie die Option Chargennummer, um die Probe des Artikels aufzubewahren" @@ -61602,7 +61646,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} in Artikelsteuer doppelt eingegeben" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "{0} zweimal {1} in Artikelsteuern eingegeben" @@ -61770,7 +61814,7 @@ msgstr "Der Parameter {0} ist ungültig" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} Zahlungsbuchungen können nicht nach {1} gefiltert werden" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "Menge {0} des Artikels {1} wird im Lager {2} mit einer Kapazität von {3} empfangen." @@ -61783,7 +61827,7 @@ msgstr "{0} bis {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "{0} Einheiten sind für Artikel {1} in Lager {2} reserviert. Bitte heben Sie die Reservierung auf, um die Lagerbestandsabstimmung {3} zu können." @@ -61985,7 +62029,7 @@ msgstr "{0} {1}: Konto {2} ist inaktiv" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: Konteneintrag für {2} kann nur in folgender Währung vorgenommen werden: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: Kostenstelle ist zwingend erfoderlich für Artikel {2}" @@ -62071,23 +62115,23 @@ msgstr "{0}: {1} existiert nicht" msgid "{0}: {1} is a group account." msgstr "{0}: {1} ist ein Sammelkonto." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} muss kleiner als {2} sein" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "{count} Vermögensgegenstände erstellt für {item_code}" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} wurde abgebrochen oder geschlossen." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "Die Stichprobengröße von {item_name} ({sample_size}) darf nicht größer sein als die akzeptierte Menge ({accepted_quantity})" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "{ref_doctype} {ref_name} ist {status}." diff --git a/erpnext/locale/eo.po b/erpnext/locale/eo.po index 6555cd3babe..436786fc995 100644 --- a/erpnext/locale/eo.po +++ b/erpnext/locale/eo.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:22\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:22\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Esperanto\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr "crwdns132096:0crwdne132096:0" msgid " Summary" msgstr "crwdns62312:0crwdne62312:0" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "crwdns62314:0crwdne62314:0" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "crwdns62316:0crwdne62316:0" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "crwdns62318:0crwdne62318:0" @@ -302,7 +302,7 @@ msgstr "crwdns62486:0crwdne62486:0" msgid "'From Date' must be after 'To Date'" msgstr "crwdns62488:0crwdne62488:0" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "crwdns62490:0crwdne62490:0" @@ -338,7 +338,7 @@ msgstr "crwdns62498:0{0}crwdne62498:0" msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "crwdns62500:0crwdne62500:0" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "crwdns111570:0{0}crwdnd111570:0{1}crwdne111570:0" @@ -995,7 +995,7 @@ msgstr "crwdns62664:0crwdne62664:0" msgid "A logical Warehouse against which stock entries are made." msgstr "crwdns111582:0crwdne111582:0" -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "crwdns163858:0{0}crwdne163858:0" @@ -1207,7 +1207,7 @@ msgstr "crwdns62788:0{0}crwdne62788:0" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "crwdns132236:0crwdne132236:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "crwdns152084:0{0}crwdnd152084:0{1}crwdne152084:0" @@ -1877,8 +1877,8 @@ msgstr "crwdns132272:0crwdne132272:0" msgid "Accounting Entry for Asset" msgstr "crwdns63168:0crwdne63168:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "crwdns155452:0{0}crwdne155452:0" @@ -1886,7 +1886,7 @@ msgstr "crwdns155452:0{0}crwdne155452:0" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "crwdns155454:0{0}crwdne155454:0" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "crwdns63170:0crwdne63170:0" @@ -1899,16 +1899,16 @@ msgstr "crwdns63170:0crwdne63170:0" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "crwdns63172:0crwdne63172:0" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "crwdns63174:0{0}crwdne63174:0" @@ -2206,12 +2206,6 @@ msgstr "crwdns132294:0crwdne132294:0" msgid "Action If Quality Inspection Is Rejected" msgstr "crwdns132296:0crwdne132296:0" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "crwdns132298:0crwdne132298:0" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "crwdns63298:0crwdne63298:0" @@ -2270,6 +2264,12 @@ msgstr "crwdns155134:0crwdne155134:0" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "crwdns155282:0crwdne155282:0" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "crwdns201743:0crwdne201743:0" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2537,7 +2537,7 @@ msgstr "crwdns132344:0crwdne132344:0" msgid "Actual qty in stock" msgstr "crwdns63452:0crwdne63452:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "crwdns63454:0{0}crwdne63454:0" @@ -2551,7 +2551,7 @@ msgstr "crwdns159788:0crwdne159788:0" msgid "Add / Edit Prices" msgstr "crwdns63462:0crwdne63462:0" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "crwdns63466:0crwdne63466:0" @@ -2705,7 +2705,7 @@ msgstr "crwdns132360:0crwdne132360:0" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "crwdns132362:0crwdne132362:0" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "crwdns200718:0crwdne200718:0" @@ -2950,7 +2950,7 @@ msgstr "crwdns132390:0crwdne132390:0" msgid "Additional Discount Amount (Company Currency)" msgstr "crwdns132392:0crwdne132392:0" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "crwdns161048:0{discount_amount}crwdnd161048:0{total_before_discount}crwdne161048:0" @@ -3235,7 +3235,7 @@ msgstr "crwdns159794:0crwdne159794:0" msgid "Adjustment Against" msgstr "crwdns63814:0crwdne63814:0" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "crwdns63816:0crwdne63816:0" @@ -3348,7 +3348,7 @@ msgstr "crwdns157194:0crwdne157194:0" msgid "Advance amount" msgstr "crwdns132432:0crwdne132432:0" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "crwdns63854:0{0}crwdnd63854:0{1}crwdne63854:0" @@ -3417,7 +3417,7 @@ msgstr "crwdns111606:0crwdne111606:0" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "crwdns63874:0crwdne63874:0" @@ -3535,7 +3535,7 @@ msgstr "crwdns148756:0{0}crwdne148756:0" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "crwdns63928:0crwdne63928:0" @@ -3559,7 +3559,7 @@ msgstr "crwdns63932:0crwdne63932:0" #: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "crwdns63936:0crwdne63936:0" @@ -3840,7 +3840,7 @@ msgstr "crwdns64036:0crwdne64036:0" msgid "All items are already requested" msgstr "crwdns152148:0crwdne152148:0" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "crwdns64038:0crwdne64038:0" @@ -3848,7 +3848,7 @@ msgstr "crwdns64038:0crwdne64038:0" msgid "All items have already been received" msgstr "crwdns112194:0crwdne112194:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "crwdns64040:0crwdne64040:0" @@ -3897,7 +3897,7 @@ msgstr "crwdns64050:0crwdne64050:0" msgid "Allocate Advances Automatically (FIFO)" msgstr "crwdns132504:0crwdne132504:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "crwdns64056:0crwdne64056:0" @@ -3907,7 +3907,7 @@ msgstr "crwdns64056:0crwdne64056:0" msgid "Allocate Payment Based On Payment Terms" msgstr "crwdns132506:0crwdne132506:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "crwdns148852:0crwdne148852:0" @@ -3937,7 +3937,7 @@ msgstr "crwdns132508:0crwdne132508:0" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4058,15 +4058,15 @@ msgstr "crwdns132522:0crwdne132522:0" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "crwdns142934:0crwdne142934:0" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "crwdns132524:0crwdne132524:0" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "crwdns143338:0crwdne143338:0" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "crwdns201745:0crwdne201745:0" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4095,12 +4095,6 @@ msgstr "crwdns132536:0crwdne132536:0" msgid "Allow Negative Stock for Batch" msgstr "crwdns195762:0crwdne195762:0" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "crwdns132538:0crwdne132538:0" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4313,8 +4307,11 @@ msgstr "crwdns132580:0crwdne132580:0" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "crwdns200506:0crwdne200506:0" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "crwdns200508:0crwdne200508:0" @@ -4406,7 +4403,7 @@ msgstr "crwdns64224:0crwdne64224:0" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "crwdns64230:0crwdne64230:0" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "crwdns200728:0crwdne200728:0" @@ -4603,7 +4600,7 @@ msgstr "crwdns155138:0crwdne155138:0" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4633,7 +4630,6 @@ msgstr "crwdns155138:0crwdne155138:0" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4803,10 +4799,6 @@ msgstr "crwdns200889:0crwdne200889:0" msgid "Amount in Account Currency" msgstr "crwdns64568:0crwdne64568:0" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "crwdns154175:0crwdne154175:0" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5426,7 +5418,7 @@ msgstr "crwdns64800:0{0}crwdnd64800:0{1}crwdne64800:0" msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "crwdns64802:0{0}crwdnd64802:0{1}crwdne64802:0" -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "crwdns64804:0{0}crwdnd64804:0{1}crwdne64804:0" @@ -5576,7 +5568,7 @@ msgstr "crwdns64880:0crwdne64880:0" msgid "Asset Category Name" msgstr "crwdns132708:0crwdne132708:0" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "crwdns64884:0crwdne64884:0" @@ -5972,7 +5964,7 @@ msgstr "crwdns157448:0{0}crwdne157448:0" msgid "Asset {0} must be submitted" msgstr "crwdns65070:0{0}crwdne65070:0" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "crwdns154226:0{assets_link}crwdnd154226:0{item_code}crwdne154226:0" @@ -6010,11 +6002,11 @@ msgstr "crwdns65078:0crwdne65078:0" msgid "Assets Setup" msgstr "crwdns197096:0crwdne197096:0" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "crwdns154228:0{item_code}crwdne154228:0" -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "crwdns154230:0{assets_link}crwdnd154230:0{item_code}crwdne154230:0" @@ -6087,7 +6079,7 @@ msgstr "crwdns194944:0{0}crwdne194944:0" msgid "At least one row is required for a financial report template" msgstr "crwdns161052:0crwdne161052:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "crwdns104538:0crwdne104538:0" @@ -6119,7 +6111,7 @@ msgstr "crwdns127452:0{0}crwdnd127452:0{1}crwdne127452:0" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "crwdns65114:0{0}crwdnd65114:0{1}crwdne65114:0" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "crwdns111626:0{0}crwdnd111626:0{1}crwdne111626:0" @@ -6183,7 +6175,11 @@ msgstr "crwdns132752:0crwdne132752:0" msgid "Attribute Value" msgstr "crwdns132754:0crwdne132754:0" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "crwdns201747:0{0}crwdnd201747:0{1}crwdne201747:0" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "crwdns65150:0crwdne65150:0" @@ -6191,11 +6187,19 @@ msgstr "crwdns65150:0crwdne65150:0" msgid "Attribute value: {0} must appear only once" msgstr "crwdns65152:0{0}crwdne65152:0" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "crwdns201749:0{0}crwdne201749:0" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "crwdns201751:0{0}crwdne201751:0" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "crwdns65154:0{0}crwdne65154:0" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "crwdns65156:0crwdne65156:0" @@ -6255,24 +6259,12 @@ msgstr "crwdns132764:0crwdne132764:0" msgid "Auto Create Exchange Rate Revaluation" msgstr "crwdns132768:0crwdne132768:0" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "crwdns132770:0crwdne132770:0" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "crwdns132772:0crwdne132772:0" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "crwdns132774:0crwdne132774:0" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6391,6 +6383,18 @@ msgstr "crwdns199536:0crwdne199536:0" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "crwdns132800:0crwdne132800:0" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "crwdns201753:0crwdne201753:0" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "crwdns201755:0crwdne201755:0" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6608,7 +6612,7 @@ msgstr "crwdns195134:0crwdne195134:0" msgid "Available for use date is required" msgstr "crwdns65316:0crwdne65316:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "crwdns65318:0{0}crwdnd65318:0{1}crwdne65318:0" @@ -6707,7 +6711,7 @@ msgstr "crwdns132854:0crwdne132854:0" msgid "BIN Qty" msgstr "crwdns132856:0crwdne132856:0" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -6980,7 +6984,7 @@ msgstr "crwdns65480:0crwdne65480:0" msgid "BOM Website Operation" msgstr "crwdns65482:0crwdne65482:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "crwdns164148:0crwdne164148:0" @@ -7071,8 +7075,8 @@ msgstr "crwdns132880:0crwdne132880:0" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "crwdns132882:0crwdne132882:0" +msgid "Backflush raw materials of subcontract based on" +msgstr "crwdns201757:0crwdne201757:0" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7092,7 +7096,7 @@ msgstr "crwdns65516:0crwdne65516:0" msgid "Balance (Dr - Cr)" msgstr "crwdns65518:0crwdne65518:0" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "crwdns65520:0{0}crwdne65520:0" @@ -7623,11 +7627,11 @@ msgstr "crwdns65704:0crwdne65704:0" msgid "Barcode Type" msgstr "crwdns132922:0crwdne132922:0" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "crwdns65728:0{0}crwdnd65728:0{1}crwdne65728:0" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "crwdns65730:0{0}crwdnd65730:0{1}crwdne65730:0" @@ -7994,12 +7998,12 @@ msgstr "crwdns65884:0{0}crwdne65884:0" msgid "Batch {0} is not available in warehouse {1}" msgstr "crwdns132978:0{0}crwdnd132978:0{1}crwdne132978:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "crwdns65886:0{0}crwdnd65886:0{1}crwdne65886:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "crwdns65888:0{0}crwdnd65888:0{1}crwdne65888:0" @@ -8072,8 +8076,8 @@ msgstr "crwdns65906:0crwdne65906:0" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "crwdns132986:0crwdne132986:0" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "crwdns201759:0crwdne201759:0" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8413,8 +8417,11 @@ msgstr "crwdns66050:0crwdne66050:0" msgid "Blanket Order Rate" msgstr "crwdns133028:0crwdne133028:0" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "crwdns200516:0crwdne200516:0" @@ -8929,7 +8936,7 @@ msgstr "crwdns133084:0crwdne133084:0" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "crwdns66264:0{0}crwdne66264:0" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "crwdns66266:0crwdne66266:0" @@ -9294,7 +9301,7 @@ msgstr "crwdns66404:0crwdne66404:0" msgid "Can only make payment against unbilled {0}" msgstr "crwdns66406:0{0}crwdne66406:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9350,9 +9357,9 @@ msgstr "crwdns160598:0crwdne160598:0" msgid "Cannot Create Return" msgstr "crwdns154636:0crwdne154636:0" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "crwdns66522:0crwdne66522:0" @@ -9380,7 +9387,7 @@ msgstr "crwdns66530:0{0}crwdnd66530:0{1}crwdne66530:0" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "crwdns66532:0crwdne66532:0" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "crwdns66534:0crwdne66534:0" @@ -9416,7 +9423,7 @@ msgstr "crwdns160282:0crwdne160282:0" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "crwdns164154:0{0}crwdne164154:0" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "crwdns154236:0{asset_link}crwdne154236:0" @@ -9424,7 +9431,7 @@ msgstr "crwdns154236:0{asset_link}crwdne154236:0" msgid "Cannot cancel transaction for Completed Work Order." msgstr "crwdns66546:0crwdne66546:0" -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "crwdns66548:0crwdne66548:0" @@ -9436,7 +9443,7 @@ msgstr "crwdns66552:0crwdne66552:0" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "crwdns66554:0{0}crwdne66554:0" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "crwdns66556:0crwdne66556:0" @@ -9464,11 +9471,11 @@ msgstr "crwdns66566:0crwdne66566:0" msgid "Cannot covert to Group because Account Type is selected." msgstr "crwdns66568:0crwdne66568:0" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "crwdns66570:0crwdne66570:0" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "crwdns66574:0{0}crwdne66574:0" @@ -9494,7 +9501,7 @@ msgstr "crwdns66580:0crwdne66580:0" msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "crwdns66582:0crwdne66582:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "crwdns151892:0crwdne151892:0" @@ -9531,7 +9538,7 @@ msgstr "crwdns199136:0{0}crwdne199136:0" msgid "Cannot disassemble more than produced quantity." msgstr "crwdns155788:0crwdne155788:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "crwdns200028:0{0}crwdnd200028:0{1}crwdnd200028:0{2}crwdne200028:0" @@ -9539,8 +9546,8 @@ msgstr "crwdns200028:0{0}crwdnd200028:0{1}crwdnd200028:0{2}crwdne200028:0" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "crwdns160602:0{0}crwdne160602:0" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "crwdns66586:0{0}crwdne66586:0" @@ -9584,7 +9591,7 @@ msgstr "crwdns66600:0crwdne66600:0" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "crwdns163930:0crwdne163930:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9602,8 +9609,8 @@ msgstr "crwdns66606:0crwdne66606:0" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "crwdns200010:0crwdne200010:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9619,7 +9626,7 @@ msgstr "crwdns66610:0crwdne66610:0" msgid "Cannot set authorization on basis of Discount for {0}" msgstr "crwdns66612:0{0}crwdne66612:0" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "crwdns66614:0crwdne66614:0" @@ -10530,7 +10537,7 @@ msgstr "crwdns66970:0crwdne66970:0" msgid "Closing (Dr)" msgstr "crwdns66972:0crwdne66972:0" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "crwdns66974:0crwdne66974:0" @@ -10991,7 +10998,7 @@ msgstr "crwdns133292:0crwdne133292:0" #: 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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11273,7 +11280,7 @@ msgstr "crwdns67090:0crwdne67090:0" msgid "Company Abbreviation" msgstr "crwdns67340:0crwdne67340:0" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "crwdns200736:0crwdne200736:0" @@ -11286,7 +11293,7 @@ msgstr "crwdns67342:0crwdne67342:0" msgid "Company Account" msgstr "crwdns133294:0crwdne133294:0" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "crwdns194962:0crwdne194962:0" @@ -11462,7 +11469,7 @@ msgstr "crwdns199144:0crwdne199144:0" msgid "Company is mandatory" msgstr "crwdns148766:0crwdne148766:0" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "crwdns104548:0crwdne104548:0" @@ -11733,7 +11740,7 @@ msgstr "crwdns201005:0crwdne201005:0" msgid "Configure Accounts for Bank Entry" msgstr "crwdns201007:0crwdne201007:0" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "crwdns201009:0crwdne201009:0" @@ -11746,7 +11753,9 @@ msgstr "crwdns197108:0crwdne197108:0" msgid "Configure Product Assembly" msgstr "crwdns67608:0crwdne67608:0" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "crwdns200738:0crwdne200738:0" @@ -11764,13 +11773,13 @@ msgstr "crwdns201013:0crwdne201013:0" msgid "Configure settings for the banking module" msgstr "crwdns201015:0crwdne201015:0" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "crwdns133358:0crwdne133358:0" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "crwdns67612:0crwdne67612:0" @@ -11948,7 +11957,7 @@ msgstr "crwdns200522:0crwdne200522:0" msgid "Consumed" msgstr "crwdns67694:0crwdne67694:0" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "crwdns67696:0crwdne67696:0" @@ -11992,7 +12001,7 @@ msgstr "crwdns154864:0crwdne154864:0" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12165,10 +12174,6 @@ msgstr "crwdns154240:0{0}crwdne154240:0" msgid "Contact:" msgstr "crwdns160286:0crwdne160286:0" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "crwdns154242:0crwdne154242:0" - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12346,7 +12351,7 @@ msgstr "crwdns67944:0crwdne67944:0" msgid "Conversion Rate" msgstr "crwdns67978:0crwdne67978:0" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "crwdns67986:0{0}crwdne67986:0" @@ -12618,7 +12623,7 @@ msgstr "crwdns200526:0crwdne200526:0" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12713,7 +12718,7 @@ msgid "Cost Center is required" msgstr "crwdns201023:0crwdne201023:0" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "crwdns68166:0{0}crwdnd68166:0{1}crwdne68166:0" @@ -13051,7 +13056,7 @@ msgstr "crwdns197126:0crwdne197126:0" msgid "Create Grouped Asset" msgstr "crwdns133502:0crwdne133502:0" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "crwdns68318:0crwdne68318:0" @@ -13424,7 +13429,7 @@ msgstr "crwdns68456:0{0}crwdnd68456:0{1}crwdne68456:0" msgid "Created By Migration" msgstr "crwdns164164:0crwdne164164:0" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "crwdns68460:0{0}crwdnd68460:0{1}crwdne68460:0" @@ -13565,15 +13570,15 @@ msgstr "crwdns68496:0{0}crwdne68496:0" msgid "Credit" msgstr "crwdns68498:0crwdne68498:0" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "crwdns68504:0crwdne68504:0" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "crwdns68506:0{0}crwdne68506:0" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "crwdns68508:0crwdne68508:0" @@ -13768,7 +13773,7 @@ msgstr "crwdns160066:0crwdne160066:0" msgid "Creditors" msgstr "crwdns68586:0crwdne68586:0" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "crwdns201037:0crwdne201037:0" @@ -14066,7 +14071,7 @@ msgstr "crwdns133586:0crwdne133586:0" msgid "Current Serial No" msgstr "crwdns133588:0crwdne133588:0" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "crwdns200750:0crwdne200750:0" @@ -14267,7 +14272,7 @@ msgstr "crwdns142924:0crwdne142924:0" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15040,7 +15045,7 @@ msgstr "crwdns160652:0crwdne160652:0" msgid "Day Of Week" msgstr "crwdns133698:0crwdne133698:0" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "crwdns200752:0crwdne200752:0" @@ -15156,11 +15161,11 @@ msgstr "crwdns143396:0crwdne143396:0" msgid "Debit" msgstr "crwdns69316:0crwdne69316:0" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "crwdns69322:0crwdne69322:0" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "crwdns69324:0{0}crwdne69324:0" @@ -15170,7 +15175,7 @@ msgstr "crwdns69324:0{0}crwdne69324:0" msgid "Debit / Credit Note Posting Date" msgstr "crwdns158694:0crwdne158694:0" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "crwdns69326:0crwdne69326:0" @@ -15281,7 +15286,7 @@ msgstr "crwdns133736:0crwdne133736:0" msgid "Debit/Credit" msgstr "crwdns201039:0crwdne201039:0" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "crwdns201041:0crwdne201041:0" @@ -15423,7 +15428,7 @@ msgstr "crwdns164172:0crwdne164172:0" msgid "Default BOM" msgstr "crwdns133760:0crwdne133760:0" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "crwdns69414:0{0}crwdne69414:0" @@ -15780,15 +15785,15 @@ msgstr "crwdns133868:0crwdne133868:0" msgid "Default Unit of Measure" msgstr "crwdns133872:0crwdne133872:0" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "crwdns69574:0{0}crwdne69574:0" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "crwdns69576:0{0}crwdne69576:0" -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "crwdns69578:0{0}crwdnd69578:0{1}crwdne69578:0" @@ -16089,7 +16094,7 @@ msgstr "crwdns200530:0crwdne200530:0" msgid "Delivered" msgstr "crwdns69688:0crwdne69688:0" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "crwdns69698:0crwdne69698:0" @@ -16139,8 +16144,8 @@ msgstr "crwdns69704:0crwdne69704:0" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16151,11 +16156,11 @@ msgstr "crwdns69706:0crwdne69706:0" msgid "Delivered Qty (in Stock UOM)" msgstr "crwdns155462:0crwdne155462:0" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "crwdns201049:0{0}crwdnd201049:0{1}crwdne201049:0" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "crwdns201051:0{0}crwdnd201051:0{1}crwdne201051:0" @@ -16244,7 +16249,7 @@ msgstr "crwdns69736:0crwdne69736:0" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16769,7 +16774,7 @@ msgstr "crwdns154878:0crwdne154878:0" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "crwdns154766:0crwdne154766:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "crwdns70160:0crwdne70160:0" @@ -16933,11 +16938,9 @@ msgstr "crwdns164176:0crwdne164176:0" msgid "Disable In Words" msgstr "crwdns133992:0crwdne133992:0" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "crwdns133994:0crwdne133994:0" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "crwdns201761:0crwdne201761:0" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -16978,6 +16981,12 @@ msgstr "crwdns133998:0crwdne133998:0" msgid "Disable Transaction Threshold" msgstr "crwdns164178:0crwdne164178:0" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "crwdns201763:0crwdne201763:0" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17034,7 +17043,7 @@ msgstr "crwdns148608:0crwdne148608:0" msgid "Disassemble Order" msgstr "crwdns148862:0crwdne148862:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "crwdns200030:0crwdne200030:0" @@ -17559,6 +17568,12 @@ msgstr "crwdns142828:0crwdne142828:0" msgid "Do Not Use Batchwise Valuation" msgstr "crwdns199148:0crwdne199148:0" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "crwdns201765:0crwdne201765:0" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17649,9 +17664,12 @@ msgstr "crwdns70518:0crwdne70518:0" msgid "Document Count" msgstr "crwdns194984:0crwdne194984:0" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "crwdns200758:0crwdne200758:0" @@ -17669,6 +17687,10 @@ msgstr "crwdns134082:0crwdne134082:0" msgid "Document Type already used as a dimension" msgstr "crwdns70546:0crwdne70546:0" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "crwdns201767:0crwdne201767:0" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -17973,7 +17995,7 @@ msgstr "crwdns70782:0crwdne70782:0" msgid "Duplicate Sales Invoices found" msgstr "crwdns154640:0crwdne154640:0" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "crwdns163864:0crwdne163864:0" @@ -18093,8 +18115,8 @@ msgstr "crwdns134144:0crwdne134144:0" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "crwdns200760:0crwdne200760:0" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18317,7 +18339,7 @@ msgstr "crwdns151896:0crwdne151896:0" msgid "Email Sent to Supplier {0}" msgstr "crwdns70954:0{0}crwdne70954:0" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "crwdns199556:0crwdne199556:0" @@ -18507,7 +18529,7 @@ msgstr "crwdns134196:0crwdne134196:0" msgid "Employee cannot report to himself." msgstr "crwdns71048:0crwdne71048:0" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "crwdns197174:0crwdne197174:0" @@ -18515,7 +18537,7 @@ msgstr "crwdns197174:0crwdne197174:0" msgid "Employee is required while issuing Asset {0}" msgstr "crwdns71050:0{0}crwdne71050:0" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "crwdns199560:0{0}crwdne199560:0" @@ -18528,7 +18550,7 @@ msgstr "crwdns159256:0{0}crwdnd159256:0{1}crwdne159256:0" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "crwdns152577:0{0}crwdne152577:0" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "crwdns197176:0{0}crwdne197176:0" @@ -18571,7 +18593,7 @@ msgstr "crwdns134200:0crwdne134200:0" msgid "Enable Auto Email" msgstr "crwdns134202:0crwdne134202:0" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "crwdns71062:0crwdne71062:0" @@ -19169,7 +19191,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "crwdns154884:0{0}crwdnd154884:0{1}crwdne154884:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "crwdns71274:0{0}crwdne71274:0" @@ -19215,7 +19237,7 @@ msgstr "crwdns143418:0crwdne143418:0" msgid "Example URL" msgstr "crwdns134280:0crwdne134280:0" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "crwdns71292:0{0}crwdne71292:0" @@ -19244,7 +19266,7 @@ msgstr "crwdns71298:0{0}crwdnd71298:0{1}crwdne71298:0" msgid "Exception Budget Approver Role" msgstr "crwdns134286:0crwdne134286:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "crwdns200032:0crwdne200032:0" @@ -19603,7 +19625,7 @@ msgstr "crwdns134320:0crwdne134320:0" msgid "Expense" msgstr "crwdns71456:0crwdne71456:0" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "crwdns71466:0{0}crwdne71466:0" @@ -19651,7 +19673,7 @@ msgstr "crwdns71466:0{0}crwdne71466:0" msgid "Expense Account" msgstr "crwdns71468:0crwdne71468:0" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "crwdns71496:0crwdne71496:0" @@ -20114,7 +20136,7 @@ msgstr "crwdns71720:0crwdne71720:0" msgid "Filter by Reference Date" msgstr "crwdns134378:0crwdne134378:0" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "crwdns201109:0crwdne201109:0" @@ -20444,7 +20466,7 @@ msgstr "crwdns71842:0crwdne71842:0" msgid "Finished Goods based Operating Cost" msgstr "crwdns134426:0crwdne134426:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "crwdns71844:0{0}crwdnd71844:0{1}crwdne71844:0" @@ -20539,7 +20561,7 @@ msgstr "crwdns71872:0{0}crwdne71872:0" msgid "Fiscal Year" msgstr "crwdns71874:0crwdne71874:0" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "crwdns200776:0crwdne200776:0" @@ -20603,7 +20625,7 @@ msgstr "crwdns134438:0crwdne134438:0" msgid "Fixed Asset Defaults" msgstr "crwdns134440:0crwdne134440:0" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "crwdns71914:0crwdne71914:0" @@ -20753,7 +20775,7 @@ msgstr "crwdns134460:0crwdne134460:0" msgid "For Item" msgstr "crwdns111740:0crwdne111740:0" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "crwdns104576:0{0}crwdnd104576:0{1}crwdnd104576:0{2}crwdnd104576:0{3}crwdne104576:0" @@ -20784,7 +20806,7 @@ msgstr "crwdns134464:0crwdne134464:0" msgid "For Production" msgstr "crwdns134466:0crwdne134466:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "crwdns71966:0crwdne71966:0" @@ -20868,6 +20890,12 @@ msgstr "crwdns154774:0{0}crwdnd154774:0{1}crwdnd154774:0{2}crwdnd154774:0{3}crwd msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "crwdns71992:0{0}crwdnd71992:0{1}crwdnd71992:0{2}crwdne71992:0" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "crwdns201769:0crwdne201769:0" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "crwdns195160:0{0}crwdnd195160:0{1}crwdne195160:0" @@ -20889,7 +20917,7 @@ msgstr "crwdns197182:0{0}crwdne197182:0" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "crwdns159832:0crwdne159832:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "crwdns71998:0{0}crwdnd71998:0{1}crwdne71998:0" @@ -20898,7 +20926,7 @@ msgstr "crwdns71998:0{0}crwdnd71998:0{1}crwdne71998:0" msgid "For reference" msgstr "crwdns134478:0crwdne134478:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "crwdns72002:0{0}crwdnd72002:0{1}crwdnd72002:0{2}crwdnd72002:0{3}crwdne72002:0" @@ -20922,7 +20950,7 @@ msgstr "crwdns72006:0{0}crwdne72006:0" msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "crwdns111744:0crwdne111744:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "crwdns195002:0{0}crwdnd195002:0{1}crwdnd195002:0{2}crwdne195002:0" @@ -20931,7 +20959,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 "crwdns154502:0{0}crwdnd154502:0{1}crwdne154502:0" -#: erpnext/controllers/stock_controller.py:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "crwdns134480:0{0}crwdnd134480:0{1}crwdne134480:0" @@ -21544,7 +21572,7 @@ msgstr "crwdns72312:0crwdne72312:0" msgid "GENERAL LEDGER" msgstr "crwdns160216:0crwdne160216:0" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "crwdns201123:0crwdne201123:0" @@ -21556,7 +21584,7 @@ msgstr "crwdns72314:0crwdne72314:0" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "crwdns72316:0crwdne72316:0" @@ -22071,7 +22099,7 @@ msgstr "crwdns72490:0crwdne72490:0" msgid "Goods Transferred" msgstr "crwdns72492:0crwdne72492:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "crwdns72494:0{0}crwdne72494:0" @@ -22254,7 +22282,7 @@ msgstr "crwdns197184:0crwdne197184:0" msgid "Grant Commission" msgstr "crwdns134672:0crwdne134672:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "crwdns72570:0crwdne72570:0" @@ -22895,11 +22923,11 @@ msgstr "crwdns134760:0crwdne134760:0" msgid "How many units of the final product this BOM makes." msgstr "crwdns200550:0crwdne200550:0" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" -msgstr "crwdns134764:0crwdne134764:0" +msgid "How often should project be updated of Total Purchase Cost ?" +msgstr "crwdns201771:0crwdne201771:0" #. Label of the sales_update_frequency (Select) field in DocType 'Selling #. Settings' @@ -23053,7 +23081,7 @@ msgstr "crwdns72914:0crwdne72914:0" msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "crwdns134790:0crwdne134790:0" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23235,7 +23263,7 @@ msgstr "crwdns154419:0crwdne154419:0" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "crwdns160654:0crwdne160654:0" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23407,11 +23435,11 @@ msgstr "crwdns72984:0crwdne72984:0" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "crwdns134850:0crwdne134850:0" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "crwdns72988:0crwdne72988:0" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "crwdns72990:0crwdne72990:0" @@ -23527,7 +23555,7 @@ msgstr "crwdns73020:0crwdne73020:0" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "crwdns155920:0crwdne155920:0" @@ -23579,7 +23607,7 @@ msgstr "crwdns73048:0crwdne73048:0" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "crwdns143452:0crwdne143452:0" @@ -23622,7 +23650,7 @@ msgstr "crwdns134872:0crwdne134872:0" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "crwdns152316:0crwdne152316:0" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "crwdns195014:0{0}crwdnd195014:0{1}crwdne195014:0" @@ -23636,6 +23664,7 @@ msgid "Implementation Partner" msgstr "crwdns143454:0crwdne143454:0" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -23989,7 +24018,7 @@ msgstr "crwdns73346:0crwdne73346:0" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24243,7 +24272,7 @@ msgstr "crwdns73454:0crwdne73454:0" msgid "Incorrect Batch Consumed" msgstr "crwdns73456:0crwdne73456:0" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "crwdns127834:0crwdne127834:0" @@ -24251,7 +24280,7 @@ msgstr "crwdns127834:0crwdne127834:0" msgid "Incorrect Company" msgstr "crwdns197190:0crwdne197190:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "crwdns148794:0crwdne148794:0" @@ -24461,14 +24490,14 @@ msgstr "crwdns73548:0crwdne73548:0" msgid "Inspected By" msgstr "crwdns73556:0crwdne73556:0" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "crwdns73560:0crwdne73560:0" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "crwdns73562:0crwdne73562:0" @@ -24485,7 +24514,7 @@ msgstr "crwdns134970:0crwdne134970:0" msgid "Inspection Required before Purchase" msgstr "crwdns134972:0crwdne134972:0" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "crwdns73570:0crwdne73570:0" @@ -24567,8 +24596,8 @@ msgstr "crwdns73608:0crwdne73608:0" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "crwdns73610:0crwdne73610:0" @@ -24788,7 +24817,7 @@ msgstr "crwdns73694:0crwdne73694:0" msgid "Internal Work History" msgstr "crwdns135024:0crwdne135024:0" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "crwdns73698:0crwdne73698:0" @@ -24881,7 +24910,7 @@ msgstr "crwdns73730:0crwdne73730:0" msgid "Invalid Discount" msgstr "crwdns152034:0crwdne152034:0" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "crwdns161126:0crwdne161126:0" @@ -24911,7 +24940,7 @@ msgstr "crwdns73740:0crwdne73740:0" msgid "Invalid Item" msgstr "crwdns73742:0crwdne73742:0" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "crwdns73744:0crwdne73744:0" @@ -24997,12 +25026,12 @@ msgstr "crwdns73768:0crwdne73768:0" msgid "Invalid Selling Price" msgstr "crwdns73770:0crwdne73770:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "crwdns127484:0crwdne127484:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "crwdns160658:0crwdne160658:0" @@ -25039,7 +25068,7 @@ msgstr "crwdns161128:0crwdne161128:0" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "crwdns73780:0{0}crwdne73780:0" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "crwdns73782:0{0}crwdne73782:0" @@ -25168,7 +25197,6 @@ msgstr "crwdns135032:0crwdne135032:0" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "crwdns135034:0crwdne135034:0" @@ -25189,10 +25217,6 @@ msgstr "crwdns155376:0crwdne155376:0" msgid "Invoice Grand Total" msgstr "crwdns73824:0crwdne73824:0" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "crwdns154187:0crwdne154187:0" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25714,13 +25738,13 @@ msgstr "crwdns161290:0crwdne161290:0" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "crwdns135138:0crwdne135138:0" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "crwdns201773:0crwdne201773:0" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "crwdns135140:0crwdne135140:0" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "crwdns201775:0crwdne201775:0" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -25992,7 +26016,7 @@ msgstr "crwdns74210:0crwdne74210:0" msgid "Issuing Date" msgstr "crwdns135184:0crwdne135184:0" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "crwdns74220:0crwdne74220:0" @@ -26062,7 +26086,7 @@ msgstr "crwdns161132:0crwdne161132:0" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26109,6 +26133,7 @@ msgstr "crwdns161132:0crwdne161132:0" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26124,7 +26149,6 @@ msgstr "crwdns161132:0crwdne161132:0" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26888,6 +26912,7 @@ msgstr "crwdns74534:0crwdne74534:0" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26898,7 +26923,6 @@ msgstr "crwdns74534:0crwdne74534:0" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27158,11 +27182,11 @@ msgstr "crwdns74758:0crwdne74758:0" msgid "Item Variant {0} already exists with same attributes" msgstr "crwdns74762:0{0}crwdne74762:0" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "crwdns74764:0crwdne74764:0" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "crwdns74766:0crwdne74766:0" @@ -27201,6 +27225,15 @@ msgstr "crwdns74768:0crwdne74768:0" msgid "Item Weight Details" msgstr "crwdns135220:0crwdne135220:0" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "crwdns201777:0crwdne201777:0" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27230,7 +27263,7 @@ msgstr "crwdns135222:0crwdne135222:0" msgid "Item Wise Tax Details" msgstr "crwdns161294:0crwdne161294:0" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "crwdns161296:0crwdne161296:0" @@ -27250,11 +27283,11 @@ msgstr "crwdns135226:0crwdne135226:0" msgid "Item and Warranty Details" msgstr "crwdns135228:0crwdne135228:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "crwdns74796:0{0}crwdne74796:0" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "crwdns74798:0crwdne74798:0" @@ -27284,7 +27317,7 @@ msgstr "crwdns135230:0crwdne135230:0" msgid "Item qty can not be updated as raw materials are already processed." msgstr "crwdns74808:0crwdne74808:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "crwdns74810:0{0}crwdne74810:0" @@ -27303,10 +27336,14 @@ msgstr "crwdns111790:0crwdne111790:0" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "crwdns74814:0crwdne74814:0" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "crwdns74816:0{0}crwdne74816:0" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "crwdns201779:0{0}crwdne201779:0" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "crwdns164208:0{0}crwdnd164208:0{1}crwdnd164208:0{2}crwdnd164208:0{3}crwdne164208:0" @@ -27320,7 +27357,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "crwdns74820:0{0}crwdnd74820:0{1}crwdnd74820:0{2}crwdne74820:0" #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "crwdns74822:0{0}crwdne74822:0" @@ -27328,7 +27365,7 @@ msgstr "crwdns74822:0{0}crwdne74822:0" msgid "Item {0} does not exist in the system or has expired" msgstr "crwdns74824:0{0}crwdne74824:0" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "crwdns149136:0{0}crwdne149136:0" @@ -27344,15 +27381,15 @@ msgstr "crwdns74828:0{0}crwdne74828:0" msgid "Item {0} has been disabled" msgstr "crwdns74830:0{0}crwdne74830:0" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "crwdns104602:0{0}crwdne104602:0" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "crwdns201181:0{0}crwdne201181:0" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "crwdns74834:0{0}crwdnd74834:0{1}crwdne74834:0" @@ -27364,19 +27401,23 @@ msgstr "crwdns74836:0{0}crwdne74836:0" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "crwdns74838:0{0}crwdnd74838:0{1}crwdne74838:0" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "crwdns74840:0{0}crwdne74840:0" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "crwdns74842:0{0}crwdne74842:0" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "crwdns201781:0{0}crwdne201781:0" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "crwdns74844:0{0}crwdne74844:0" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "crwdns74846:0{0}crwdne74846:0" @@ -27384,7 +27425,11 @@ msgstr "crwdns74846:0{0}crwdne74846:0" msgid "Item {0} is not a subcontracted item" msgstr "crwdns152154:0{0}crwdne152154:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "crwdns201783:0{0}crwdne201783:0" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "crwdns74848:0{0}crwdne74848:0" @@ -27400,7 +27445,7 @@ msgstr "crwdns74852:0{0}crwdne74852:0" msgid "Item {0} must be a non-stock item" msgstr "crwdns74856:0{0}crwdne74856:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "crwdns74858:0{0}crwdnd74858:0{1}crwdnd74858:0{2}crwdne74858:0" @@ -27416,7 +27461,7 @@ msgstr "crwdns74862:0{0}crwdnd74862:0{1}crwdnd74862:0{2}crwdne74862:0" msgid "Item {0}: {1} qty produced. " msgstr "crwdns74864:0{0}crwdnd74864:0{1}crwdne74864:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "crwdns74866:0crwdne74866:0" @@ -27526,7 +27571,7 @@ msgstr "crwdns74946:0crwdne74946:0" msgid "Items not found." msgstr "crwdns164210:0crwdne164210:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "crwdns74948:0{0}crwdne74948:0" @@ -28159,7 +28204,7 @@ msgstr "crwdns158344:0crwdne158344:0" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "crwdns75138:0{0}crwdnd75138:0{1}crwdnd75138:0{2}crwdne75138:0" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "crwdns201187:0crwdne201187:0" @@ -28437,7 +28482,7 @@ msgstr "crwdns75264:0crwdne75264:0" msgid "Length (cm)" msgstr "crwdns135312:0crwdne135312:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "crwdns75272:0crwdne75272:0" @@ -28578,7 +28623,7 @@ msgstr "crwdns135348:0crwdne135348:0" msgid "Linked Location" msgstr "crwdns75434:0crwdne75434:0" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "crwdns75436:0crwdne75436:0" @@ -28973,11 +29018,6 @@ msgstr "crwdns75648:0crwdne75648:0" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "crwdns155284:0crwdne155284:0" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "crwdns135396:0crwdne135396:0" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -28989,6 +29029,11 @@ msgstr "crwdns135398:0crwdne135398:0" msgid "Maintain same rate throughout sales cycle" msgstr "crwdns200560:0crwdne200560:0" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "crwdns201785:0crwdne201785:0" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29185,7 +29230,7 @@ msgid "Major/Optional Subjects" msgstr "crwdns135426:0crwdne135426:0" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29354,8 +29399,8 @@ msgstr "crwdns135450:0crwdne135450:0" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29414,8 +29459,8 @@ msgstr "crwdns75834:0crwdne75834:0" #: 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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29564,7 +29609,7 @@ msgstr "crwdns135458:0crwdne135458:0" msgid "Manufacturing Manager" msgstr "crwdns75920:0crwdne75920:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "crwdns75922:0crwdne75922:0" @@ -29840,7 +29885,7 @@ msgstr "crwdns76016:0crwdne76016:0" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "crwdns135480:0crwdne135480:0" @@ -29911,6 +29956,7 @@ msgstr "crwdns76036:0crwdne76036:0" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30017,11 +30063,11 @@ msgstr "crwdns76110:0crwdne76110:0" msgid "Material Request Type" msgstr "crwdns111814:0crwdne111814:0" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "crwdns199154:0crwdne199154:0" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "crwdns76118:0crwdne76118:0" @@ -30136,7 +30182,7 @@ msgstr "crwdns135498:0crwdne135498:0" msgid "Material Transferred for Manufacturing" msgstr "crwdns135500:0crwdne135500:0" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30265,11 +30311,11 @@ msgstr "crwdns135524:0crwdne135524:0" msgid "Maximum Producible Items" msgstr "crwdns199582:0crwdne199582:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "crwdns76212:0{0}crwdnd76212:0{1}crwdnd76212:0{2}crwdne76212:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "crwdns76214:0{0}crwdnd76214:0{1}crwdnd76214:0{2}crwdnd76214:0{3}crwdne76214:0" @@ -30713,11 +30759,11 @@ msgstr "crwdns195172:0crwdne195172:0" msgid "Miscellaneous Expenses" msgstr "crwdns76346:0crwdne76346:0" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "crwdns76348:0crwdne76348:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "crwdns76350:0crwdne76350:0" @@ -30755,7 +30801,7 @@ msgstr "crwdns157474:0crwdne157474:0" msgid "Missing Finance Book" msgstr "crwdns76358:0crwdne76358:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "crwdns76360:0crwdne76360:0" @@ -30763,11 +30809,11 @@ msgstr "crwdns76360:0crwdne76360:0" msgid "Missing Formula" msgstr "crwdns76362:0crwdne76362:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "crwdns152088:0crwdne152088:0" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "crwdns197204:0crwdne197204:0" @@ -30811,10 +30857,6 @@ msgstr "crwdns76376:0crwdne76376:0" msgid "Mixed Conditions" msgstr "crwdns135588:0crwdne135588:0" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "crwdns154189:0crwdne154189:0" - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31083,7 +31125,7 @@ msgstr "crwdns195028:0{0}crwdne195028:0" msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "crwdns76640:0{0}crwdne76640:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "crwdns76642:0crwdne76642:0" @@ -31162,27 +31204,20 @@ msgstr "crwdns135634:0crwdne135634:0" msgid "Naming Series Prefix" msgstr "crwdns135638:0crwdne135638:0" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "crwdns135640:0crwdne135640:0" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "crwdns200794:0{0}crwdne200794:0" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "crwdns152587:0crwdne152587:0" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "crwdns200796:0crwdne200796:0" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "crwdns200798:0crwdne200798:0" @@ -31230,16 +31265,16 @@ msgstr "crwdns76732:0crwdne76732:0" msgid "Negative Batch Report" msgstr "crwdns195870:0crwdne195870:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "crwdns76734:0crwdne76734:0" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "crwdns160326:0crwdne160326:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "crwdns76736:0crwdne76736:0" @@ -31853,7 +31888,7 @@ msgstr "crwdns77046:0crwdne77046:0" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "crwdns77048:0crwdne77048:0" @@ -31866,7 +31901,7 @@ msgstr "crwdns152156:0crwdne152156:0" msgid "No Records for these settings." msgstr "crwdns77050:0crwdne77050:0" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "crwdns154423:0crwdne154423:0" @@ -31911,7 +31946,7 @@ msgstr "crwdns77064:0crwdne77064:0" msgid "No Work Orders were created" msgstr "crwdns77066:0crwdne77066:0" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "crwdns77068:0crwdne77068:0" @@ -31924,7 +31959,7 @@ msgstr "crwdns201221:0crwdne201221:0" msgid "No accounts found." msgstr "crwdns201223:0crwdne201223:0" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "crwdns77070:0{0}crwdne77070:0" @@ -31936,7 +31971,7 @@ msgstr "crwdns77072:0crwdne77072:0" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "crwdns158396:0{0}crwdnd158396:0{1}crwdne158396:0" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "crwdns201225:0crwdne201225:0" @@ -31944,7 +31979,7 @@ msgstr "crwdns201225:0crwdne201225:0" msgid "No bank statements imported yet" msgstr "crwdns201227:0crwdne201227:0" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "crwdns201229:0crwdne201229:0" @@ -32038,7 +32073,7 @@ msgstr "crwdns77104:0crwdne77104:0" msgid "No more children on Right" msgstr "crwdns77106:0crwdne77106:0" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "crwdns200800:0crwdne200800:0" @@ -32213,7 +32248,7 @@ msgstr "crwdns201245:0crwdne201245:0" msgid "No stock available for this batch." msgstr "crwdns200200:0crwdne200200:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "crwdns154776:0crwdne154776:0" @@ -32305,7 +32340,7 @@ msgstr "crwdns135710:0crwdne135710:0" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "crwdns200202:0{0}crwdne200202:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "crwdns77174:0crwdne77174:0" @@ -32409,7 +32444,7 @@ msgstr "crwdns104614:0{0}crwdne104614:0" msgid "Not authorized to edit frozen Account {0}" msgstr "crwdns77210:0{0}crwdne77210:0" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "crwdns200802:0crwdne200802:0" @@ -32455,7 +32490,7 @@ msgstr "crwdns77234:0crwdne77234:0" msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "crwdns77236:0crwdne77236:0" -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "crwdns77238:0{0}crwdne77238:0" @@ -32932,7 +32967,7 @@ msgstr "crwdns163958:0crwdne163958:0" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "crwdns195174:0crwdne195174:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "crwdns111850:0{0}crwdnd111850:0{1}crwdne111850:0" @@ -33083,7 +33118,7 @@ msgstr "crwdns201265:0crwdne201265:0" msgid "Open {0} in a new tab" msgstr "crwdns201267:0{0}crwdne201267:0" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "crwdns77536:0crwdne77536:0" @@ -33242,16 +33277,16 @@ msgstr "crwdns148808:0crwdne148808:0" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "crwdns77584:0crwdne77584:0" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "crwdns200804:0{0}crwdne200804:0" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "crwdns200806:0{0}crwdne200806:0" @@ -33608,7 +33643,7 @@ msgstr "crwdns77756:0crwdne77756:0" msgid "Optional. Used with Financial Report Template" msgstr "crwdns161486:0crwdne161486:0" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "crwdns200808:0crwdne200808:0" @@ -33742,7 +33777,7 @@ msgstr "crwdns77814:0crwdne77814:0" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "crwdns77818:0crwdne77818:0" @@ -33950,7 +33985,7 @@ msgstr "crwdns154389:0crwdne154389:0" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34008,7 +34043,7 @@ msgstr "crwdns195876:0crwdne195876:0" msgid "Over Billing Allowance (%)" msgstr "crwdns135914:0crwdne135914:0" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "crwdns154918:0{0}crwdnd154918:0{1}crwdnd154918:0{2}crwdne154918:0" @@ -34026,7 +34061,7 @@ msgstr "crwdns135916:0crwdne135916:0" msgid "Over Picking Allowance" msgstr "crwdns142960:0crwdne142960:0" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "crwdns77934:0crwdne77934:0" @@ -34269,7 +34304,6 @@ msgstr "crwdns78024:0crwdne78024:0" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "crwdns78028:0crwdne78028:0" @@ -34540,7 +34574,7 @@ msgstr "crwdns78136:0crwdne78136:0" msgid "Packed Items" msgstr "crwdns135958:0crwdne135958:0" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "crwdns78146:0crwdne78146:0" @@ -34988,7 +35022,7 @@ msgstr "crwdns78374:0crwdne78374:0" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35124,7 +35158,7 @@ msgstr "crwdns112550:0crwdne112550:0" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35250,7 +35284,7 @@ msgstr "crwdns156064:0crwdne156064:0" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35336,7 +35370,7 @@ msgstr "crwdns78486:0crwdne78486:0" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35639,7 +35673,6 @@ msgstr "crwdns78622:0{0}crwdne78622:0" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35897,7 +35930,7 @@ msgstr "crwdns136134:0crwdne136134:0" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -35976,10 +36009,6 @@ msgstr "crwdns197210:0crwdne197210:0" msgid "Payment Schedules" msgstr "crwdns197212:0crwdne197212:0" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "crwdns154193:0crwdne154193:0" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -36999,7 +37028,7 @@ msgstr "crwdns127838:0crwdne127838:0" msgid "Please Set Supplier Group in Buying Settings." msgstr "crwdns79182:0crwdne79182:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "crwdns79184:0crwdne79184:0" @@ -37031,11 +37060,11 @@ msgstr "crwdns79194:0crwdne79194:0" msgid "Please add an account for the Bank Entry rule." msgstr "crwdns201309:0crwdne201309:0" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "crwdns200814:0crwdne200814:0" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "crwdns79196:0crwdne79196:0" @@ -37055,7 +37084,7 @@ msgstr "crwdns79202:0crwdne79202:0" msgid "Please add {1} role to user {0}." msgstr "crwdns79204:0{1}crwdnd79204:0{0}crwdne79204:0" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "crwdns79206:0{0}crwdne79206:0" @@ -37162,7 +37191,7 @@ msgstr "crwdns79250:0crwdne79250:0" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "crwdns79252:0{0}crwdne79252:0" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "crwdns79254:0{0}crwdnd79254:0{1}crwdnd79254:0{2}crwdne79254:0" @@ -37231,11 +37260,11 @@ msgstr "crwdns79280:0crwdne79280:0" msgid "Please enter Approving Role or Approving User" msgstr "crwdns79282:0crwdne79282:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "crwdns195040:0crwdne195040:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "crwdns79284:0crwdne79284:0" @@ -37247,7 +37276,7 @@ msgstr "crwdns79286:0crwdne79286:0" msgid "Please enter Employee Id of this sales person" msgstr "crwdns79288:0crwdne79288:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "crwdns79290:0crwdne79290:0" @@ -37292,7 +37321,7 @@ msgstr "crwdns79310:0crwdne79310:0" msgid "Please enter Root Type for account- {0}" msgstr "crwdns79314:0{0}crwdne79314:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "crwdns195042:0crwdne195042:0" @@ -37369,7 +37398,7 @@ msgstr "crwdns159914:0crwdne159914:0" msgid "Please enter the phone number first" msgstr "crwdns79346:0crwdne79346:0" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "crwdns154244:0{schedule_date}crwdne154244:0" @@ -37483,12 +37512,12 @@ msgstr "crwdns161168:0crwdne161168:0" msgid "Please select Template Type to download template" msgstr "crwdns79392:0crwdne79392:0" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "crwdns79394:0crwdne79394:0" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "crwdns79396:0{0}crwdne79396:0" @@ -37504,13 +37533,13 @@ msgstr "crwdns136256:0crwdne136256:0" msgid "Please select Category first" msgstr "crwdns79402:0crwdne79402:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "crwdns79404:0crwdne79404:0" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "crwdns79406:0crwdne79406:0" @@ -37519,7 +37548,7 @@ msgstr "crwdns79406:0crwdne79406:0" msgid "Please select Company and Posting Date to getting entries" msgstr "crwdns79408:0crwdne79408:0" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "crwdns79410:0crwdne79410:0" @@ -37568,7 +37597,7 @@ msgstr "crwdns155488:0crwdne155488:0" msgid "Please select Posting Date before selecting Party" msgstr "crwdns79426:0crwdne79426:0" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "crwdns79428:0crwdne79428:0" @@ -37576,11 +37605,11 @@ msgstr "crwdns79428:0crwdne79428:0" msgid "Please select Price List" msgstr "crwdns79430:0crwdne79430:0" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "crwdns79432:0{0}crwdne79432:0" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "crwdns79434:0crwdne79434:0" @@ -37633,7 +37662,7 @@ msgstr "crwdns79454:0crwdne79454:0" msgid "Please select a Supplier" msgstr "crwdns79456:0crwdne79456:0" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "crwdns111900:0crwdne111900:0" @@ -37694,7 +37723,7 @@ msgstr "crwdns79472:0crwdne79472:0" msgid "Please select a supplier for fetching payments." msgstr "crwdns79474:0crwdne79474:0" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "crwdns200816:0crwdne200816:0" @@ -37714,7 +37743,7 @@ msgstr "crwdns142838:0crwdne142838:0" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "crwdns157478:0crwdne157478:0" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "crwdns201321:0crwdne201321:0" @@ -37821,7 +37850,7 @@ msgstr "crwdns79504:0crwdne79504:0" msgid "Please select weekly off day" msgstr "crwdns79506:0crwdne79506:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "crwdns79510:0{0}crwdne79510:0" @@ -37961,7 +37990,7 @@ msgstr "crwdns161170:0crwdne161170:0" msgid "Please set an Address on the Company '%s'" msgstr "crwdns79560:0%scrwdne79560:0" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "crwdns79562:0crwdne79562:0" @@ -38005,7 +38034,7 @@ msgstr "crwdns79576:0{0}crwdne79576:0" msgid "Please set default UOM in Stock Settings" msgstr "crwdns79578:0crwdne79578:0" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "crwdns79580:0{0}crwdne79580:0" @@ -38124,7 +38153,7 @@ msgstr "crwdns152324:0{0}crwdne152324:0" msgid "Please specify at least one attribute in the Attributes table" msgstr "crwdns79628:0crwdne79628:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "crwdns79630:0crwdne79630:0" @@ -38295,7 +38324,7 @@ msgstr "crwdns201327:0crwdne201327:0" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38320,7 +38349,7 @@ msgstr "crwdns201327:0crwdne201327:0" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38435,7 +38464,7 @@ msgstr "crwdns136282:0crwdne136282:0" msgid "Posting Time" msgstr "crwdns79742:0crwdne79742:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "crwdns79774:0crwdne79774:0" @@ -38614,6 +38643,12 @@ msgstr "crwdns136300:0crwdne136300:0" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "crwdns200568:0crwdne200568:0" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "crwdns201787:0crwdne201787:0" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -38907,7 +38942,9 @@ msgstr "crwdns79972:0crwdne79972:0" msgid "Price per Unit (Stock UOM)" msgstr "crwdns79974:0crwdne79974:0" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40262,6 +40299,7 @@ msgstr "crwdns160234:0{0}crwdne160234:0" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40298,6 +40336,12 @@ msgstr "crwdns80792:0crwdne80792:0" msgid "Purchase Invoice Item" msgstr "crwdns80794:0crwdne80794:0" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "crwdns201789:0crwdne201789:0" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40349,6 +40393,7 @@ msgstr "crwdns80806:0crwdne80806:0" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40358,7 +40403,7 @@ msgstr "crwdns80806:0crwdne80806:0" #: 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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40475,7 +40520,7 @@ msgstr "crwdns159924:0{0}crwdne159924:0" msgid "Purchase Order {0} is not submitted" msgstr "crwdns80886:0{0}crwdne80886:0" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "crwdns80888:0crwdne80888:0" @@ -40538,6 +40583,7 @@ msgstr "crwdns80900:0crwdne80900:0" #: 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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40552,7 +40598,7 @@ msgstr "crwdns80900:0crwdne80900:0" msgid "Purchase Receipt" msgstr "crwdns80902:0crwdne80902:0" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40818,7 +40864,6 @@ msgstr "crwdns201353:0crwdne201353:0" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41406,7 +41451,7 @@ msgstr "crwdns81302:0crwdne81302:0" msgid "Quality Review Objective" msgstr "crwdns81312:0crwdne81312:0" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "crwdns201355:0crwdne201355:0" @@ -41467,7 +41512,7 @@ msgstr "crwdns201355:0crwdne201355:0" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41661,7 +41706,7 @@ msgstr "crwdns136510:0crwdne136510:0" msgid "Queue Size should be between 5 and 100" msgstr "crwdns152218:0crwdne152218:0" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "crwdns81452:0crwdne81452:0" @@ -41716,7 +41761,7 @@ msgstr "crwdns81464:0crwdne81464:0" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41879,7 +41924,6 @@ msgstr "crwdns136526:0crwdne136526:0" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42289,8 +42333,8 @@ msgstr "crwdns160336:0crwdne160336:0" msgid "Raw SQL" msgstr "crwdns155926:0crwdne155926:0" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "crwdns161488:0crwdne161488:0" @@ -42698,11 +42742,10 @@ msgstr "crwdns81966:0crwdne81966:0" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43226,7 +43269,7 @@ msgstr "crwdns136742:0crwdne136742:0" msgid "Rejected Warehouse" msgstr "crwdns136744:0crwdne136744:0" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "crwdns149138:0crwdne149138:0" @@ -43276,7 +43319,7 @@ msgid "Remaining Balance" msgstr "crwdns82290:0crwdne82290:0" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43330,7 +43373,7 @@ msgstr "crwdns82292:0crwdne82292:0" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43369,7 +43412,7 @@ msgstr "crwdns195056:0crwdne195056:0" msgid "Remove item if charges is not applicable to that item" msgstr "crwdns111940:0crwdne111940:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "crwdns82338:0crwdne82338:0" @@ -43773,6 +43816,7 @@ msgstr "crwdns136804:0crwdne136804:0" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44046,7 +44090,7 @@ msgstr "crwdns154938:0crwdne154938:0" msgid "Reserved" msgstr "crwdns136820:0crwdne136820:0" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "crwdns161310:0crwdne161310:0" @@ -44659,7 +44703,7 @@ msgstr "crwdns200820:0crwdne200820:0" msgid "Reversal Of" msgstr "crwdns136900:0crwdne136900:0" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "crwdns82854:0crwdne82854:0" @@ -44808,10 +44852,7 @@ msgstr "crwdns136920:0crwdne136920:0" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "crwdns136922:0crwdne136922:0" @@ -44826,8 +44867,11 @@ msgstr "crwdns136926:0crwdne136926:0" msgid "Role allowed to bypass period restrictions." msgstr "crwdns163970:0crwdne163970:0" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "crwdns200572:0crwdne200572:0" @@ -45028,8 +45072,8 @@ msgstr "crwdns136948:0crwdne136948:0" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "crwdns83014:0crwdne83014:0" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "crwdns83016:0crwdne83016:0" @@ -45056,11 +45100,11 @@ msgstr "crwdns136952:0crwdne136952:0" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "crwdns83036:0{0}crwdnd83036:0{1}crwdnd83036:0{2}crwdne83036:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "crwdns151918:0{0}crwdnd151918:0{1}crwdne151918:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "crwdns154946:0{0}crwdnd154946:0{1}crwdne154946:0" @@ -45086,7 +45130,7 @@ msgstr "crwdns83042:0#{0}crwdne83042:0" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "crwdns83044:0#{0}crwdne83044:0" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "crwdns83046:0#{0}crwdnd83046:0{1}crwdnd83046:0{2}crwdne83046:0" @@ -45287,7 +45331,7 @@ msgstr "crwdns83112:0#{0}crwdnd83112:0{1}crwdnd83112:0{2}crwdne83112:0" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "crwdns83114:0#{0}crwdne83114:0" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "crwdns83116:0#{0}crwdnd83116:0{1}crwdnd83116:0{2}crwdne83116:0" @@ -45347,7 +45391,7 @@ msgstr "crwdns154780:0#{0}crwdne154780:0" msgid "Row #{0}: Item added" msgstr "crwdns83132:0#{0}crwdne83132:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "crwdns164252:0#{0}crwdnd164252:0{1}crwdnd164252:0{2}crwdnd164252:0{3}crwdnd164252:0{4}crwdne164252:0" @@ -45375,7 +45419,7 @@ msgstr "crwdns162016:0#{0}crwdnd162016:0{1}crwdnd162016:0{2}crwdnd162016:0{3}crw msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "crwdns160466:0#{0}crwdnd160466:0{1}crwdne160466:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "crwdns83138:0#{0}crwdnd83138:0{1}crwdne83138:0" @@ -45428,7 +45472,7 @@ msgstr "crwdns83150:0#{0}crwdnd83150:0{1}crwdnd83150:0{2}crwdne83150:0" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "crwdns154962:0#{0}crwdnd154962:0{1}crwdne154962:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "crwdns83152:0#{0}crwdnd83152:0{1}crwdnd83152:0{2}crwdnd83152:0{3}crwdnd83152:0{4}crwdne83152:0" @@ -45453,7 +45497,7 @@ msgstr "crwdns160470:0#{0}crwdne160470:0" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "crwdns111962:0#{0}crwdne111962:0" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "crwdns83162:0#{0}crwdne83162:0" @@ -45479,15 +45523,15 @@ msgstr "crwdns83168:0#{0}crwdne83168:0" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "crwdns83170:0#{0}crwdnd83170:0{1}crwdnd83170:0{2}crwdnd83170:0{3}crwdnd83170:0{4}crwdne83170:0" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "crwdns151832:0#{0}crwdnd151832:0{1}crwdne151832:0" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "crwdns151834:0#{0}crwdnd151834:0{1}crwdnd151834:0{2}crwdne151834:0" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "crwdns151836:0#{0}crwdnd151836:0{1}crwdnd151836:0{2}crwdne151836:0" @@ -45518,11 +45562,11 @@ msgstr "crwdns83174:0#{0}crwdnd83174:0{1}crwdne83174:0" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "crwdns83176:0#{0}crwdnd83176:0{1}crwdnd83176:0{2}crwdnd83176:0{3}crwdnd83176:0{4}crwdne83176:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "crwdns83180:0#{0}crwdne83180:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "crwdns83182:0#{0}crwdne83182:0" @@ -45565,7 +45609,7 @@ msgstr "crwdns195196:0#{0}crwdnd195196:0{1}crwdnd195196:0{2}crwdnd195196:0{3}crw msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "crwdns156068:0#{0}crwdnd156068:0{1}crwdnd156068:0{2}crwdnd156068:0{3}crwdne156068:0" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "crwdns83196:0#{0}crwdnd83196:0{1}crwdnd83196:0{2}crwdne83196:0" @@ -45613,11 +45657,11 @@ msgstr "crwdns160376:0#{0}crwdnd160376:0{1}crwdnd160376:0{2}crwdne160376:0" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "crwdns160472:0#{0}crwdnd160472:0{1}crwdnd160472:0{2}crwdnd160472:0{3}crwdne160472:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "crwdns160680:0#{0}crwdne160680:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "crwdns160682:0#{0}crwdne160682:0" @@ -45670,11 +45714,11 @@ msgstr "crwdns160378:0#{0}crwdnd160378:0{1}crwdnd160378:0{2}crwdnd160378:0{3}crw msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "crwdns160380:0#{0}crwdnd160380:0{1}crwdne160380:0" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "crwdns83228:0#{0}crwdnd83228:0{1}crwdne83228:0" -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "crwdns127848:0#{0}crwdnd127848:0{1}crwdnd127848:0{2}crwdne127848:0" @@ -45702,7 +45746,7 @@ msgstr "crwdns164256:0#{0}crwdnd164256:0{1}crwdnd164256:0{2}crwdne164256:0" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "crwdns160382:0#{0}crwdnd160382:0{1}crwdne160382:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "crwdns83234:0#{0}crwdnd83234:0{1}crwdne83234:0" @@ -45738,23 +45782,23 @@ msgstr "crwdns83248:0#{1}crwdnd83248:0{0}crwdne83248:0" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "crwdns154252:0#{idx}crwdne154252:0" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "crwdns154254:0#{idx}crwdne154254:0" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "crwdns154256:0#{idx}crwdnd154256:0{item_code}crwdne154256:0" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "crwdns154258:0#{idx}crwdnd154258:0{item_code}crwdne154258:0" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "crwdns154260:0#{idx}crwdnd154260:0{field_label}crwdnd154260:0{item_code}crwdne154260:0" -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "crwdns154262:0#{idx}crwdnd154262:0{field_label}crwdne154262:0" @@ -45762,7 +45806,7 @@ msgstr "crwdns154262:0#{idx}crwdnd154262:0{field_label}crwdne154262:0" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "crwdns154266:0#{idx}crwdnd154266:0{from_warehouse_field}crwdnd154266:0{to_warehouse_field}crwdne154266:0" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "crwdns154268:0#{idx}crwdnd154268:0{schedule_date}crwdnd154268:0{transaction_date}crwdne154268:0" @@ -45827,7 +45871,7 @@ msgstr "crwdns83278:0crwdne83278:0" msgid "Row #{}: {} {} does not exist." msgstr "crwdns83280:0crwdne83280:0" -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "crwdns83282:0crwdne83282:0" @@ -45843,7 +45887,7 @@ msgstr "crwdns83286:0{0}crwdnd83286:0{1}crwdne83286:0" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "crwdns83288:0{0}crwdnd83288:0{1}crwdnd83288:0{2}crwdne83288:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "crwdns83292:0{0}crwdnd83292:0{1}crwdnd83292:0{2}crwdnd83292:0{3}crwdne83292:0" @@ -45875,7 +45919,7 @@ msgstr "crwdns83306:0{0}crwdnd83306:0{1}crwdnd83306:0{2}crwdne83306:0" msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "crwdns83308:0{0}crwdnd83308:0{1}crwdnd83308:0{2}crwdne83308:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "crwdns111976:0{0}crwdnd111976:0{1}crwdnd111976:0{2}crwdnd111976:0{3}crwdne111976:0" @@ -45933,7 +45977,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "crwdns83332:0{0}crwdne83332:0" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "crwdns83336:0{0}crwdne83336:0" @@ -45974,7 +46018,7 @@ msgstr "crwdns83348:0{0}crwdne83348:0" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "crwdns83350:0{0}crwdnd83350:0{1}crwdnd83350:0{2}crwdne83350:0" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "crwdns83352:0{0}crwdne83352:0" @@ -46098,7 +46142,7 @@ msgstr "crwdns83404:0{0}crwdne83404:0" msgid "Row {0}: Quantity cannot be negative." msgstr "crwdns152228:0{0}crwdne152228:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "crwdns83406:0{0}crwdnd83406:0{4}crwdnd83406:0{1}crwdnd83406:0{2}crwdnd83406:0{3}crwdne83406:0" @@ -46110,11 +46154,11 @@ msgstr "crwdns164260:0{0}crwdnd164260:0{1}crwdnd164260:0{2}crwdne164260:0" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "crwdns83408:0{0}crwdne83408:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "crwdns83410:0{0}crwdnd83410:0{1}crwdne83410:0" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "crwdns83412:0{0}crwdne83412:0" @@ -46138,7 +46182,7 @@ msgstr "crwdns149102:0{0}crwdnd149102:0{3}crwdnd149102:0{1}crwdnd149102:0{2}crwd msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "crwdns83416:0{0}crwdnd83416:0{1}crwdnd83416:0{2}crwdne83416:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "crwdns163972:0{0}crwdne163972:0" @@ -46191,7 +46235,7 @@ msgstr "crwdns111978:0{0}crwdnd111978:0{2}crwdnd111978:0{1}crwdnd111978:0{2}crwd msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "crwdns83434:0{1}crwdnd83434:0{0}crwdnd83434:0{2}crwdnd83434:0{3}crwdne83434:0" -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "crwdns154270:0{idx}crwdnd154270:0{item_code}crwdne154270:0" @@ -46221,7 +46265,7 @@ msgstr "crwdns136958:0crwdne136958:0" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "crwdns83448:0{0}crwdne83448:0" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "crwdns83450:0{0}crwdne83450:0" @@ -46287,7 +46331,7 @@ msgstr "crwdns201423:0crwdne201423:0" msgid "Rules evaluation started" msgstr "crwdns201425:0crwdne201425:0" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "crwdns200822:0crwdne200822:0" @@ -46584,7 +46628,7 @@ msgstr "crwdns142962:0crwdne142962:0" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46758,7 +46802,7 @@ msgstr "crwdns104650:0crwdne104650:0" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46881,8 +46925,8 @@ msgstr "crwdns83692:0{0}crwdne83692:0" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "crwdns83694:0{0}crwdnd83694:0{1}crwdnd83694:0{2}crwdnd83694:0{3}crwdne83694:0" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "crwdns200212:0{0}crwdne200212:0" @@ -47293,7 +47337,7 @@ msgstr "crwdns137018:0crwdne137018:0" msgid "Same day" msgstr "crwdns201441:0crwdne201441:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "crwdns83872:0crwdne83872:0" @@ -47330,7 +47374,7 @@ msgstr "crwdns137022:0crwdne137022:0" msgid "Sample Size" msgstr "crwdns83884:0crwdne83884:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "crwdns83888:0{0}crwdnd83888:0{1}crwdne83888:0" @@ -47619,7 +47663,7 @@ msgstr "crwdns84056:0crwdne84056:0" msgid "Search company..." msgstr "crwdns201451:0crwdne201451:0" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "crwdns201453:0crwdne201453:0" @@ -47764,7 +47808,7 @@ msgstr "crwdns84104:0crwdne84104:0" msgid "Select Columns and Filters" msgstr "crwdns151702:0crwdne151702:0" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "crwdns84106:0crwdne84106:0" @@ -48459,7 +48503,7 @@ msgstr "crwdns149104:0crwdne149104:0" msgid "Serial No Reserved" msgstr "crwdns152348:0crwdne152348:0" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "crwdns163872:0crwdne163872:0" @@ -48520,7 +48564,7 @@ msgstr "crwdns84400:0crwdne84400:0" msgid "Serial No is mandatory for Item {0}" msgstr "crwdns84402:0{0}crwdne84402:0" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "crwdns84404:0{0}crwdne84404:0" @@ -48806,7 +48850,7 @@ msgstr "crwdns154195:0{0}crwdnd154195:0{1}crwdne154195:0" #: 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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48832,7 +48876,7 @@ msgstr "crwdns154195:0{0}crwdnd154195:0{1}crwdne154195:0" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49230,12 +49274,6 @@ msgstr "crwdns137232:0crwdne137232:0" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "crwdns137234:0crwdne137234:0" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "crwdns155162:0crwdne155162:0" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "crwdns84758:0crwdne84758:0" @@ -49341,6 +49379,12 @@ msgstr "crwdns199168:0crwdne199168:0" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "crwdns201477:0crwdne201477:0" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "crwdns201791:0crwdne201791:0" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "crwdns84788:0{0}crwdnd84788:0{1}crwdnd84788:0{2}crwdne84788:0" @@ -49839,7 +49883,7 @@ msgstr "crwdns137312:0crwdne137312:0" msgid "Show Barcode Field in Stock Transactions" msgstr "crwdns137314:0crwdne137314:0" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "crwdns85012:0crwdne85012:0" @@ -49847,7 +49891,7 @@ msgstr "crwdns85012:0crwdne85012:0" msgid "Show Completed" msgstr "crwdns85014:0crwdne85014:0" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "crwdns157488:0crwdne157488:0" @@ -49930,7 +49974,7 @@ msgstr "crwdns85036:0crwdne85036:0" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "crwdns85038:0crwdne85038:0" @@ -49942,7 +49986,7 @@ msgstr "crwdns201481:0crwdne201481:0" msgid "Show Open" msgstr "crwdns85042:0crwdne85042:0" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "crwdns85044:0crwdne85044:0" @@ -49955,11 +49999,6 @@ msgstr "crwdns157226:0crwdne157226:0" msgid "Show Operations" msgstr "crwdns137326:0crwdne137326:0" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "crwdns137328:0crwdne137328:0" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "crwdns85050:0crwdne85050:0" @@ -49975,7 +50014,7 @@ msgstr "crwdns137330:0crwdne137330:0" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "crwdns85056:0crwdne85056:0" @@ -50042,6 +50081,11 @@ msgstr "crwdns85078:0crwdne85078:0" msgid "Show only the Immediate Upcoming Term" msgstr "crwdns85080:0crwdne85080:0" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "crwdns201793:0crwdne201793:0" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "crwdns85082:0crwdne85082:0" @@ -50328,11 +50372,11 @@ msgstr "crwdns200042:0crwdne200042:0" msgid "Source Stock Entry (Manufacture)" msgstr "crwdns200044:0crwdne200044:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "crwdns200046:0{0}crwdnd200046:0{1}crwdnd200046:0{2}crwdne200046:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "crwdns200048:0{0}crwdne200048:0" @@ -50398,7 +50442,7 @@ msgstr "crwdns160474:0{0}crwdnd160474:0{1}crwdne160474:0" msgid "Source and Target Location cannot be same" msgstr "crwdns85222:0crwdne85222:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "crwdns85224:0{0}crwdne85224:0" @@ -50412,8 +50456,8 @@ msgid "Source of Funds (Liabilities)" msgstr "crwdns85228:0crwdne85228:0" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "crwdns85230:0{0}crwdne85230:0" @@ -50578,8 +50622,8 @@ msgstr "crwdns85276:0crwdne85276:0" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "crwdns85278:0crwdne85278:0" @@ -50912,7 +50956,7 @@ msgstr "crwdns152050:0crwdne152050:0" msgid "Stock Details" msgstr "crwdns137442:0crwdne137442:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "crwdns85570:0{0}crwdnd85570:0{1}crwdne85570:0" @@ -51183,7 +51227,7 @@ msgstr "crwdns85646:0crwdne85646:0" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51195,7 +51239,7 @@ msgstr "crwdns85652:0crwdne85652:0" msgid "Stock Reconciliation Item" msgstr "crwdns85656:0crwdne85656:0" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "crwdns85658:0crwdne85658:0" @@ -51233,7 +51277,7 @@ msgstr "crwdns85662:0crwdne85662:0" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51261,7 +51305,7 @@ msgstr "crwdns85668:0crwdne85668:0" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "crwdns85670:0crwdne85670:0" @@ -51643,7 +51687,7 @@ msgstr "crwdns85824:0crwdne85824:0" #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "crwdns85826:0crwdne85826:0" @@ -51721,10 +51765,6 @@ msgstr "crwdns137482:0crwdne137482:0" msgid "Sub Procedure" msgstr "crwdns137484:0crwdne137484:0" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "crwdns154197:0crwdne154197:0" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "crwdns161190:0crwdne161190:0" @@ -51941,7 +51981,7 @@ msgstr "crwdns160408:0crwdne160408:0" msgid "Subcontracting Order" msgstr "crwdns85880:0crwdne85880:0" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -51967,7 +52007,7 @@ msgstr "crwdns85894:0crwdne85894:0" msgid "Subcontracting Order Supplied Item" msgstr "crwdns85896:0crwdne85896:0" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "crwdns85898:0{0}crwdne85898:0" @@ -52056,7 +52096,7 @@ msgstr "crwdns197270:0crwdne197270:0" msgid "Subdivision" msgstr "crwdns137496:0crwdne137496:0" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "crwdns85940:0crwdne85940:0" @@ -52231,7 +52271,7 @@ msgstr "crwdns86058:0crwdne86058:0" msgid "Successfully Set Supplier" msgstr "crwdns86060:0crwdne86060:0" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "crwdns86062:0crwdne86062:0" @@ -52387,6 +52427,7 @@ msgstr "crwdns86128:0crwdne86128:0" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52428,8 +52469,8 @@ msgstr "crwdns86128:0crwdne86128:0" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52477,6 +52518,12 @@ msgstr "crwdns86216:0crwdne86216:0" msgid "Supplier Contact" msgstr "crwdns137540:0crwdne137540:0" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "crwdns201795:0crwdne201795:0" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52571,7 +52618,7 @@ msgstr "crwdns86258:0crwdne86258:0" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "crwdns86264:0crwdne86264:0" @@ -52851,19 +52898,10 @@ msgstr "crwdns112044:0crwdne112044:0" msgid "Supplier {0} not found in {1}" msgstr "crwdns86388:0{0}crwdnd86388:0{1}crwdne86388:0" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "crwdns86390:0crwdne86390:0" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "crwdns86392:0crwdne86392:0" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -52925,7 +52963,7 @@ msgstr "crwdns86412:0crwdne86412:0" msgid "Support Tickets" msgstr "crwdns86414:0crwdne86414:0" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "crwdns200828:0crwdne200828:0" @@ -53184,8 +53222,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "crwdns160478:0{0}crwdnd160478:0{1}crwdne160478:0" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "crwdns86568:0{0}crwdne86568:0" @@ -53653,7 +53691,7 @@ msgstr "crwdns164284:0crwdne164284:0" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "crwdns86794:0crwdne86794:0" @@ -53814,7 +53852,7 @@ msgstr "crwdns137686:0crwdne137686:0" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "crwdns137688:0crwdne137688:0" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "crwdns148632:0#{0}crwdnd148632:0{1}crwdnd148632:0{2}crwdne148632:0" @@ -54004,7 +54042,6 @@ msgstr "crwdns137712:0crwdne137712:0" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54196,7 +54233,7 @@ msgstr "crwdns87056:0crwdne87056:0" msgid "The BOM which will be replaced" msgstr "crwdns137726:0crwdne137726:0" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "crwdns160242:0{0}crwdnd160242:0{1}crwdne160242:0" @@ -54240,7 +54277,7 @@ msgstr "crwdns87082:0{0}crwdne87082:0" 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 "crwdns87084:0crwdne87084:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "crwdns87086:0crwdne87086:0" @@ -54256,7 +54293,7 @@ msgstr "crwdns142842:0#{0}crwdnd142842:0{1}crwdnd142842:0{2}crwdne142842:0" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "crwdns152364:0{0}crwdnd152364:0{1}crwdnd152364:0{2}crwdne152364:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "crwdns127518:0{0}crwdnd127518:0{0}crwdne127518:0" @@ -54292,7 +54329,7 @@ msgstr "crwdns201511:0crwdne201511:0" msgid "The bank account is not a company account. Please select a company account" msgstr "crwdns201513:0crwdne201513:0" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "crwdns161328:0{0}crwdnd161328:0{1}crwdnd161328:0{2}crwdnd161328:0{3}crwdnd161328:0{4}crwdnd161328:0{5}crwdnd161328:0{6}crwdne161328:0" @@ -54398,7 +54435,7 @@ msgstr "crwdns154201:0{0}crwdne154201:0" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "crwdns162024:0{0}crwdnd162024:0{1}crwdne162024:0" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "crwdns87122:0crwdne87122:0" @@ -54442,15 +54479,15 @@ msgstr "crwdns87130:0{0}crwdne87130:0" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "crwdns201525:0{0}crwdne201525:0" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "crwdns154274:0{item}crwdnd154274:0{type_of}crwdnd154274:0{type_of}crwdne154274:0" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "crwdns87132:0{0}crwdnd87132:0{1}crwdnd87132:0{2}crwdne87132:0" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "crwdns154276:0{items}crwdnd154276:0{type_of}crwdnd154276:0{type_of}crwdne154276:0" @@ -54606,7 +54643,7 @@ msgstr "crwdns87176:0{0}crwdne87176:0" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "crwdns143554:0{0}crwdnd143554:0{1}crwdnd143554:0{2}crwdnd143554:0{3}crwdnd143554:0{4}crwdnd143554:0{5}crwdne143554:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "crwdns87178:0{0}crwdnd87178:0{1}crwdne87178:0" @@ -54628,11 +54665,11 @@ msgstr "crwdns201535:0crwdne201535:0" 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 "crwdns155396:0crwdne155396:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "crwdns87186:0crwdne87186:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "crwdns87188:0crwdne87188:0" @@ -54704,7 +54741,7 @@ msgstr "crwdns87206:0{0}crwdnd87206:0{1}crwdnd87206:0{2}crwdnd87206:0{3}crwdne87 msgid "The {0} contains Unit Price Items." msgstr "crwdns154984:0{0}crwdne154984:0" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "crwdns163878:0{0}crwdnd163878:0{1}crwdne163878:0" @@ -54757,7 +54794,7 @@ msgstr "crwdns201541:0crwdne201541:0" msgid "There are no slots available on this date" msgstr "crwdns87218:0crwdne87218:0" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "crwdns201543:0crwdne201543:0" @@ -54801,7 +54838,7 @@ msgstr "crwdns87236:0{0}crwdnd87236:0{1}crwdne87236:0" msgid "There is one unreconciled transaction before {0}." msgstr "crwdns201547:0{0}crwdne201547:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "crwdns87240:0crwdne87240:0" @@ -54857,11 +54894,11 @@ msgstr "crwdns87260:0{0}crwdne87260:0" msgid "This Month's Summary" msgstr "crwdns87262:0crwdne87262:0" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "crwdns160416:0crwdne160416:0" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "crwdns160418:0crwdne160418:0" @@ -55662,7 +55699,7 @@ msgstr "crwdns198372:0crwdne198372:0" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "crwdns87724:0{0}crwdnd87724:0{1}crwdne87724:0" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "crwdns87726:0crwdne87726:0" @@ -55697,7 +55734,7 @@ msgstr "crwdns87736:0crwdne87736:0" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "crwdns87738:0crwdne87738:0" @@ -55848,7 +55885,7 @@ msgstr "crwdns137850:0crwdne137850:0" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "crwdns87832:0crwdne87832:0" @@ -56271,7 +56308,7 @@ msgstr "crwdns88008:0{0}crwdne88008:0" msgid "Total Payments" msgstr "crwdns88010:0crwdne88010:0" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "crwdns142968:0{0}crwdnd142968:0{1}crwdne142968:0" @@ -56303,7 +56340,7 @@ msgstr "crwdns137928:0crwdne137928:0" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "crwdns88022:0crwdne88022:0" @@ -56689,7 +56726,7 @@ msgstr "crwdns137962:0crwdne137962:0" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56700,7 +56737,7 @@ msgstr "crwdns88208:0crwdne88208:0" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "crwdns137964:0crwdne137964:0" @@ -57372,11 +57409,11 @@ msgstr "crwdns88430:0crwdne88430:0" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57448,7 +57485,7 @@ msgstr "crwdns88542:0{0}crwdne88542:0" msgid "UOM Name" msgstr "crwdns138022:0crwdne138022:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "crwdns88546:0{0}crwdnd88546:0{1}crwdne88546:0" @@ -57524,7 +57561,7 @@ msgstr "crwdns88568:0{0}crwdne88568:0" msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "crwdns112094:0{0}crwdnd112094:0{1}crwdnd112094:0{2}crwdne112094:0" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "crwdns88572:0crwdne88572:0" @@ -57643,7 +57680,7 @@ msgstr "crwdns88602:0crwdne88602:0" msgid "Unit of Measure (UOM)" msgstr "crwdns143212:0crwdne143212:0" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "crwdns88606:0{0}crwdne88606:0" @@ -57763,10 +57800,9 @@ msgid "Unreconcile Transaction" msgstr "crwdns88656:0crwdne88656:0" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "crwdns88658:0crwdne88658:0" @@ -57789,10 +57825,6 @@ msgstr "crwdns138068:0crwdne138068:0" msgid "Unreconciled Transactions" msgstr "crwdns201641:0crwdne201641:0" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "crwdns200220:0crwdne200220:0" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57838,7 +57870,7 @@ msgstr "crwdns138070:0crwdne138070:0" msgid "Unsecured Loans" msgstr "crwdns88680:0crwdne88680:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "crwdns148884:0crwdne148884:0" @@ -58053,12 +58085,6 @@ msgstr "crwdns138102:0crwdne138102:0" msgid "Update Type" msgstr "crwdns138104:0crwdne138104:0" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "crwdns138106:0crwdne138106:0" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58099,7 +58125,7 @@ msgstr "crwdns161198:0{0}crwdne161198:0" msgid "Updating Costing and Billing fields against this Project..." msgstr "crwdns156078:0crwdne156078:0" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "crwdns88788:0crwdne88788:0" @@ -58557,12 +58583,6 @@ msgstr "crwdns138172:0crwdne138172:0" msgid "Validate Components and Quantities Per BOM" msgstr "crwdns152098:0crwdne152098:0" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "crwdns161500:0crwdne161500:0" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58586,6 +58606,12 @@ msgstr "crwdns138176:0crwdne138176:0" msgid "Validate Stock on Save" msgstr "crwdns138180:0crwdne138180:0" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "crwdns201797:0crwdne201797:0" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58692,11 +58718,11 @@ msgstr "crwdns89022:0crwdne89022:0" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "crwdns89024:0{0}crwdnd89024:0{1}crwdnd89024:0{2}crwdne89024:0" -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "crwdns89026:0crwdne89026:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "crwdns89028:0{0}crwdnd89028:0{1}crwdne89028:0" @@ -58706,7 +58732,7 @@ msgstr "crwdns89028:0{0}crwdnd89028:0{1}crwdne89028:0" msgid "Valuation and Total" msgstr "crwdns138192:0crwdne138192:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "crwdns89032:0crwdne89032:0" @@ -58856,7 +58882,7 @@ msgstr "crwdns89086:0crwdne89086:0" msgid "Variant" msgstr "crwdns89088:0crwdne89088:0" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "crwdns89090:0crwdne89090:0" @@ -58875,7 +58901,7 @@ msgstr "crwdns89094:0crwdne89094:0" msgid "Variant Based On" msgstr "crwdns138204:0crwdne138204:0" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "crwdns89098:0crwdne89098:0" @@ -58893,7 +58919,7 @@ msgstr "crwdns89102:0crwdne89102:0" msgid "Variant Item" msgstr "crwdns89104:0crwdne89104:0" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "crwdns89106:0crwdne89106:0" @@ -59274,7 +59300,7 @@ msgstr "crwdns201669:0crwdne201669:0" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:41 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:33 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:65 @@ -59314,7 +59340,7 @@ msgstr "crwdns89226:0crwdne89226:0" #. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "crwdns89230:0crwdne89230:0" @@ -59346,7 +59372,7 @@ msgstr "crwdns89230:0crwdne89230:0" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59581,7 +59607,7 @@ msgstr "crwdns162028:0{0}crwdne162028:0" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "crwdns152376:0{0}crwdnd152376:0{1}crwdnd152376:0{2}crwdne152376:0" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "crwdns89418:0{0}crwdnd89418:0{1}crwdne89418:0" @@ -59628,7 +59654,7 @@ msgstr "crwdns89432:0crwdne89432:0" #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59684,6 +59710,12 @@ msgstr "crwdns138270:0crwdne138270:0" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "crwdns200594:0crwdne200594:0" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "crwdns201799:0crwdne201799:0" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "crwdns89460:0{0}crwdne89460:0" @@ -59867,7 +59899,7 @@ msgstr "crwdns138286:0crwdne138286:0" msgid "Website:" msgstr "crwdns160424:0crwdne160424:0" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "crwdns200846:0crwdne200846:0" @@ -60241,7 +60273,7 @@ msgstr "crwdns89708:0crwdne89708:0" msgid "Work Order Item" msgstr "crwdns89710:0crwdne89710:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "crwdns200054:0crwdne200054:0" @@ -60303,11 +60335,11 @@ msgstr "crwdns89728:0crwdne89728:0" msgid "Work Order {0} created" msgstr "crwdns159962:0{0}crwdne159962:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "crwdns200056:0{0}crwdne200056:0" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "crwdns89730:0{0}crwdnd89730:0{1}crwdne89730:0" @@ -60623,11 +60655,11 @@ msgstr "crwdns138372:0crwdne138372:0" msgid "Year Start Date" msgstr "crwdns138374:0crwdne138374:0" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "crwdns200850:0crwdne200850:0" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "crwdns200852:0crwdne200852:0" @@ -60680,7 +60712,7 @@ msgstr "crwdns89938:0crwdne89938:0" msgid "You can also set default CWIP account in Company {}" msgstr "crwdns89940:0crwdne89940:0" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "crwdns200854:0crwdne200854:0" @@ -60834,6 +60866,10 @@ msgstr "crwdns200222:0crwdne200222:0" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "crwdns200224:0crwdne200224:0" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "crwdns201801:0{0}crwdne201801:0" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "crwdns200226:0crwdne200226:0" @@ -60862,7 +60898,7 @@ msgstr "crwdns159966:0{0}crwdnd159966:0{1}crwdnd159966:0{2}crwdne159966:0" msgid "You have entered a duplicate Delivery Note on Row" msgstr "crwdns90000:0crwdne90000:0" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "crwdns201703:0crwdne201703:0" @@ -60870,7 +60906,7 @@ msgstr "crwdns201703:0crwdne201703:0" msgid "You have not performed any reconciliations in this session yet." msgstr "crwdns201705:0crwdne201705:0" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "crwdns90002:0crwdne90002:0" @@ -60941,8 +60977,11 @@ msgstr "crwdns90038:0crwdne90038:0" msgid "Zero quantity" msgstr "crwdns90040:0crwdne90040:0" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "crwdns200598:0crwdne200598:0" @@ -61054,7 +61093,7 @@ msgstr "crwdns138402:0crwdne138402:0" msgid "fieldname" msgstr "crwdns112166:0crwdne112166:0" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "crwdns200856:0crwdne200856:0" @@ -61272,6 +61311,10 @@ msgstr "crwdns201717:0crwdne201717:0" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "crwdns138430:0crwdne138430:0" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "crwdns201803:0{0}crwdnd201803:0{1}crwdne201803:0" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "crwdns90188:0crwdne90188:0" @@ -61330,7 +61373,8 @@ msgstr "crwdns90212:0{0}crwdnd90212:0{1}crwdne90212:0" msgid "{0} Digest" msgstr "crwdns90214:0{0}crwdne90214:0" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "crwdns200858:0{0}crwdne200858:0" @@ -61350,7 +61394,7 @@ msgstr "crwdns90218:0{0}crwdnd90218:0{1}crwdne90218:0" msgid "{0} Request for {1}" msgstr "crwdns90220:0{0}crwdnd90220:0{1}crwdne90220:0" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "crwdns90222:0{0}crwdne90222:0" @@ -61463,7 +61507,7 @@ msgid "{0} entered twice in Item Tax" msgstr "crwdns90260:0{0}crwdne90260:0" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "crwdns90262:0{0}crwdnd90262:0{1}crwdne90262:0" @@ -61631,7 +61675,7 @@ msgstr "crwdns90314:0{0}crwdne90314:0" msgid "{0} payment entries can not be filtered by {1}" msgstr "crwdns90316:0{0}crwdnd90316:0{1}crwdne90316:0" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "crwdns90318:0{0}crwdnd90318:0{1}crwdnd90318:0{2}crwdnd90318:0{3}crwdne90318:0" @@ -61644,7 +61688,7 @@ msgstr "crwdns201719:0{0}crwdnd201719:0{1}crwdne201719:0" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "crwdns201721:0{0}crwdne201721:0" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "crwdns90320:0{0}crwdnd90320:0{1}crwdnd90320:0{2}crwdnd90320:0{3}crwdne90320:0" @@ -61846,7 +61890,7 @@ msgstr "crwdns90404:0{0}crwdnd90404:0{1}crwdnd90404:0{2}crwdne90404:0" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "crwdns90406:0{0}crwdnd90406:0{1}crwdnd90406:0{2}crwdnd90406:0{3}crwdne90406:0" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "crwdns90408:0{0}crwdnd90408:0{1}crwdnd90408:0{2}crwdne90408:0" @@ -61932,23 +61976,23 @@ msgstr "crwdns90434:0{0}crwdnd90434:0{1}crwdne90434:0" msgid "{0}: {1} is a group account." msgstr "crwdns160624:0{0}crwdnd160624:0{1}crwdne160624:0" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "crwdns90436:0{0}crwdnd90436:0{1}crwdnd90436:0{2}crwdne90436:0" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "crwdns154278:0{count}crwdnd154278:0{item_code}crwdne154278:0" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "crwdns154280:0{doctype}crwdnd154280:0{name}crwdne154280:0" -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "crwdns90442:0{item_name}crwdnd90442:0{sample_size}crwdnd90442:0{accepted_quantity}crwdne90442:0" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "crwdns154284:0{ref_doctype}crwdnd154284:0{ref_name}crwdnd154284:0{status}crwdne154284:0" diff --git a/erpnext/locale/es.po b/erpnext/locale/es.po index d81e1b1a81c..44f4da0262b 100644 --- a/erpnext/locale/es.po +++ b/erpnext/locale/es.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:22\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:22\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Spanish\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr " Sub Ensamblado" msgid " Summary" msgstr " Resumen" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "El \"artículo proporcionado por el cliente\" no puede ser un artículo de compra también" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "El \"artículo proporcionado por el cliente\" no puede tener una tasa de valoración" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "\"Es activo fijo\" no puede estar sin marcar, ya que existe registro de activos contra el elemento" @@ -302,7 +302,7 @@ msgstr "'Desde la fecha' es requerido" msgid "'From Date' must be after 'To Date'" msgstr "'Desde la fecha' debe ser después de 'Hasta Fecha'" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "'Posee numero de serie' no puede ser \"Sí\" para los productos que NO son de stock" @@ -338,7 +338,7 @@ msgstr "'Actualizar existencias' no puede marcarse porque los artículos no se h msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "'Actualización de Inventario' no se puede comprobar en venta de activos fijos" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "La cuenta de '{0}' ya está siendo utilizada por {1}. Utilice otra cuenta." @@ -1099,7 +1099,7 @@ msgstr "Debe seleccionar un conductor antes de confirmar." msgid "A logical Warehouse against which stock entries are made." msgstr "Almacén lógico contra el que se realizan las entradas de existencias." -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1311,7 +1311,7 @@ msgstr "Se requiere clave de acceso para el proveedor de servicios: {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "Según CEFACT/ICG/2010/IC013 o CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "Según la BOM{0}, falta el artículo '{1}' en la entrada de stock." @@ -1981,8 +1981,8 @@ msgstr "Asientos contables" msgid "Accounting Entry for Asset" msgstr "Entrada Contable para Activos" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "Entrada Contable para LCV en la Entrada de Stock {0}" @@ -1990,7 +1990,7 @@ msgstr "Entrada Contable para LCV en la Entrada de Stock {0}" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "Asiento Contable para el Comprobante de Costo de Internación de SCR {0}" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Entrada contable para servicio" @@ -2003,16 +2003,16 @@ msgstr "Entrada contable para servicio" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Asiento contable para inventario" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "Entrada contable para {0}" @@ -2310,12 +2310,6 @@ msgstr "Acción si la inspección de calidad no se ha validado" msgid "Action If Quality Inspection Is Rejected" msgstr "Acción si se rechaza la inspección de calidad" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "Acción si no se mantiene la misma tasa" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "Acción inicializada" @@ -2374,6 +2368,12 @@ msgstr "Acción si se excede el Presupuesto Anual en gastos acumulados" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2641,7 +2641,7 @@ msgstr "Tiempo real (en horas)" msgid "Actual qty in stock" msgstr "Cantidad real en stock" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "El tipo de impuesto real no puede incluirse en la tarifa del artículo en la fila {0}" @@ -2655,7 +2655,7 @@ msgstr "" msgid "Add / Edit Prices" msgstr "Añadir / Editar precios" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "Añadir Columnas en Moneda de Transacción" @@ -2809,7 +2809,7 @@ msgstr "Añadir Nro Serie/Lote" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "Añadir Nro Serie/Lote (Cant Rechazada)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -3054,7 +3054,7 @@ msgstr "Cantidad de descuento adicional" msgid "Additional Discount Amount (Company Currency)" msgstr "Monto adicional de descuento (Divisa por defecto)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "El monto de descuento adicional ({discount_amount}) no puede exceder el total antes de dicho descuento ({total_before_discount})" @@ -3343,7 +3343,7 @@ msgstr "Ajustar Cantidad" msgid "Adjustment Against" msgstr "Ajuste contra" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "Ajuste basado en la tarifa de la Factura de Compra" @@ -3456,7 +3456,7 @@ msgstr "Tipo de Comprobante de Anticipo" msgid "Advance amount" msgstr "Importe Anticipado" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Cantidad de avance no puede ser mayor que {0} {1}" @@ -3525,7 +3525,7 @@ msgstr "Contra" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Contra la cuenta" @@ -3643,7 +3643,7 @@ msgstr "Contra factura del proveedor {0}" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "Contra comprobante" @@ -3667,7 +3667,7 @@ msgstr "Contra el Número de Comprobante" #: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "Tipo de comprobante" @@ -3948,7 +3948,7 @@ msgstr "Todas las comunicaciones incluidas y superiores se incluirán en el nuev msgid "All items are already requested" msgstr "Todos los artículos ya están solicitados" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "Todos los artículos ya han sido facturados / devueltos" @@ -3956,7 +3956,7 @@ msgstr "Todos los artículos ya han sido facturados / devueltos" msgid "All items have already been received" msgstr "Ya se han recibido todos los artículos" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Todos los artículos ya han sido transferidos para esta Orden de Trabajo." @@ -4005,7 +4005,7 @@ msgstr "Asignar" msgid "Allocate Advances Automatically (FIFO)" msgstr "Asignar adelantos automáticamente (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Distribuir el Importe de Pago" @@ -4015,7 +4015,7 @@ msgstr "Distribuir el Importe de Pago" msgid "Allocate Payment Based On Payment Terms" msgstr "Asignar el pago según las condiciones de pago" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "Asignar solicitud de pago" @@ -4045,7 +4045,7 @@ msgstr "Numerado" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4166,15 +4166,15 @@ msgstr "Permitir devoluciones" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "Permitir Transferencias Internas a Precio de Mercado" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "Permitir que el artículo se agregue varias veces en una transacción" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "Permitir que un artículo se añada varias veces en una transacción" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4203,12 +4203,6 @@ msgstr "Permitir Inventario Negativo" msgid "Allow Negative Stock for Batch" msgstr "Permitir stock negativo para el lote" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "Permitir tarifas negativas para Productos" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4421,8 +4415,11 @@ msgstr "Permitir facturas con múltiples monedas contra una sola cuenta de terce msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4514,7 +4511,7 @@ msgstr "Permitido para realizar Transacciones con" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "Los roles permitidos son 'Cliente' y 'Proveedor'. Por favor, seleccione uno de estos roles." -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4711,7 +4708,7 @@ msgstr "Preguntar siempre" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4741,7 +4738,6 @@ msgstr "Preguntar siempre" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4911,10 +4907,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "Importe en Moneda de la Cuenta" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "Importe en palabras" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5534,7 +5526,7 @@ msgstr "Como el campo {0} está habilitado, el campo {1} es obligatorio." msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "Como el campo {0} está habilitado, el valor del campo {1} debe ser superior a 1." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "Como ya existen transacciones validadas contra el artículo {0}, no puede cambiar el valor de {1}." @@ -5684,7 +5676,7 @@ msgstr "Cuenta de categoría de activos" msgid "Asset Category Name" msgstr "Nombre de la Categoría de Activos" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "Categoría activo es obligatorio para la partida del activo fijo" @@ -6080,7 +6072,7 @@ msgstr "El activo {0} no se ha validado. Por favor, valide el recurso antes de c msgid "Asset {0} must be submitted" msgstr "Activo {0} debe ser validado" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "El activo {assets_link} fue creado para {item_code}" @@ -6118,11 +6110,11 @@ msgstr "Bienes" msgid "Assets Setup" msgstr "Configuración de activos" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "Activos no creados para {item_code}. Tendrá que crear el activo manualmente." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "Activos {assets_link} creados para {item_code}" @@ -6195,7 +6187,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "Es obligatorio tener al menos un almacén" @@ -6227,7 +6219,7 @@ msgstr "En la fila {0}: La cant. es obligatoria para el lote {1}" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "En la fila {0}: el Núm. Serial es obligatorio para el Producto {1}" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "En la fila {0}: El paquete de serie y lote {1} ya está creado. Por favor, elimine los valores de los campos nº de serie o nº de lote." @@ -6291,7 +6283,11 @@ msgstr "Nombre del Atributo" msgid "Attribute Value" msgstr "Valor del Atributo" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "Tabla de atributos es obligatoria" @@ -6299,11 +6295,19 @@ msgstr "Tabla de atributos es obligatoria" msgid "Attribute value: {0} must appear only once" msgstr "Valor del atributo: {0} debe aparecer sólo una vez" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "Atributo {0} seleccionado varias veces en la tabla Atributos" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Atributos" @@ -6363,24 +6367,12 @@ msgstr "Valor Autorizado" msgid "Auto Create Exchange Rate Revaluation" msgstr "Creación automática de la revalorización del Tipo de Cambio" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "Creación automática de Recibo de Compra" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "Crear Automáticamente Lote y Serie para Salida" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "Crear orden de subcontratación automáticamente" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6499,6 +6491,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "Cierre automático Oportunidad Respondida después del número de días mencionado anteriormente" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6716,7 +6720,7 @@ msgstr "Fecha de disponibilidad para uso" msgid "Available for use date is required" msgstr "Disponible para la fecha de uso es obligatorio" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "La cantidad disponible es {0}, necesita {1}" @@ -6815,7 +6819,7 @@ msgstr "BFS (Búsqueda en Amplitud)" msgid "BIN Qty" msgstr "Cant. BIN" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7088,7 +7092,7 @@ msgstr "BOM de artículo del sitio web" msgid "BOM Website Operation" msgstr "Operación de Página Web de lista de materiales" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "La lista de materiales y la cantidad de producto terminado son obligatorias para el desmontaje" @@ -7179,8 +7183,8 @@ msgstr "Retroceda las materias primas del almacén de trabajo en progreso" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "Adquisición retroactiva de materia prima del subcontrato basadas en" +msgid "Backflush raw materials of subcontract based on" +msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7200,7 +7204,7 @@ msgstr "Balance" msgid "Balance (Dr - Cr)" msgstr "Balance (Debe - Haber)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Balance ({0})" @@ -7731,11 +7735,11 @@ msgstr "Banca" msgid "Barcode Type" msgstr "Tipo de Código de Barras" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "El código de barras {0} ya se utiliza en el artículo {1}" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "Código de Barras {0} no es un código {1} válido" @@ -8102,12 +8106,12 @@ msgstr "Lote {0} y almacén" msgid "Batch {0} is not available in warehouse {1}" msgstr "El lote {0} no está disponible en el almacén {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "El lote {0} del producto {1} ha expirado." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "El lote {0} del elemento {1} está deshabilitado." @@ -8180,8 +8184,8 @@ msgstr "Factura No." #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "Facturación de la cantidad rechazada en la factura de compra" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8521,8 +8525,11 @@ msgstr "Artículo de Orden Combinado" msgid "Blanket Order Rate" msgstr "Tasa de orden general" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -9037,7 +9044,7 @@ msgstr "Compra y Venta" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "'Compras' debe ser seleccionada, si la opción: 'Aplicable para' esta seleccionado como {0}" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "Por defecto, el Nombre del Proveedor se establece según el Nombre del Proveedor introducido. Si desea que los Proveedores sean nombrados por una Serie de Nombres elija la opción 'Serie de Nombres'." @@ -9402,7 +9409,7 @@ msgstr "No se puede filtrar en función al 'No. de comprobante', si esta agrupad msgid "Can only make payment against unbilled {0}" msgstr "Sólo se puede crear el pago contra {0} impagado" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9458,9 +9465,9 @@ msgstr "No se puede cambiar la configuración de la cuenta de inventario" msgid "Cannot Create Return" msgstr "No se puede crear una devolución" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "No se puede fusionar" @@ -9488,7 +9495,7 @@ msgstr "No se puede modificar {0} {1}; en su lugar, cree uno nuevo." msgid "Cannot apply TDS against multiple parties in one entry" msgstr "No se puede aplicar Retención de impuestos en origen contra varias partes en una sola entrada" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "No puede ser un elemento de Activo Fijo ya que se creo un Libro de Stock ." @@ -9524,7 +9531,7 @@ msgstr "No se puede cancelar esta entrada de stock de fabricación ya que la can msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "No se puede cancelar este documento porque está vinculado con el Ajuste del Valor del Activo validado {0}. Cancele el Ajuste del Valor del Activo para continuar." -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "No se puede cancelar este documento porque está vinculado al recurso enviado {asset_link}. Cancele el recurso para continuar." @@ -9532,7 +9539,7 @@ msgstr "No se puede cancelar este documento porque está vinculado al recurso en msgid "Cannot cancel transaction for Completed Work Order." msgstr "No se puede cancelar la transacción para la orden de trabajo completada." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "No se pueden cambiar los Atributos después de la Transacciones de Stock. Haga un nuevo Artículo y transfiera el stock al nuevo Artículo" @@ -9544,7 +9551,7 @@ msgstr "No se puede cambiar el tipo de documento de referencia." msgid "Cannot change Service Stop Date for item in row {0}" msgstr "No se puede cambiar la fecha de detención del servicio para el artículo en la fila {0}" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "No se pueden cambiar las propiedades de la Variante después de una transacción de stock. Deberá crear un nuevo ítem para hacer esto." @@ -9572,11 +9579,11 @@ msgstr "No se puede convertir a Grupo porque Tipo de Cuenta está seleccionado." msgid "Cannot covert to Group because Account Type is selected." msgstr "No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "No se pueden crear entradas de reserva de stock para recibos de compra con fecha futura." -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "No se puede crear una lista de selección para la orden de venta {0} porque tiene stock reservado. Anule la reserva del stock para crear una lista de selección." @@ -9602,7 +9609,7 @@ msgstr "No se puede declarar como perdida, porque se ha hecho el Presupuesto" msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y Total '" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "No se puede eliminar la fila de ganancias/pérdidas de cambio" @@ -9639,7 +9646,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "No se puede desmontar más de la cantidad producida." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9647,8 +9654,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "No se puede habilitar la cuenta de inventario por artículo, ya que existen asientos contables de stock para la empresa {0} con cuenta de inventario por almacén. Cancele las transacciones de stock primero y vuelva a intentarlo." -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "No se puede garantizar la entrega por número de serie ya que el artículo {0} se agrega con y sin Asegurar entrega por número de serie" @@ -9692,7 +9699,7 @@ msgstr "No se puede recibir del cliente contra saldos pendientes negativos" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "No se puede reducir la cantidad a la cantidad pedida o comprada" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9710,8 +9717,8 @@ msgstr "No se puede recuperar el token de enlace. Compruebe el registro de error msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9727,7 +9734,7 @@ msgstr "No se puede definir como pérdida, cuando la orden de venta esta hecha." msgid "Cannot set authorization on basis of Discount for {0}" msgstr "No se puede establecer la autorización sobre la base de descuento para {0}" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "No se pueden establecer varios valores predeterminados de artículos para una empresa." @@ -10638,7 +10645,7 @@ msgstr "Cierre (Cred)" msgid "Closing (Dr)" msgstr "Cierre (Deb)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "Cierre (Apertura + Total)" @@ -11099,7 +11106,7 @@ msgstr "Compañías" #: 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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11381,7 +11388,7 @@ msgstr "Compañía" msgid "Company Abbreviation" msgstr "Abreviatura de la compañia" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11394,7 +11401,7 @@ msgstr "La abreviatura de la Empresa no puede tener más de 5 caracteres" msgid "Company Account" msgstr "Cuenta de la compañia" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "La cuenta de empresa es obligatoria" @@ -11570,7 +11577,7 @@ msgstr "" msgid "Company is mandatory" msgstr "La empresa es obligatoria" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "La empresa es obligatoria para la cuenta de empresa" @@ -11841,7 +11848,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11854,7 +11861,9 @@ msgstr "Configurar el plan de cuentas" msgid "Configure Product Assembly" msgstr "Configurar el ensamblaje del producto" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11872,13 +11881,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "Configure la acción para detener la transacción o simplemente avisar si no se mantiene la misma tasa." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "Configure la lista de precios predeterminada al crear una nueva transacción de compra. Los precios de los artículos se obtendrán de esta lista de precios." @@ -12056,7 +12065,7 @@ msgstr "" msgid "Consumed" msgstr "Consumido" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "Monto consumido" @@ -12100,7 +12109,7 @@ msgstr "Costo de los artículos consumidos" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12273,10 +12282,6 @@ msgstr "La persona de contacto no pertenece a {0}" msgid "Contact:" msgstr "Contacto:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Contacto: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12454,7 +12459,7 @@ msgstr "Factor de conversión" msgid "Conversion Rate" msgstr "Tasa de conversión" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1" @@ -12726,7 +12731,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12821,7 +12826,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}" @@ -13159,7 +13164,7 @@ msgstr "Crear productos terminados" msgid "Create Grouped Asset" msgstr "Crear activos agrupados" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "Crear entrada de diario entre empresas" @@ -13532,7 +13537,7 @@ msgstr "¿Crear {0} {1} ?" msgid "Created By Migration" msgstr "Creado por migración" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "Se crearon {0} tarjetas de puntos para {1} entre:" @@ -13675,15 +13680,15 @@ msgstr "Creación de {0} parcialmente satisfactoria.\n" msgid "Credit" msgstr "Haber" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "Crédito (Transacción)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "Crédito ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "Cuenta de crédito" @@ -13878,7 +13883,7 @@ msgstr "Tasa de rotación de acreedores" msgid "Creditors" msgstr "Acreedores" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14176,7 +14181,7 @@ msgstr "Paquete de serie / lote actual" msgid "Current Serial No" msgstr "Número de serie actual" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14377,7 +14382,7 @@ msgstr "Delimitador personalizado" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15150,7 +15155,7 @@ msgstr "Fechas de procesamiento" msgid "Day Of Week" msgstr "Día de la semana" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15266,11 +15271,11 @@ msgstr "Distribuidor" msgid "Debit" msgstr "Debe" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "Débito (Transacción)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "Débito ({0})" @@ -15280,7 +15285,7 @@ msgstr "Débito ({0})" msgid "Debit / Credit Note Posting Date" msgstr "Fecha de contabilización de la nota de débito/crédito" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "Cuenta de debito" @@ -15391,7 +15396,7 @@ msgstr "Desajuste débito-crédito" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15533,7 +15538,7 @@ msgstr "Rango de envejecimiento predeterminado" msgid "Default BOM" msgstr "Lista de Materiales (LdM) por defecto" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla" @@ -15890,15 +15895,15 @@ msgstr "Territorio predeterminado" msgid "Default Unit of Measure" msgstr "Unidad de Medida (UdM) predeterminada" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "La unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción con otra unidad de medida. Debe cancelar los documentos vinculados o crear un artículo nuevo." -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "Unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción (s) con otra UOM. Usted tendrá que crear un nuevo elemento a utilizar un UOM predeterminado diferente." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "Unidad de medida predeterminada para variante '{0}' debe ser la mismo que en la plantilla '{1}'" @@ -16199,7 +16204,7 @@ msgstr "" msgid "Delivered" msgstr "Enviado" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Importe entregado" @@ -16249,8 +16254,8 @@ msgstr "Envios por facturar" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16261,11 +16266,11 @@ msgstr "Cant. Entregada" msgid "Delivered Qty (in Stock UOM)" msgstr "Cantidad entregada (en stock UdM)" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16354,7 +16359,7 @@ msgstr "Gerente de Envío" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16879,7 +16884,7 @@ msgstr "Cuenta de Diferencia en la Tabla de Artículos" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura" @@ -17043,11 +17048,9 @@ msgstr "Deshabilitar umbral acumulativo" msgid "Disable In Words" msgstr "Desactivar en palabras" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "Desactivar última tasa de compra" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17088,6 +17091,12 @@ msgstr "Desactivar selección de Núm. de Serie y Lote" msgid "Disable Transaction Threshold" msgstr "Deshabilitar el umbral de transacción" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17144,7 +17153,7 @@ msgstr "Desmontar" msgid "Disassemble Order" msgstr "Orden de desmontaje" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "La Cant. a desensamblar no puede ser menor o igual a 0." @@ -17669,6 +17678,12 @@ msgstr "No utilice la valoración por lotes" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17759,9 +17774,12 @@ msgstr "Búsqueda de documentos" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17779,6 +17797,10 @@ msgstr "Tipo de Documento" msgid "Document Type already used as a dimension" msgstr "Tipo de documento ya utilizado como dimensión" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "Documentación" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18083,7 +18105,7 @@ msgstr "Proyecto duplicado con tareas" msgid "Duplicate Sales Invoices found" msgstr "Se encontraron facturas de venta duplicadas" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "Error de número de serie duplicado" @@ -18203,8 +18225,8 @@ msgstr "ERP ID de usuario siguiente" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18427,7 +18449,7 @@ msgstr "Recibo de Email" msgid "Email Sent to Supplier {0}" msgstr "Correo electrónico enviado al proveedor {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18617,7 +18639,7 @@ msgstr "Id. de usuario del empleado" msgid "Employee cannot report to himself." msgstr "El empleado no puede informar a sí mismo." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "Empleado obligatorio" @@ -18625,7 +18647,7 @@ msgstr "Empleado obligatorio" msgid "Employee is required while issuing Asset {0}" msgstr "Se requiere empleado al emitir el activo {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18638,7 +18660,7 @@ msgstr "El empleado {0} no pertenece a la empresa {1}" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "El empleado {0} está trabajando en otra estación de trabajo. Por favor, asigne otro empleado." -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "Empleado {0} no encontrado" @@ -18681,7 +18703,7 @@ msgstr "Habilitar programación de citas" msgid "Enable Auto Email" msgstr "Habilitar correo electrónico automático" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "Habilitar reordenamiento automático" @@ -19282,7 +19304,7 @@ msgstr "Error: Este activo ya tiene contabilizados {0} periodos de amortización "\t\t\t\t\tLa fecha de `inicio de la amortización` debe ser al menos {1} periodos después de la fecha de `disponible para su uso`.\n" "\t\t\t\t\tPor favor, corrija las fechas en consecuencia." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "Error: {0} es un campo obligatorio" @@ -19328,7 +19350,7 @@ msgstr "" msgid "Example URL" msgstr "URL de ejemplo" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "Ejemplo de documento vinculado: {0}" @@ -19357,7 +19379,7 @@ msgstr "Ejemplo: Número de serie {0} reservado en {1}." msgid "Exception Budget Approver Role" msgstr "Rol de aprobación de presupuesto de excepción" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19716,7 +19738,7 @@ msgstr "Valor esperado después de la Vida Útil" msgid "Expense" msgstr "Gastos" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "La cuenta de Gastos/Diferencia ({0}) debe ser una cuenta de 'utilidad o pérdida \"" @@ -19764,7 +19786,7 @@ msgstr "La cuenta de Gastos/Diferencia ({0}) debe ser una cuenta de 'utilidad o msgid "Expense Account" msgstr "Cuenta de costos" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "Falta la cuenta de gastos" @@ -20227,7 +20249,7 @@ msgstr "Filtro Total Cero Cant." msgid "Filter by Reference Date" msgstr "Filtrar por Fecha de Referencia" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20557,7 +20579,7 @@ msgstr "Almacén de productos terminados" msgid "Finished Goods based Operating Cost" msgstr "Costo operativo basado en productos terminados" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "Artículo terminado {0} no coincide con la orden de trabajo {1}" @@ -20652,7 +20674,7 @@ msgstr "El régimen fiscal es obligatorio, establezca amablemente el régimen fi msgid "Fiscal Year" msgstr "Año fiscal" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20716,7 +20738,7 @@ msgstr "Cuenta de activo fijo" msgid "Fixed Asset Defaults" msgstr "Cuenta de activo fijo predeterminada" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "Artículo de Activos Fijos no debe ser un artículo de stock." @@ -20866,7 +20888,7 @@ msgstr "Para la empresa" msgid "For Item" msgstr "Para artículo" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "Para el artículo {0} no se puede recibir más de {1} cantidad contra {2} {3}" @@ -20897,7 +20919,7 @@ msgstr "Por lista de precios" msgid "For Production" msgstr "Por producción" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "Para Cantidad (Cant. Fabricada) es obligatorio" @@ -20981,6 +21003,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "Para el producto {0}, el precio debe ser un número positivo. Para permitir precios negativos, habilite {1} en {2}" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -21002,7 +21030,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "Para la cantidad {0} no debe ser mayor que la cantidad permitida {1}" @@ -21011,7 +21039,7 @@ msgstr "Para la cantidad {0} no debe ser mayor que la cantidad permitida {1}" msgid "For reference" msgstr "Para referencia" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "Para la línea {0} en {1}. incluir {2} en la tasa del producto, las lineas {3} también deben ser incluidas" @@ -21035,7 +21063,7 @@ msgstr "Para la condición "Aplicar regla a otros", el campo {0} es ob msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "Para comodidad de los clientes, estos códigos se pueden utilizar en formatos de impresión como facturas y notas de entrega." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -21044,7 +21072,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "Para la {0}, no hay existencias disponibles para la devolución en el almacén {1}." @@ -21657,7 +21685,7 @@ msgstr "G - D" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21669,7 +21697,7 @@ msgstr "Balance GL" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "Entrada GL" @@ -22184,7 +22212,7 @@ msgstr "Las mercancías en tránsito" msgid "Goods Transferred" msgstr "Bienes transferidos" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "Las mercancías ya se reciben contra la entrada exterior {0}" @@ -22367,7 +22395,7 @@ msgstr "" msgid "Grant Commission" msgstr "Conceder Comisión" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "Mayor que la cantidad" @@ -23008,11 +23036,11 @@ msgstr "¿Con qué frecuencia?" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" -msgstr "¿Con qué frecuencia debe actualizarse el proyecto del coste total de compra?" +msgid "How often should project be updated of Total Purchase Cost ?" +msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling #. Settings' @@ -23167,7 +23195,7 @@ msgstr "Si una operación se divide en suboperaciones, se pueden agregar aquí." msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "Si está en blanco, la cuenta de almacén principal o el incumplimiento de la empresa se considerarán en las transacciones" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23350,7 +23378,7 @@ msgstr "Si está habilitado, el sistema permitirá seleccionar unidades de medid msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23522,11 +23550,11 @@ msgstr "Si no lo desea, anule el asiento de pago correspondiente." msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "Si este producto tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "Si esta opción está configurada como 'Sí', ERPNext le impedirá crear una Factura o Recibo de Compra sin crear primero una Orden de Compra. Esta configuración se puede anular para un proveedor en particular activando la casilla de verificación 'Permitir la creación de facturas de compra sin orden de compra' en el maestro de proveedores." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "Si esta opción está configurada como 'Sí', ERPNext le impedirá crear una Factura de Compra sin crear primero un Recibo de Compra. Esta configuración se puede anular para un proveedor en particular activando la casilla de verificación "Permitir la creación de facturas de compra sin recibo de compra" en el maestro de proveedores." @@ -23642,7 +23670,7 @@ msgstr "Ignorar Stock Vacío" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "Ignorar la revalorización del tipo de cambio y los diarios de ganancias / pérdidas" @@ -23694,7 +23722,7 @@ msgstr "La opción Ignorar regla de precios está habilitada. No se puede aplica #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "Ignorar las notas de crédito / débito generadas por el sistema" @@ -23737,7 +23765,7 @@ msgstr "Ignorar la Superposición de Tiempo de la Estación de Trabajo" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23751,6 +23779,7 @@ msgid "Implementation Partner" msgstr "Socio de Implementación" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24104,7 +24133,7 @@ msgstr "Incluir activos FB por defecto" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24358,7 +24387,7 @@ msgstr "Cantidad de saldo incorrecta tras la transacción" msgid "Incorrect Batch Consumed" msgstr "Lote incorrecto consumido" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "Comprobación incorrecta en (grupo) Almacén para Reordenar" @@ -24366,7 +24395,7 @@ msgstr "Comprobación incorrecta en (grupo) Almacén para Reordenar" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "Cantidad incorrecta de componentes" @@ -24576,14 +24605,14 @@ msgstr "Iniciado" msgid "Inspected By" msgstr "Inspeccionado por" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "Inspección Rechazada" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "Inspección Requerida" @@ -24600,7 +24629,7 @@ msgstr "Inspección Requerida antes de Entrega" msgid "Inspection Required before Purchase" msgstr "Inspección Requerida antes de Compra" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "Presentación de la inspección" @@ -24682,8 +24711,8 @@ msgstr "Permisos Insuficientes" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "Insuficiente Stock" @@ -24903,7 +24932,7 @@ msgstr "Transferencias Internas" msgid "Internal Work History" msgstr "Historial de trabajo interno" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "Las transferencias internas solo se pueden realizar en la moneda predeterminada de la empresa" @@ -24996,7 +25025,7 @@ msgstr "Fecha de Entrega Inválida" msgid "Invalid Discount" msgstr "Descuento no válido" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -25026,7 +25055,7 @@ msgstr "Agrupar por no válido" msgid "Invalid Item" msgstr "Artículo Inválido" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "Artículos por defecto no válidos" @@ -25112,12 +25141,12 @@ msgstr "Programación no válida" msgid "Invalid Selling Price" msgstr "Precio de venta no válido" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "Paquete de serie y lote no válidos" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25154,7 +25183,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "Motivo perdido no válido {0}, cree un nuevo motivo perdido" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Serie de nombres no válida (falta.) Para {0}" @@ -25283,7 +25312,6 @@ msgstr "Cancelación de Facturas" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "Fecha de factura" @@ -25304,10 +25332,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "Factura Gran Total" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "ID de factura" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25829,13 +25853,13 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "¿Se requiere una orden de compra para la creación de facturas y recibos de compra?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "¿Se requiere un recibo de compra para la creación de una factura de compra?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -26107,7 +26131,7 @@ msgstr "Incidencias" msgid "Issuing Date" msgstr "Fecha de Emisión" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "Pueden pasar algunas horas hasta que los valores de stock precisos sean visibles después de fusionar los elementos." @@ -26177,7 +26201,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26224,6 +26248,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26239,7 +26264,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -27003,6 +27027,7 @@ msgstr "Fabricante del artículo" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -27013,7 +27038,6 @@ msgstr "Fabricante del artículo" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27273,11 +27297,11 @@ msgstr "Configuraciones de Variante de Artículo" msgid "Item Variant {0} already exists with same attributes" msgstr "Artículo Variant {0} ya existe con los mismos atributos" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "Variantes del artículo actualizadas" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "Se ha habilitado el traspaso basado en el almacén de artículos." @@ -27316,6 +27340,15 @@ msgstr "Especificación del producto en la WEB" msgid "Item Weight Details" msgstr "Detalles del Peso del Artículo" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27345,7 +27378,7 @@ msgstr "Detalle de Impuestos" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27365,11 +27398,11 @@ msgstr "Producto y Almacén" msgid "Item and Warranty Details" msgstr "Producto y detalles de garantía" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "El artículo de la fila {0} no coincide con la solicitud de material" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "El producto tiene variantes." @@ -27399,7 +27432,7 @@ msgstr "Operación del artículo" msgid "Item qty can not be updated as raw materials are already processed." msgstr "La cantidad de artículos no puede actualizarse porque las materias primas ya están procesadas." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "La tasa del artículo se ha actualizado a cero ya que la opción Permitir tasa de valoración cero está marcada para el artículo {0}" @@ -27418,10 +27451,14 @@ msgstr "La tasa de valoración del artículo se recalcula teniendo en cuenta el msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "Traspaso de valoración de artículos en curso. El informe podría mostrar una valoración de artículos incorrecta." -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "Existe la variante de artículo {0} con mismos atributos" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27435,7 +27472,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "Artículo {0} no puede ser pedido más que {1} contra pedido abierto {2}." #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "El elemento {0} no existe" @@ -27443,7 +27480,7 @@ msgstr "El elemento {0} no existe" msgid "Item {0} does not exist in the system or has expired" msgstr "El elemento {0} no existe en el sistema o ha expirado" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "El artículo {0} no existe." @@ -27459,15 +27496,15 @@ msgstr "El producto {0} ya ha sido devuelto" msgid "Item {0} has been disabled" msgstr "Elemento {0} ha sido desactivado" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "El artículo {0} no tiene número de serie. Solo los artículos serializados pueden enviarse según el número de serie." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "El producto {0} ha llegado al fin de la vida útil el {1}" @@ -27479,19 +27516,23 @@ msgstr "El producto {0} ha sido ignorado ya que no es un elemento de stock" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "El artículo {0} ya está reservado/entregado contra el pedido de venta {1}." -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "El producto {0} esta cancelado" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "Artículo {0} está deshabilitado" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "El producto {0} no es un producto serializado" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "El producto {0} no es un producto de stock" @@ -27499,7 +27540,11 @@ msgstr "El producto {0} no es un producto de stock" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "El producto {0} no está activo o ha llegado al final de la vida útil" @@ -27515,7 +27560,7 @@ msgstr "El artículo {0} debe ser un artículo que no se encuentra en stock" msgid "Item {0} must be a non-stock item" msgstr "Elemento {0} debe ser un elemento de no-stock" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "El artículo {0} no se encontró en la tabla 'Materias primas suministradas' en {1} {2}" @@ -27531,7 +27576,7 @@ msgstr "El producto {0}: Con la cantidad ordenada {1} no puede ser menor que el msgid "Item {0}: {1} qty produced. " msgstr "Elemento {0}: {1} cantidad producida." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "Producto {0} no existe." @@ -27641,7 +27686,7 @@ msgstr "Artículos para solicitud de materia prima" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "La tasa de artículos se ha actualizado a cero, ya que la opción Permitir tasa de valoración cero está marcada para los siguientes artículos: {0}" @@ -28274,7 +28319,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "La última transacción de existencias para el artículo {0} en el almacén {1} fue el {2}." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28553,7 +28598,7 @@ msgstr "Leyenda" msgid "Length (cm)" msgstr "Longitud (cm)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "Menos de la cantidad" @@ -28694,7 +28739,7 @@ msgstr "Facturas Vinculadas" msgid "Linked Location" msgstr "Ubicación vinculada" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "Vinculado con los documentos validados" @@ -29089,11 +29134,6 @@ msgstr "Mantener activos" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "Mantenga la misma tasa durante todo el ciclo de compra" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29105,6 +29145,11 @@ msgstr "Mantener Stock" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29301,7 +29346,7 @@ msgid "Major/Optional Subjects" msgstr "Principales / Asignaturas Optativas" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29470,8 +29515,8 @@ msgstr "Sección obligatoria" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29530,8 +29575,8 @@ msgstr "¡No se puede crear una entrada manual! Deshabilite la entrada automáti #: 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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29680,7 +29725,7 @@ msgstr "Fecha de Fabricación" msgid "Manufacturing Manager" msgstr "Gerente de Producción" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "La cantidad a producir es obligatoria" @@ -29956,7 +30001,7 @@ msgstr "Material de consumo" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "Consumo de Material para Fabricación" @@ -30027,6 +30072,7 @@ msgstr "Recepción de Materiales" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30133,11 +30179,11 @@ msgstr "Artículo de Plan de Solicitud de Material" msgid "Material Request Type" msgstr "Tipo de Requisición" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "Requerimiento de material no creado, debido a que la cantidad de materia prima ya está disponible." @@ -30252,7 +30298,7 @@ msgstr "Material Transferido para Manufacturar" msgid "Material Transferred for Manufacturing" msgstr "Material Transferido para la Producción" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30381,11 +30427,11 @@ msgstr "Importe máximo del pago" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "Las muestras máximas - {0} se pueden conservar para el lote {1} y el elemento {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "Las muestras máximas - {0} ya se han conservado para el lote {1} y el elemento {2} en el lote {3}." @@ -30829,11 +30875,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "Gastos varios" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "Discordancia" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "Faltante" @@ -30871,7 +30917,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "Libro de finanzas faltante" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "Bien terminado faltante" @@ -30879,11 +30925,11 @@ msgstr "Bien terminado faltante" msgid "Missing Formula" msgstr "Fórmula faltante" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "Artículo faltante" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30927,10 +30973,6 @@ msgstr "Valor faltante" msgid "Mixed Conditions" msgstr "Condiciones mixtas" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "Móvil: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31199,7 +31241,7 @@ msgstr "" msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "Existen varios ejercicios para la fecha {0}. Por favor, establece la compañía en el año fiscal" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "No se pueden marcar varios artículos como artículo terminado" @@ -31278,27 +31320,20 @@ msgstr "Lugar nombrado" msgid "Naming Series Prefix" msgstr "Nombrar el Prefijo de la Serie" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "Series de Nombres y Precios por Defecto" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31346,16 +31381,16 @@ msgstr "Necesita Anáisis" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "No se permiten cantidades negativas" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "La valoración negativa no está permitida" @@ -31969,7 +32004,7 @@ msgstr "No se encontró ningún perfil de PDV. Cree primero un nuevo perfil de P #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "Sin permiso" @@ -31982,7 +32017,7 @@ msgstr "No se crearon Órdenes de Compra" msgid "No Records for these settings." msgstr "No hay registros para estas configuraciones." -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "Ninguna selección" @@ -32027,7 +32062,7 @@ msgstr "No se encontraron pagos no conciliados para este tercero" msgid "No Work Orders were created" msgstr "No se crearon órdenes de trabajo" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "No hay asientos contables para los siguientes almacenes" @@ -32040,7 +32075,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "No se encontró ninguna lista de materiales activa para el artículo {0}. No se puede garantizar la entrega por número de serie" @@ -32052,7 +32087,7 @@ msgstr "No hay campos adicionales disponibles" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -32060,7 +32095,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32154,7 +32189,7 @@ msgstr "No más secundarios en la izquierda" msgid "No more children on Right" msgstr "No más secundarios en la derecha" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32329,7 +32364,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32421,7 +32456,7 @@ msgstr "No ceros" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "Ninguno de los productos tiene cambios en el valor o en la existencias." @@ -32525,7 +32560,7 @@ msgstr "No autorizado porque {0} excede los límites" msgid "Not authorized to edit frozen Account {0}" msgstr "No autorizado para editar la cuenta congelada {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32571,7 +32606,7 @@ msgstr "Nota : El registro del pago no se creará hasta que la cuenta del tipo ' msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "Nota: este centro de costes es una categoría. No se pueden crear asientos contables en las categorías." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "Nota: Para fusionar los artículos, cree una reconciliación de existencias separada para el antiguo artículo {0}." @@ -33048,7 +33083,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "Sólo puede crearse una entrada {0} contra la orden de trabajo {1}" @@ -33200,7 +33235,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "Apertura" @@ -33359,16 +33394,16 @@ msgstr "Se han creado facturas de venta de apertura." #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Stock de apertura" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33725,7 +33760,7 @@ msgstr "Opcional. Esta configuración es utilizada para filtrar la cuenta de otr msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33859,7 +33894,7 @@ msgstr "Cantidad ordenada" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "Órdenes" @@ -34067,7 +34102,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34125,7 +34160,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "Tolerancia por exceso de facturación (%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34143,7 +34178,7 @@ msgstr "Tolerancia por exceso de entrega/recepción (%)" msgid "Over Picking Allowance" msgstr "Exceso de recolección permitido" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "Sobre recibo" @@ -34386,7 +34421,6 @@ msgstr "Campo PdV" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "Factura PdV" @@ -34657,7 +34691,7 @@ msgstr "Artículo Empacado" msgid "Packed Items" msgstr "Productos Empacados" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "Los artículos empaquetados no se pueden transferir internamente" @@ -35105,7 +35139,7 @@ msgstr "Parcialmente recibido" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35241,7 +35275,7 @@ msgstr "Partes por millón" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35367,7 +35401,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35453,7 +35487,7 @@ msgstr "Producto específico de la Parte" #: 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:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35756,7 +35790,6 @@ msgstr "Las entradas de pago {0} estan no-relacionadas" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -36014,7 +36047,7 @@ msgstr "Referencias del Pago" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36093,10 +36126,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "Estado del Pago" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37116,7 +37145,7 @@ msgstr "Por favor, establezca la prioridad" msgid "Please Set Supplier Group in Buying Settings." msgstr "Por favor, configure el grupo de proveedores en las configuraciones de compra." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "Por favor especifique la cuenta" @@ -37148,11 +37177,11 @@ msgstr "Agregue una Cuenta de Apertura Temporal en el Plan de Cuentas" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "Por favor, añada al menos un nº de serie / nº de lote" @@ -37172,7 +37201,7 @@ msgstr "Agregue la cuenta a la empresa de nivel raíz - {}" msgid "Please add {1} role to user {0}." msgstr "Por favor, añada el rol {1} al usuario {0}." -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "Ajuste la cantidad o edite {0} para continuar." @@ -37279,7 +37308,7 @@ msgstr "Por favor, cree la compra a partir de la venta interna o del propio docu msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "Cree un recibo de compra o una factura de compra para el artículo {0}" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "Por favor, elimine el paquete de productos {0}, antes de fusionar {1} en {2}" @@ -37348,11 +37377,11 @@ msgstr "Por favor, introduzca la cuenta para el importe de cambio" msgid "Please enter Approving Role or Approving User" msgstr "Por favor, introduzca 'Función para aprobar' o 'Usuario de aprobación'---" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "Por favor, introduzca el centro de costos" @@ -37364,7 +37393,7 @@ msgstr "Por favor, introduzca la Fecha de Entrega" msgid "Please enter Employee Id of this sales person" msgstr "Por favor, Introduzca ID de empleado para este vendedor" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "Introduzca la cuenta de gastos" @@ -37409,7 +37438,7 @@ msgstr "Por favor, introduzca la fecha de referencia" msgid "Please enter Root Type for account- {0}" msgstr "Por favor, introduzca el tipo de cuenta- {0}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "" @@ -37486,7 +37515,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "Primero ingrese el número de teléfono" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37600,12 +37629,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "Seleccione Tipo de plantilla para descargar la plantilla" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "Por favor seleccione 'Aplicar descuento en'" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "Seleccione la Lista de Materiales contra el Artículo {0}" @@ -37621,13 +37650,13 @@ msgstr "Por favor, seleccione Cuenta Bancaria" msgid "Please select Category first" msgstr "Por favor, seleccione primero la categoría" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "Por favor, seleccione primero el tipo de cargo" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "Por favor, seleccione la empresa" @@ -37636,7 +37665,7 @@ msgstr "Por favor, seleccione la empresa" msgid "Please select Company and Posting Date to getting entries" msgstr "Seleccione Empresa y Fecha de publicación para obtener entradas" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "Por favor, seleccione primero la compañía" @@ -37685,7 +37714,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "Por favor, seleccione fecha de publicación antes de seleccionar la Parte" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "Por favor, seleccione fecha de publicación primero" @@ -37693,11 +37722,11 @@ msgstr "Por favor, seleccione fecha de publicación primero" msgid "Please select Price List" msgstr "Por favor, seleccione la lista de precios" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "Seleccione Cant. contra el Elemento {0}" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "Seleccione primero Almacén de Retención de Muestras en la Configuración de Stock." @@ -37750,7 +37779,7 @@ msgstr "Seleccione una orden de compra de subcontratación." msgid "Please select a Supplier" msgstr "Seleccione un proveedor" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "Por favor seleccione un almacén" @@ -37811,7 +37840,7 @@ msgstr "Por favor, seleccione una fila para crear una entrada de reenvío" msgid "Please select a supplier for fetching payments." msgstr "Por favor, seleccione un proveedor para obtener los pagos." -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37831,7 +37860,7 @@ msgstr "Por favor, seleccione un código de artículo antes de establecer el alm msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37938,7 +37967,7 @@ msgstr "Por favor, seleccione un tipo de documento válido." msgid "Please select weekly off day" msgstr "Por favor seleccione el día libre de la semana" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "Por favor, seleccione primero {0}" @@ -38078,7 +38107,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "Por favor, establezca una dirección en la empresa '%s'" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "Establezca una cuenta de gastos en la tabla de artículos" @@ -38122,7 +38151,7 @@ msgstr "Por favor, configure la cuenta de gastos predeterminada en la empresa {0 msgid "Please set default UOM in Stock Settings" msgstr "Configure la UOM predeterminada en la configuración de stock" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "Por favor, establezca la cuenta de coste de las mercancías vendidas por defecto en la empresa {0} para registrar las ganancias y pérdidas por redondeo durante la transferencia de existencias" @@ -38241,7 +38270,7 @@ msgstr "Por favor, especifique un {0} primero." msgid "Please specify at least one attribute in the Attributes table" msgstr "Por favor, especifique al menos un atributo en la tabla" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "Por favor indique la Cantidad o el Tipo de Valoración, o ambos" @@ -38412,7 +38441,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38437,7 +38466,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38552,7 +38581,7 @@ msgstr "Fecha y Hora de Contabilización" msgid "Posting Time" msgstr "Hora de Contabilización" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "La fecha y hora de contabilización son obligatorias" @@ -38731,6 +38760,12 @@ msgstr "Mantenimiento Preventivo" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39024,7 +39059,9 @@ msgstr "Se requieren losas de descuento de precio o producto" msgid "Price per Unit (Stock UOM)" msgstr "Precio por unidad (UOM de stock)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40379,6 +40416,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40415,6 +40453,12 @@ msgstr "Factura de compra anticipada" msgid "Purchase Invoice Item" msgstr "Producto de la Factura de Compra" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40466,6 +40510,7 @@ msgstr "Facturas de compra" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40475,7 +40520,7 @@ msgstr "Facturas de compra" #: 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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40592,7 +40637,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "La orden de compra {0} no se encuentra validada" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "Ordenes de compra" @@ -40655,6 +40700,7 @@ msgstr "Lista de precios para las compras" #: 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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40669,7 +40715,7 @@ msgstr "Lista de precios para las compras" msgid "Purchase Receipt" msgstr "Recibo de compra" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40935,7 +40981,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41523,7 +41568,7 @@ msgstr "Revisión de calidad" msgid "Quality Review Objective" msgstr "Objetivo de revisión de calidad" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41584,7 +41629,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41778,7 +41823,7 @@ msgstr "Cadena de Ruta de Consulta" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "Asiento Contable Rápido" @@ -41833,7 +41878,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41996,7 +42041,6 @@ msgstr "Propuesto por (Email)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42406,8 +42450,8 @@ msgstr "" msgid "Raw SQL" msgstr "SQL crudo" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42815,11 +42859,10 @@ msgstr "Conciliar la transacción bancaria" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43343,7 +43386,7 @@ msgstr "Lote y serie rechazados" msgid "Rejected Warehouse" msgstr "Almacén rechazado" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "Almacén Rechazado y Almacén Aceptado no pueden ser el mismo." @@ -43393,7 +43436,7 @@ msgid "Remaining Balance" msgstr "Balance restante" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43447,7 +43490,7 @@ msgstr "Observación" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43486,7 +43529,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "Remover el artículo si los cargos no son aplicables a ese artículo" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "Elementos eliminados que no han sido afectados en cantidad y valor" @@ -43891,6 +43934,7 @@ msgstr "Solicitud de información" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44164,7 +44208,7 @@ msgstr "" msgid "Reserved" msgstr "Reservado" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44777,7 +44821,7 @@ msgstr "" msgid "Reversal Of" msgstr "Reversión de" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "Invertir Entrada de Diario" @@ -44926,10 +44970,7 @@ msgstr "Rol permitido para entregar/recibir más de lo esperado" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "Rol permitido para anular la acción de detención" @@ -44944,8 +44985,11 @@ msgstr "Rol permitido para eludir el límite de crédito" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45146,8 +45190,8 @@ msgstr "Redondeo de la indemnización por pérdidas" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "El margen de pérdida por redondeo debe estar entre 0 y 1" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "Redondeo de ganancias/pérdidas Entrada para traslado de existencias" @@ -45174,11 +45218,11 @@ msgstr "Nombre de Enrutamiento" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "Fila #{0}: No se puede devolver más de {1} para el producto {2}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "Fila # {0}: Por favor, añada la serie y el lote para el artículo {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45204,7 +45248,7 @@ msgstr "Fila #{0} (Tabla de pagos): El importe debe ser negativo" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "Fila #{0} (Tabla de pagos): El importe debe ser positivo" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "Fila #{0}: Ya existe una entrada de reorden para el almacén {1} con el tipo de reorden {2}." @@ -45405,7 +45449,7 @@ msgstr "Fila #{0}: Entrada duplicada en Referencias {1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "Fila #{0}: La fecha de entrega esperada no puede ser anterior a la fecha de la orden de compra" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "Fila #{0}: Cuenta de gastos no configurada para el artículo {1}. {2}" @@ -45465,7 +45509,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "Fila # {0}: Elemento agregado" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45493,7 +45537,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "Fila # {0}: el artículo {1} no es un artículo serializado / en lote. No puede tener un No de serie / No de lote en su contra." @@ -45546,7 +45590,7 @@ msgstr "Fila #{0}: Solo {1} disponible para reservar para el artículo {2}" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "Fila # {0}: la operación {1} no se completa para {2} cantidad de productos terminados en la orden de trabajo {3}. Actualice el estado de la operación a través de la Tarjeta de trabajo {4}." @@ -45571,7 +45615,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Fila #{0}: Por favor, seleccione el Almacén de Sub-montaje" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "Fila #{0}: Configure la cantidad de pedido" @@ -45597,15 +45641,15 @@ msgstr "Fila #{0}: La cantidad debe ser un número positivo" 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 "Fila #{0}: La cantidad debe ser menor o igual a la cantidad disponible para reservar (cantidad real - cantidad reservada) {1} para Artículo {2} contra el lote {3} en el almacén {4}." -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "Fila #{0}: Se requiere inspección de calidad para el artículo {1}" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "Fila #{0}: La inspección de calidad {1} no se ha validado para el artículo: {2}" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "Fila #{0}: La inspección de calidad {1} fue rechazada para el artículo {2}" @@ -45636,11 +45680,11 @@ msgstr "Fila #{0}: La cantidad a reservar para el artículo {1} debe ser superio msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "Fila #{0}: La tasa debe ser la misma que {1}: {2} ({3} / {4})" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "Fila #{0}: Tipo de documento de referencia debe ser uno de la orden de compra, factura de compra o de entrada de diario" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "Fila # {0}: el tipo de documento de referencia debe ser pedido de cliente, factura de venta, asiento de diario o reclamación." @@ -45683,7 +45727,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "Fila # {0}: El número de serie {1} no pertenece al lote {2}" @@ -45731,11 +45775,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45788,11 +45832,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "Fila nº {0}: el lote {1} ya ha caducado." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "Fila #{0}: El almacén {1} no es un almacén secundario de un almacén de grupo {2}" @@ -45820,7 +45864,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "Fila #{0}: No se puede utilizar la dimensión de inventario '{1}' en la conciliación de stock para modificar la cantidad o la tasa de valoración. La conciliación de stock con las dimensiones de inventario está destinada únicamente a realizar asientos de apertura." @@ -45856,23 +45900,23 @@ msgstr "Fila #{1}: El Almacén es obligatorio para el producto en stock {0}" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "Fila #{idx}: La tarifa del artículo se ha actualizado según la tarifa de valoración, ya que se trata de una transferencia de stock interna." -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "Fila #{idx}: La cantidad recibida debe ser igual a la cantidad aceptada + rechazada para el artículo {item_code}." -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "Fila #{idx}: {field_label} no puede ser negativo para el elemento {item_code}." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45880,7 +45924,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45945,7 +45989,7 @@ msgstr "Fila #{}: {}" msgid "Row #{}: {} {} does not exist." msgstr "Fila # {}: {} {} no existe." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "Fila #{}: {} {} no pertenece a la empresa {}. Por favor, seleccione una {} válida." @@ -45961,7 +46005,7 @@ msgstr "Fila {0}: se requiere operación contra el artículo de materia prima {1 msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "Fila {0} la cantidad recogida es menor a la requerida, se requiere {1} {2} adicional." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "Fila {0}# El artículo {1} no se encontró en la tabla 'Materias primas suministradas' en {2} {3}" @@ -45993,7 +46037,7 @@ msgstr "Fila {0}: El importe asignado {1} debe ser menor o igual al importe pend msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "Fila {0}: El importe asignado {1} debe ser menor o igual al importe de pago restante {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "Fila {0}: Como {1} está activada, no se pueden añadir materias primas a la entrada {2} . Utilice la entrada {3} para consumir materias primas." @@ -46051,7 +46095,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "Fila {0}: La referencia del artículo de la nota de entrega o del artículo empaquetado es obligatoria." #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "Fila {0}: Tipo de cambio es obligatorio" @@ -46092,7 +46136,7 @@ msgstr "Fila {0}: Tiempo Desde y Tiempo Hasta es obligatorio." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "Fila {0}: Tiempo Desde y Tiempo Hasta de {1} se solapan con {2}" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "Fila {0}: Desde el almacén es obligatorio para transferencias internas" @@ -46216,7 +46260,7 @@ msgstr "Fila {0}: La cantidad debe ser mayor que 0." msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "Fila {0}: Cantidad no disponible para {4} en el almacén {1} al momento de contabilizar la entrada ({2} {3})" @@ -46228,11 +46272,11 @@ msgstr "" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "Fila {0}: No se puede cambiar el turno porque ya se ha procesado la amortización" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "Fila {0}: el artículo subcontratado es obligatorio para la materia prima {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "Fila {0}: El almacén de destino es obligatorio para las transferencias internas" @@ -46256,7 +46300,7 @@ msgstr "Fila {0}: La cuenta {3} {1} no pertenece a la empresa {2}" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "Fila {0}: Para establecer la periodicidad {1} , la diferencia entre la fecha de inicio y la de finalización debe ser mayor o igual a {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46309,7 +46353,7 @@ msgstr "Fila {0}: {2} El elemento {1} no existe en {2} {3}" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "Fila {1}: la cantidad ({0}) no puede ser una fracción. Para permitir esto, deshabilite '{2}' en UOM {3}." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -46339,7 +46383,7 @@ msgstr "Las líneas con los mismos encabezamientos de cuenta se fusionarán en e msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "Se encontraron filas con fechas de vencimiento duplicadas en otras filas: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "Filas: {0} tienen 'Entrada de pago' como reference_type. No debe establecerse manualmente." @@ -46405,7 +46449,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46702,7 +46746,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46876,7 +46920,7 @@ msgstr "Oportunidades de venta por fuente" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46999,8 +47043,8 @@ msgstr "Orden de venta requerida para el producto {0}" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "El Pedido de Venta {0} ya existe contra el Pedido de Compra del Cliente {1}. Para permitir múltiples Pedidos de Venta, habilite {2} en {3}." -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47411,7 +47455,7 @@ msgstr "Mismo articulo" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "Ya se ha introducido la misma combinación de artículo y almacén." @@ -47448,7 +47492,7 @@ msgstr "Almacenamiento de Muestras de Retención" msgid "Sample Size" msgstr "Tamaño de muestra" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "La Cantidad de Muestra {0} no puede ser más que la Cantidad Recibida {1}" @@ -47739,7 +47783,7 @@ msgstr "Búsqueda por código de artículo, número de serie o código de barras msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47884,7 +47928,7 @@ msgstr "Seleccione una marca ..." msgid "Select Columns and Filters" msgstr "Seleccionar columnas y filtros" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "Seleccionar Compañia" @@ -48580,7 +48624,7 @@ msgstr "Rango de números de serie" msgid "Serial No Reserved" msgstr "" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48641,7 +48685,7 @@ msgstr "El número de serie es obligatorio" msgid "Serial No is mandatory for Item {0}" msgstr "No. de serie es obligatoria para el producto {0}" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "El número de serie {0} ya existe" @@ -48927,7 +48971,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48953,7 +48997,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49351,12 +49395,6 @@ msgstr "Asignar Almacén Destino" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "Establecer tasa de valoración en función del almacén de origen" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "Establecer Almacén" @@ -49462,6 +49500,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "Establezca {0} en la categoría de activos {1} para la empresa {2}" @@ -49960,7 +50004,7 @@ msgstr "Mostrar saldos en el plan de cuentas" msgid "Show Barcode Field in Stock Transactions" msgstr "Mostrar campo de código de barras en transacciones de stock" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "Mostrar entradas canceladas" @@ -49968,7 +50012,7 @@ msgstr "Mostrar entradas canceladas" msgid "Show Completed" msgstr "Mostrar completado" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -50051,7 +50095,7 @@ msgstr "Mostrar notas de entrega vinculadas" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "Mostrar valores netos en la cuenta de la entidad" @@ -50063,7 +50107,7 @@ msgstr "" msgid "Show Open" msgstr "Mostrar abiertos" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "Mostrar entradas de apertura" @@ -50076,11 +50120,6 @@ msgstr "" msgid "Show Operations" msgstr "Mostrar Operaciones" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "Mostrar botón de pago en el portal de órdenes de compra" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "Mostrar detalles de pago" @@ -50096,7 +50135,7 @@ msgstr "Mostrar horario de pago en Imprimir" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "Mostrar Observaciones" @@ -50163,6 +50202,11 @@ msgstr "Mostrar solo PdV" msgid "Show only the Immediate Upcoming Term" msgstr "Mostrar solo el término próximo inmediato" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "Mostrar entradas pendientes" @@ -50449,11 +50493,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50519,7 +50563,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "La ubicación de origen y destino no puede ser la misma" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "Almacenes de origen y destino no pueden ser los mismos, línea {0}" @@ -50533,8 +50577,8 @@ msgid "Source of Funds (Liabilities)" msgstr "Origen de fondos (Pasivo)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "El almacén de origen es obligatorio para la línea {0}" @@ -50699,8 +50743,8 @@ msgstr "Gastos con tasa estándar" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "Venta estándar" @@ -51033,7 +51077,7 @@ msgstr "" msgid "Stock Details" msgstr "Detalles de almacén" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "Entradas de stock ya creadas para la orden de trabajo {0}: {1}" @@ -51304,7 +51348,7 @@ msgstr "Inventario Recibido pero no Facturado" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51316,7 +51360,7 @@ msgstr "Reconciliación de inventarios" msgid "Stock Reconciliation Item" msgstr "Elemento de reconciliación de inventarios" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "Reconciliaciones de stock" @@ -51354,7 +51398,7 @@ msgstr "Configuración de ajuste de valoración de stock" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51382,7 +51426,7 @@ msgstr "Entradas de reserva de stock canceladas" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "Entradas de reserva de stock creadas" @@ -51764,7 +51808,7 @@ msgstr "La Órden de Trabajo detenida no se puede cancelar, desactívela primero #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "Sucursales" @@ -51842,10 +51886,6 @@ msgstr "Sub operaciones" msgid "Sub Procedure" msgstr "Subprocedimiento" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -52062,7 +52102,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "Orden de subcontratación" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52088,7 +52128,7 @@ msgstr "Artículo de servicio de orden de subcontratación" msgid "Subcontracting Order Supplied Item" msgstr "Orden de subcontratación Artículo suministrado" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "Orden de subcontratación {0} creada." @@ -52177,7 +52217,7 @@ msgstr "" msgid "Subdivision" msgstr "Subdivisión" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "Fallo al validar" @@ -52352,7 +52392,7 @@ msgstr "Reconciliado exitosamente" msgid "Successfully Set Supplier" msgstr "Proveedor establecido con éxito" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "La unidad de medida de stock se modificó correctamente; redefina los factores de conversión para la nueva unidad de medida." @@ -52508,6 +52548,7 @@ msgstr "Cant. Suministrada" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52549,8 +52590,8 @@ msgstr "Cant. Suministrada" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52598,6 +52639,12 @@ msgstr "Libreta de direcciones de proveedores" msgid "Supplier Contact" msgstr "Contacto del proveedor" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52692,7 +52739,7 @@ msgstr "Fecha de factura de proveedor" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "Factura de proveedor No." @@ -52972,19 +53019,10 @@ msgstr "Proveedor de Bienes o Servicios." msgid "Supplier {0} not found in {1}" msgstr "Proveedor {0} no encontrado en {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Proveedor(es)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "Análisis de ventas (Proveedores)" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53046,7 +53084,7 @@ msgstr "Equipo de soporte" msgid "Support Tickets" msgstr "Tickets de Soporte" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53306,8 +53344,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "El almacén de destino es obligatorio para la línea {0}" @@ -53776,7 +53814,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "Base imponible" @@ -53937,7 +53975,7 @@ msgstr "Impuestos y cargos deducidos" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "Impuestos y gastos deducibles (Divisa por defecto)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "Fila de impuestos #{0}: {1} no puede ser menor que {2}" @@ -54127,7 +54165,6 @@ msgstr "Plantilla de Términos" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54319,7 +54356,7 @@ msgstr "El acceso a la solicitud de cotización del portal está deshabilitado. msgid "The BOM which will be replaced" msgstr "La lista de materiales que será sustituida" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54363,7 +54400,7 @@ msgstr "El Término de Pago en la fila {0} es posiblemente un duplicado." 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 "La lista de selección que tiene entradas de reserva de existencias no se puede actualizar. Si necesita realizar cambios, le recomendamos cancelar las entradas de reserva de existencias existentes antes de actualizar la lista de selección." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54379,7 +54416,7 @@ msgstr "El número de serie en la fila #{0}: {1} no está disponible en el almac 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:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "El paquete de serie y lote {0} no es válido para esta transacción. El \"Tipo de transacción\" debería ser \"Saliente\" en lugar de \"Entrante\" en el paquete de serie y lote {0}" @@ -54415,7 +54452,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54521,7 +54558,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "Los siguientes atributos eliminados existen en las variantes pero no en la plantilla. Puede eliminar las variantes o mantener los atributos en la plantilla." @@ -54565,15 +54602,15 @@ msgstr "El día de fiesta en {0} no es entre De la fecha y Hasta la fecha" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "Los elementos {0} y {1} están presentes en los siguientes {2} :" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54729,7 +54766,7 @@ msgstr "Las acciones no existen con el {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "El stock del artículo {0} en el almacén {1} era negativo el {2}. Debe crear una entrada positiva {3} antes de la fecha {4} y la hora {5} para registrar la tasa de valoración correcta. Para obtener más detalles, lea la documentación ." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "" @@ -54751,11 +54788,11 @@ 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 "El sistema creará una Factura de Venta o una Factura de PdV desde la interfaz de PdV según esta configuración. Para transacciones de gran volumen, se recomienda usar la Factura de PdV." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "La tarea se ha puesto en cola como un trabajo en segundo plano. En caso de que haya algún problema con el procesamiento en segundo plano, el sistema agregará un comentario sobre el error en esta Reconciliación de inventario y volverá a la etapa Borrador" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -54827,7 +54864,7 @@ msgstr "El {0} ({1}) debe ser igual a {2} ({3})" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54880,7 +54917,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54924,7 +54961,7 @@ msgstr "No se ha encontrado ningún lote en {0}: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54980,11 +55017,11 @@ msgstr "Este elemento es una variante de {0} (plantilla)." msgid "This Month's Summary" msgstr "Resumen de este mes" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55785,7 +55822,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} tambien deben ser incluidos" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos" @@ -55820,7 +55857,7 @@ msgstr "Para utilizar un libro de finanzas diferente, desmarque la opción \"Inc #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "Para utilizar un libro de finanzas diferente, desmarque la opción \"Incluir entradas de FB predeterminadas\"" @@ -55971,7 +56008,7 @@ msgstr "Asignaciones totales" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Importe total" @@ -56394,7 +56431,7 @@ msgstr "El monto total de la solicitud de pago no puede ser mayor que el monto d msgid "Total Payments" msgstr "Pagos totales" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56426,7 +56463,7 @@ msgstr "Costo total de compra (vía facturas de compra)" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Cant. Total" @@ -56812,7 +56849,7 @@ msgstr "URL de Seguimiento" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56823,7 +56860,7 @@ msgstr "Transacción" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "moneda de la transacción" @@ -57495,11 +57532,11 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57571,7 +57608,7 @@ msgstr "El factor de conversión de la (UdM) es requerido en la línea {0}" msgid "UOM Name" msgstr "Nombre de la unidad de medida (UdM)" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57647,7 +57684,7 @@ msgstr "No se puede encontrar la puntuación a partir de {0}. Usted necesita ten msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "No se puede encontrar la variable:" @@ -57766,7 +57803,7 @@ msgstr "Unidad de Medida (UdM)" msgid "Unit of Measure (UOM)" msgstr "Unidad de Medida (UdM)" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión" @@ -57886,10 +57923,9 @@ msgid "Unreconcile Transaction" msgstr "Transacción no conciliada" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "No reconciliado" @@ -57912,10 +57948,6 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57961,7 +57993,7 @@ msgstr "Sin programación" msgid "Unsecured Loans" msgstr "Préstamos sin garantía" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58176,12 +58208,6 @@ msgstr "Actualizar el Inventario" msgid "Update Type" msgstr "Tipo de actualización" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58222,7 +58248,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "Actualizando Variantes ..." @@ -58680,12 +58706,6 @@ msgstr "Validar regla aplicada" msgid "Validate Components and Quantities Per BOM" msgstr "" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58709,6 +58729,12 @@ msgstr "Validar regla de precios" msgid "Validate Stock on Save" msgstr "Validar Stock al Guardar" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58815,11 +58841,11 @@ msgstr "Falta la tasa de valoración" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "Tasa de valoración para el artículo {0}, se requiere para realizar asientos contables para {1} {2}." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "Rango de Valoración es obligatorio si se ha ingresado una Apertura de Almacén" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "Tasa de valoración requerida para el artículo {0} en la fila {1}" @@ -58829,7 +58855,7 @@ msgstr "Tasa de valoración requerida para el artículo {0} en la fila {1}" msgid "Valuation and Total" msgstr "Valuación y Total" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "La tasa de valoración de los artículos proporcionados por el cliente se ha establecido en cero." @@ -58979,7 +59005,7 @@ msgstr "Varianza ({})" msgid "Variant" msgstr "Variante" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "Error de atributo de variante" @@ -58998,7 +59024,7 @@ msgstr "Lista de materiales variante" msgid "Variant Based On" msgstr "Variante basada en" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "La variante basada en no se puede cambiar" @@ -59016,7 +59042,7 @@ msgstr "Campo de Variante" msgid "Variant Item" msgstr "Elemento variante" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "Elementos variantes" @@ -59397,7 +59423,7 @@ msgstr "Nombre del comprobante" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.js:41 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:33 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:65 @@ -59437,7 +59463,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "" @@ -59469,7 +59495,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59704,7 +59730,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "" @@ -59751,7 +59777,7 @@ msgstr "Complejos de depósito de transacciones existentes no se pueden converti #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59807,6 +59833,12 @@ msgstr "Avisar de nuevas Solicitudes de Presupuesto" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" @@ -59990,7 +60022,7 @@ msgstr "Especificaciones del sitio web" msgid "Website:" msgstr "Sitio Web:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60364,7 +60396,7 @@ msgstr "" msgid "Work Order Item" msgstr "Artículo de Órden de Trabajo" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60426,11 +60458,11 @@ msgstr "Orden de trabajo no creada" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "Orden de trabajo {0}: Tarjeta de trabajo no encontrada para la operación {1}" @@ -60746,11 +60778,11 @@ msgstr "Nombre del Año" msgid "Year Start Date" msgstr "Fecha de Inicio de Año" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60803,7 +60835,7 @@ msgstr "Usted puede copiar y pegar este enlace en su navegador" msgid "You can also set default CWIP account in Company {}" msgstr "También puede configurar una cuenta CWIP predeterminada en la empresa {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60957,6 +60989,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60985,7 +61021,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60993,7 +61029,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "Debe habilitar el reordenamiento automático en la Configuración de inventario para mantener los niveles de reordenamiento." @@ -61064,8 +61100,11 @@ msgstr "" msgid "Zero quantity" msgstr "" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61177,7 +61216,7 @@ msgstr "" msgid "fieldname" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61395,6 +61434,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "Único, por ejemplo, SAVE20 Para ser utilizado para obtener descuento" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "variación" @@ -61453,7 +61496,8 @@ msgstr "Los cupones {0} utilizados son {1}. La cantidad permitida se agota" msgid "{0} Digest" msgstr "{0} Resumen" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61473,7 +61517,7 @@ msgstr "{0} Operaciones: {1}" msgid "{0} Request for {1}" msgstr "{0} Solicitud de {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} Retener muestra se basa en el lote, marque Tiene número de lote para retener la muestra del artículo." @@ -61586,7 +61630,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} se ingresó dos veces en impuesto del artículo" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "" @@ -61754,7 +61798,7 @@ msgstr "El parámetro {0} no es válido" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} entradas de pago no pueden ser filtradas por {1}" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61767,7 +61811,7 @@ msgstr "{0} a {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" @@ -61969,7 +62013,7 @@ msgstr "{0} {1}: la cuenta {2} está inactiva" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: La entrada contable para {2} sólo puede hacerse en la moneda: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: Centro de Costes es obligatorio para el artículo {2}" @@ -62055,23 +62099,23 @@ msgstr "{0}: {1} no existe" msgid "{0}: {1} is a group account." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} debe ser menor que {2}" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} está cancelado o cerrado." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" diff --git a/erpnext/locale/fa.po b/erpnext/locale/fa.po index 6ad85d9e1cc..4ce9b0462b6 100644 --- a/erpnext/locale/fa.po +++ b/erpnext/locale/fa.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-12 19:33\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:21\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr " زیر مونتاژ" msgid " Summary" msgstr " خلاصه" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"آیتم تامین شده توسط مشتری\" نمی‌تواند آیتم خرید هم باشد" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"آیتم تامین شده توسط مشتری\" نمی‌تواند دارای نرخ ارزش‌گذاری باشد" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "علامت \"دارایی ثابت است\" را نمی‌توان بردارید، زیرا رکورد دارایی در برابر آیتم وجود دارد" @@ -300,9 +300,9 @@ msgstr "«از تاریخ» مورد نیاز است" #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:18 msgid "'From Date' must be after 'To Date'" -msgstr "«از تاریخ» باید بعد از «تا امروز» باشد" +msgstr "«از تاریخ» باید پس از «تا امروز» باشد" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "دارای شماره سریال نمی‌تواند \"بله\" برای کالاهای غیر موجودی باشد" @@ -338,7 +338,7 @@ msgstr "«به‌روزرسانی موجودی» قابل بررسی نیست ز msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "به‌روزرسانی موجودی را نمی‌توان برای فروش دارایی ثابت علامت زد" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "حساب '{0}' قبلاً توسط {1} استفاده شده است. از حساب دیگری استفاده کنید." @@ -488,7 +488,7 @@ msgstr "1 ساعت" #: banking/src/components/features/ActionLog/ActionLog.tsx:280 msgid "1 invoice" -msgstr "" +msgstr "۱ فاکتور" #. Option for the 'No of Employees' (Select) field in DocType 'Lead' #. Option for the 'No of Employees' (Select) field in DocType 'Opportunity' @@ -762,7 +762,7 @@ msgstr "
Naming Series choose the 'Naming Series' option." msgstr "به‌طور پیش‌فرض، نام تامین‌کننده مطابق با نام تامین‌کننده وارد شده تنظیم می‌شود. اگر می‌خواهید تامین‌کنندگان با سری نام‌گذاری نام‌گذاری شوند. گزینه \"Naming Series\" را انتخاب کنید." @@ -9311,7 +9318,7 @@ msgstr "اگر بر اساس سند مالی گروه بندی شود، نمی msgid "Can only make payment against unbilled {0}" msgstr "فقط می‌توانید با {0} پرداخت نشده انجام دهید" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9367,9 +9374,9 @@ msgstr "" msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "نمی‌توان ادغام کرد" @@ -9397,7 +9404,7 @@ msgstr "نمی‌توان {0} {1} را اصلاح کرد، لطفاً در عو msgid "Cannot apply TDS against multiple parties in one entry" msgstr "نمی‌توان TDS را در یک ثبت در مقابل چندین طرف اعمال کرد" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "نمی‌تواند یک آیتم دارایی ثابت باشد زیرا دفتر موجودی ایجاد شده است." @@ -9433,7 +9440,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9441,7 +9448,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "نمی‌توان تراکنش را برای دستور کار تکمیل شده لغو کرد." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "پس از تراکنش موجودی نمی‌توان ویژگی‌ها را تغییر داد. یک آیتم جدید بسازید و موجودی را به آیتم جدید منتقل کنید" @@ -9453,7 +9460,7 @@ msgstr "نمی‌توان نوع سند مرجع را تغییر داد." msgid "Cannot change Service Stop Date for item in row {0}" msgstr "نمی‌توان تاریخ توقف سرویس را برای مورد در ردیف {0} تغییر داد" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "پس از تراکنش موجودی نمی‌توان ویژگی‌های گونه را تغییر داد. برای این کار باید یک آیتم جدید بسازید." @@ -9481,11 +9488,11 @@ msgstr "نمی‌توان به گروه تبدیل کرد زیرا نوع حسا msgid "Cannot covert to Group because Account Type is selected." msgstr "نمی‌توان در گروه پنهان کرد زیرا نوع حساب انتخاب شده است." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "نمی‌توان ورودی های رزرو موجودی را برای رسیدهای خرید با تاریخ آینده ایجاد کرد." -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "نمی‌توان لیست انتخاب برای سفارش فروش {0} ایجاد کرد زیرا موجودی رزرو کرده است. لطفاً برای ایجاد لیست انتخاب، موجودی را لغو رزرو کنید." @@ -9511,7 +9518,7 @@ msgstr "نمی‌توان به عنوان از دست رفته علام کرد، msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "وقتی دسته برای «ارزش‌گذاری» یا «ارزش‌گذاری و کل» است، نمی‌توان کسر کرد" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -9548,7 +9555,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "نمی‌توان بیش از مقدار تولید شده دمونتاژ کرد." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9556,8 +9563,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "نمی‌توان از تحویل با شماره سریال اطمینان حاصل کرد زیرا آیتم {0} با و بدون اطمینان از تحویل با شماره سریال اضافه شده است." @@ -9601,7 +9608,7 @@ msgstr "نمی‌توان از مشتری در برابر معوقات منفی msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9619,8 +9626,8 @@ msgstr "توکن پیوند بازیابی نمی‌شود. برای اطلاع msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9636,7 +9643,7 @@ msgstr "نمی‌توان آن را به عنوان گمشده تنظیم کرد msgid "Cannot set authorization on basis of Discount for {0}" msgstr "نمی‌توان مجوز را بر اساس تخفیف برای {0} تنظیم کرد" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "نمی‌توان چندین مورد پیش‌فرض را برای یک شرکت تنظیم کرد." @@ -10547,7 +10554,7 @@ msgstr "اختتامیه (بس)" msgid "Closing (Dr)" msgstr "اختتامیه (بدهی)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "اختتامیه (افتتاحیه + کل)" @@ -11008,7 +11015,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11290,7 +11297,7 @@ msgstr "شرکت" msgid "Company Abbreviation" msgstr "مخفف شرکت" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11303,7 +11310,7 @@ msgstr "مخفف شرکت نمی‌تواند بیش از 5 کاراکتر دا msgid "Company Account" msgstr "حساب شرکت" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "حساب شرکت الزامی است" @@ -11479,7 +11486,7 @@ msgstr "فیلتر شرکت تنظیم نشده است!" msgid "Company is mandatory" msgstr "شرکت الزامی است" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "" @@ -11750,7 +11757,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11763,7 +11770,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "پیکربندی اسمبلی محصول" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "پیکربندی سری" @@ -11781,13 +11790,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "تنظیم کنید که در صورت عدم حفظ همان نرخ، تراکنش متوقف شود یا فقط هشدار داده شود." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "هنگام ایجاد تراکنش خرید جدید، لیست قیمت پیش‌فرض را پیکربندی کنید. قیمت آیتم از این لیست قیمت دریافت می‌شود." @@ -11965,7 +11974,7 @@ msgstr "" msgid "Consumed" msgstr "مصرف شده" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "مبلغ مصرف شده" @@ -12009,7 +12018,7 @@ msgstr "هزینه آیتم‌های مصرفی" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12182,10 +12191,6 @@ msgstr "شخص مخاطب به {0} تعلق ندارد" msgid "Contact:" msgstr "مخاطب:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "مخاطب: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12363,7 +12368,7 @@ msgstr "ضریب تبدیل" msgid "Conversion Rate" msgstr "نرخ تبدیل" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "ضریب تبدیل برای واحد اندازه‌گیری پیش‌فرض باید 1 در ردیف {0} باشد" @@ -12635,7 +12640,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12730,7 +12735,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "مرکز هزینه در ردیف {0} جدول مالیات برای نوع {1} لازم است" @@ -13056,7 +13061,7 @@ msgstr "ایجاد دارایی موجود" #. Label of an action in the Onboarding Step 'Create Finished Goods' #: erpnext/manufacturing/onboarding_step/create_finished_goods/create_finished_goods.json msgid "Create Finished Good" -msgstr "" +msgstr "ایجاد کالای تمام شده" #. Title of an Onboarding Step #: erpnext/manufacturing/onboarding_step/create_finished_goods/create_finished_goods.json @@ -13068,7 +13073,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "ایجاد دارایی گروهی" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "ثبت دفتر روزنامه Inter Company را ایجاد کنید" @@ -13441,7 +13446,7 @@ msgstr "{0} {1} ایجاد شود؟" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "ایجاد {0} کارت امتیازی برای {1} بین:" @@ -13584,15 +13589,15 @@ msgstr "ایجاد {0} تا حدودی موفقیت‌آمیز بود.\n" msgid "Credit" msgstr "بستانکار" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "بستانکار (تراکنش)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "بستانکار ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "حساب بستانکار" @@ -13787,7 +13792,7 @@ msgstr "" msgid "Creditors" msgstr "بستانکاران" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14085,7 +14090,7 @@ msgstr "باندل سریال / دسته فعلی" msgid "Current Serial No" msgstr "شماره سریال فعلی" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "سری فعلی" @@ -14286,7 +14291,7 @@ msgstr "جداکننده‌های سفارشی" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15059,7 +15064,7 @@ msgstr "" msgid "Day Of Week" msgstr "روز هفته" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "روز ماه" @@ -15175,11 +15180,11 @@ msgstr "فروشنده" msgid "Debit" msgstr "بدهکار" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "بدهکار (تراکنش)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "بدهکار ({0})" @@ -15189,7 +15194,7 @@ msgstr "بدهکار ({0})" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "حساب بدهکار" @@ -15300,7 +15305,7 @@ msgstr "عدم تطابق بدهکار و بستانکار" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15442,7 +15447,7 @@ msgstr "" msgid "Default BOM" msgstr "BOM پیش‌فرض" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "BOM پیش‌فرض ({0}) باید برای این مورد یا الگوی آن فعال باشد" @@ -15799,15 +15804,15 @@ msgstr "منطقه پیش‌فرض" msgid "Default Unit of Measure" msgstr "واحد اندازه‌گیری پیش‌فرض" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "واحد اندازه‌گیری پیش‌فرض برای مورد {0} را نمی‌توان مستقیماً تغییر داد زیرا قبلاً تراکنش(هایی) را با UOM دیگری انجام داده اید. شما باید اسناد پیوند داده شده را لغو کنید یا یک مورد جدید ایجاد کنید." -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "واحد اندازه‌گیری پیش‌فرض برای مورد {0} را نمی‌توان مستقیماً تغییر داد زیرا قبلاً تراکنش(هایی) را با UOM دیگری انجام داده اید. برای استفاده از یک UOM پیش‌فرض متفاوت، باید یک آیتم جدید ایجاد کنید." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "واحد اندازه‌گیری پیش‌فرض برای گونه «{0}» باید مانند الگوی «{1}» باشد" @@ -16108,7 +16113,7 @@ msgstr "" msgid "Delivered" msgstr "تحویل داده شده" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "مبلغ تحویل شده" @@ -16158,8 +16163,8 @@ msgstr "آیتم‌های تحویل شده برای صدور صورتحساب" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16170,11 +16175,11 @@ msgstr "مقدار تحویل داده شده" msgid "Delivered Qty (in Stock UOM)" msgstr "مقدار تحویل داده شده (بر حسب واحد اندازه‌گیری موجودی)" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16263,7 +16268,7 @@ msgstr "مدیر تحویل" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16788,7 +16793,7 @@ msgstr "" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "حساب تفاوت باید یک حساب از نوع دارایی/بدهی باشد، زیرا این تطبیق موجودی یک ثبت افتتاحیه است" @@ -16952,11 +16957,9 @@ msgstr "غیرفعال کردن آستانه تجمعی" msgid "Disable In Words" msgstr "غیر فعال کردن به حروف" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "غیرفعال کردن نرخ آخرین خرید" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -16997,6 +17000,12 @@ msgstr "غیرفعال کردن انتخاب‌گر شماره سریال و د msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17053,7 +17062,7 @@ msgstr "دمونتاژ (Disassemble)" msgid "Disassemble Order" msgstr "دستور دمونتاژ" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17578,6 +17587,12 @@ msgstr "عدم استفاده از ارزیابی دسته‌ای" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17668,9 +17683,12 @@ msgstr "جستجوی اسناد" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "نامگذاری سند" @@ -17688,6 +17706,10 @@ msgstr "نوع سند " msgid "Document Type already used as a dimension" msgstr "نوع سند قبلاً به عنوان بعد استفاده شده است" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "مستندات" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -17881,7 +17903,7 @@ msgstr "" #: erpnext/accounts/party.py:700 msgid "Due Date cannot be after {0}" -msgstr "تاریخ سررسید نمی‌تواند بعد از {0} باشد" +msgstr "تاریخ سررسید نمی‌تواند پس از {0} باشد" #: erpnext/accounts/party.py:676 msgid "Due Date cannot be before {0}" @@ -17992,7 +18014,7 @@ msgstr "تکرار پروژه با تسک‌ها" msgid "Duplicate Sales Invoices found" msgstr "فاکتورهای فروش تکراری پیدا شد" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18112,8 +18134,8 @@ msgstr "شناسه کاربری ERPNext" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18336,7 +18358,7 @@ msgstr "رسید ایمیل" msgid "Email Sent to Supplier {0}" msgstr "ایمیل به تامین کننده ارسال شد {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "برای ایجاد کاربر، ایمیل الزامی است" @@ -18526,7 +18548,7 @@ msgstr "شناسه کاربر کارمند" msgid "Employee cannot report to himself." msgstr "کارمند نمی‌تواند به خودش گزارش دهد." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "کارمند الزامی است" @@ -18534,7 +18556,7 @@ msgstr "کارمند الزامی است" msgid "Employee is required while issuing Asset {0}" msgstr "هنگام صدور دارایی {0} به کارمند نیاز است" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "کارمند {0} از قبل یک کاربر لینک شده دارد" @@ -18547,7 +18569,7 @@ msgstr "کارمند {0} متعلق به شرکت {1} نیست" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "کارمند {0} در حال حاضر روی ایستگاه کاری دیگری کار می‌کند. لطفا کارمند دیگری را تعیین کنید." -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "کارمند {0} یافت نشد" @@ -18590,7 +18612,7 @@ msgstr "زمان‌بندی قرار را فعال کنید" msgid "Enable Auto Email" msgstr "ایمیل خودکار را فعال کنید" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "سفارش مجدد خودکار را فعال کنید" @@ -19188,7 +19210,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "خطا: {0} فیلد اجباری است" @@ -19234,7 +19256,7 @@ msgstr "از محل کارخانه" msgid "Example URL" msgstr "URL مثال" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "نمونه ای از یک سند پیوندی: {0}" @@ -19263,7 +19285,7 @@ msgstr "مثال: شماره سریال {0} در {1} رزرو شده است." msgid "Exception Budget Approver Role" msgstr "نقش تصویب کننده بودجه استثنایی" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19622,7 +19644,7 @@ msgstr "ارزش مورد انتظار پس از عمر مفید" msgid "Expense" msgstr "هزینه" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "حساب هزینه / تفاوت ({0}) باید یک حساب \"سود یا زیان\" باشد" @@ -19670,7 +19692,7 @@ msgstr "حساب هزینه / تفاوت ({0}) باید یک حساب \"سود msgid "Expense Account" msgstr "حساب هزینه" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "حساب هزینه جا افتاده است" @@ -20133,7 +20155,7 @@ msgstr "فیلتر مجموع صفر تعداد" msgid "Filter by Reference Date" msgstr "فیلتر بر اساس تاریخ مرجع" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20174,7 +20196,7 @@ msgstr "BOM نهایی" #: erpnext/manufacturing/doctype/bom_creator/bom_creator.json #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "Final Product" -msgstr "محصول نهایی" +msgstr "کالای تمام شده" #. Label of the finance_book (Link) field in DocType 'Account Closing Balance' #. Name of a DocType @@ -20398,7 +20420,7 @@ msgstr "مقدار کالای تمام شده " #. field in DocType 'Work Order' #: erpnext/manufacturing/doctype/work_order/work_order.json msgid "Finished Good Serial / Batch" -msgstr "" +msgstr "سریال / دسته کالای تمام شده" #. Label of the finished_good_uom (Link) field in DocType 'Subcontracting BOM' #: erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.json @@ -20463,7 +20485,7 @@ msgstr "انبار کالاهای تمام شده" msgid "Finished Goods based Operating Cost" msgstr "هزینه عملیاتی بر اساس کالاهای تمام شده" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "آیتم تمام شده {0} با دستور کار {1} مطابقت ندارد" @@ -20558,7 +20580,7 @@ msgstr "رژیم مالی اجباری است، لطفاً رژیم مالی ر msgid "Fiscal Year" msgstr "سال مالی" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "سال مالی (نیازمند نصب ERPNext است)" @@ -20622,7 +20644,7 @@ msgstr "حساب دارایی ثابت" msgid "Fixed Asset Defaults" msgstr "پیش‌فرض دارایی‌های ثابت" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "آیتم دارایی ثابت باید یک آیتم غیر موجودی باشد." @@ -20772,7 +20794,7 @@ msgstr "برای شرکت" msgid "For Item" msgstr "برای آیتم" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20803,7 +20825,7 @@ msgstr "برای لیست قیمت" msgid "For Production" msgstr "برای تولید" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "برای مقدار (تعداد تولید شده) اجباری است" @@ -20887,6 +20909,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "برای مورد {0}، نرخ باید یک عدد مثبت باشد. برای مجاز کردن نرخ‌های منفی، {1} را در {2} فعال کنید" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20908,7 +20936,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "برای مقدار {0} نباید بیشتر از مقدار مجاز {1} باشد" @@ -20917,7 +20945,7 @@ msgstr "برای مقدار {0} نباید بیشتر از مقدار مجاز { msgid "For reference" msgstr "برای مرجع" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "برای ردیف {0} در {1}. برای گنجاندن {2} در نرخ آیتم، ردیف‌های {3} نیز باید گنجانده شوند" @@ -20941,7 +20969,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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -20950,7 +20978,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -21563,7 +21591,7 @@ msgstr "G - D" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21575,7 +21603,7 @@ msgstr "تراز دفتر کل" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "ثبت در دفتر کل" @@ -22090,7 +22118,7 @@ msgstr "کالاهای در حال حمل و نقل" msgid "Goods Transferred" msgstr "کالاهای منتقل شده" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "کالاها قبلاً در مقابل ثبت خروجی {0} دریافت شده اند" @@ -22273,7 +22301,7 @@ msgstr "" msgid "Grant Commission" msgstr "اعطاء کمیسیون" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "بیشتر از مبلغ" @@ -22914,11 +22942,11 @@ msgstr "چند بار؟" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" -msgstr "هر چند وقت یکبار پروژه باید از هزینه کل خرید به روز شود؟" +msgid "How often should project be updated of Total Purchase Cost ?" +msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling #. Settings' @@ -23072,7 +23100,7 @@ msgstr "اگر یک عملیات به عملیات فرعی تقسیم شود، msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "اگر خالی باشد، حساب انبار والد یا پیش‌فرض شرکت در تراکنش‌ها در نظر گرفته می‌شود" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23255,7 +23283,7 @@ msgstr "در صورت فعال بودن، سیستم تنها در صورتی ا msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "اگر فعال شود، سیستم به کاربران اجازه می‌دهد مواد اولیه و مقادیر آن‌ها را در دستور کار ویرایش کنند. در صورتی که کاربر مقادیر را تغییر دهد، سیستم مقادیر را مطابق با BOM مجدداً تنظیم نخواهد کرد." -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23427,11 +23455,11 @@ msgstr "اگر این امر نامطلوب است، لطفاً ثبت پردا msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "اگر این آیتم دارای گونه باشد، نمی‌توان آن را در سفارش‌های فروش و غیره انتخاب کرد." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "اگر این گزینه 'بله' پیکربندی شده باشد، ERPNext شما را از ایجاد فاکتور خرید یا رسید بدون ایجاد یک سفارش خرید جلوگیری می‌کند. این پیکربندی را می‌توان با فعال کردن کادر انتخاب «اجازه ایجاد فاکتور خرید بدون سفارش خرید» در بخش اصلی تامین‌کننده، برای یک تامین‌کننده خاص لغو کرد." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "اگر این گزینه 'بله' پیکربندی شده باشد، ERPNext از ایجاد فاکتور خرید بدون ایجاد یک رسید خرید جلوگیری می‌کند. این پیکربندی را می‌توان برای یک تامین‌کننده خاص با فعال کردن کادر انتخاب «اجازه ایجاد فاکتور خرید بدون رسید خرید» در قسمت اصلی تامین‌کننده لغو کرد." @@ -23547,7 +23575,7 @@ msgstr "نادیده گرفتن موجودی خالی" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23599,7 +23627,7 @@ msgstr "نادیده گرفتن قانون قیمت گذاری فعال است. #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "نادیده گرفتن یادداشت های بستانکاری / بدهکاری ایجاد شده توسط سیستم" @@ -23642,7 +23670,7 @@ msgstr "نادیده گرفتن همپوشانی زمان ایستگاه کار msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23656,6 +23684,7 @@ msgid "Implementation Partner" msgstr "شریک اجرایی" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24009,7 +24038,7 @@ msgstr "دارایی‌های پیش‌فرض FB را شامل شود" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24263,7 +24292,7 @@ msgstr "تعداد موجودی نادرست پس از تراکنش" msgid "Incorrect Batch Consumed" msgstr "دسته نادرست مصرف شده است" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" @@ -24271,7 +24300,7 @@ msgstr "" msgid "Incorrect Company" msgstr "شرکت نادرست" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "" @@ -24481,14 +24510,14 @@ msgstr "آغاز شده" msgid "Inspected By" msgstr "بازرسی توسط" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "بازرسی رد شد" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "بازرسی مورد نیاز است" @@ -24505,7 +24534,7 @@ msgstr "بازرسی قبل از تحویل لازم است" msgid "Inspection Required before Purchase" msgstr "بازرسی قبل از خرید الزامی است" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "ارسال بازرسی" @@ -24587,8 +24616,8 @@ msgstr "مجوزهای ناکافی" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "موجودی ناکافی" @@ -24808,7 +24837,7 @@ msgstr "نقل و انتقالات داخلی" msgid "Internal Work History" msgstr "سابقه کار داخلی" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "نقل و انتقالات داخلی فقط با ارز پیش‌فرض شرکت قابل انجام است" @@ -24901,7 +24930,7 @@ msgstr "تاریخ تحویل نامعتبر است" msgid "Invalid Discount" msgstr "تخفیف نامعتبر" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "مبلغ تخفیف نامعتبر است" @@ -24931,7 +24960,7 @@ msgstr "گروه نامعتبر توسط" msgid "Invalid Item" msgstr "آیتم نامعتبر" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "پیش‌فرض‌های آیتم نامعتبر" @@ -25017,12 +25046,12 @@ msgstr "زمان‌بندی نامعتبر است" msgid "Invalid Selling Price" msgstr "قیمت فروش نامعتبر" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "باندل سریال و دسته نامعتبر" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "انبار منبع و هدف نامعتبر" @@ -25059,7 +25088,7 @@ msgstr "فرمول فیلتر نامعتبر است. لطفاً syntax را بر msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "دلیل از دست رفتن نامعتبر {0}، لطفاً یک دلیل از دست رفتن جدید ایجاد کنید" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "سری نام‌گذاری نامعتبر (. از دست رفته) برای {0}" @@ -25188,7 +25217,6 @@ msgstr "لغو فاکتور" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "تاریخ فاکتور" @@ -25209,10 +25237,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "جمع کل فاکتور" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "شناسه فاکتور" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25734,13 +25758,13 @@ msgstr "آیتم فانتوم است" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "آیا سفارش خرید برای ایجاد فاکتور خرید و ایجاد رسید لازم است؟" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "آیا برای ایجاد فاکتور خرید رسید خرید لازم است؟" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -26012,7 +26036,7 @@ msgstr "مشکلات" msgid "Issuing Date" msgstr "تاریخ صادر شدن" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "ممکن است چند ساعت طول بکشد تا ارزش موجودی دقیق پس از ادغام اقلام قابل مشاهده باشد." @@ -26082,7 +26106,7 @@ msgstr "متن ایتالیک برای جمع‌های جزئی یا یاددا #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26129,6 +26153,7 @@ msgstr "متن ایتالیک برای جمع‌های جزئی یا یاددا #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26144,7 +26169,6 @@ msgstr "متن ایتالیک برای جمع‌های جزئی یا یاددا #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26473,7 +26497,7 @@ msgstr "کد آیتم" #: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:61 msgid "Item Code (Final Product)" -msgstr "کد آیتم (محصول نهایی)" +msgstr "کد آیتم (کالای تمام شده)" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.js:92 msgid "Item Code > Item Group > Brand" @@ -26908,6 +26932,7 @@ msgstr "تولید کننده آیتم" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26918,7 +26943,6 @@ msgstr "تولید کننده آیتم" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27178,11 +27202,11 @@ msgstr "تنظیمات گونه آیتم" msgid "Item Variant {0} already exists with same attributes" msgstr "گونه آیتم {0} در حال حاضر با همان ویژگی‌ها وجود دارد" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "گونه‌های آیتم به روز شد" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "ارسال مجدد بر اساس انبار مورد فعال شده است." @@ -27221,6 +27245,15 @@ msgstr "مشخصات وب سایت مورد" msgid "Item Weight Details" msgstr "جزئیات وزن آیتم" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "مصرف بر حسب آیتم" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27250,7 +27283,7 @@ msgstr "جزئیات مالیاتی مبتنی بر آیتم" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27270,11 +27303,11 @@ msgstr "آیتم و انبار" msgid "Item and Warranty Details" msgstr "جزئیات مورد و گارانتی" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "مورد ردیف {0} با درخواست مواد مطابقت ندارد" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "آیتم دارای گونه است." @@ -27304,7 +27337,7 @@ msgstr "عملیات آیتم" msgid "Item qty can not be updated as raw materials are already processed." msgstr "تعداد مورد را نمی‌توان به روز کرد زیرا مواد اولیه قبلاً پردازش شده است." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "نرخ آیتم به صفر به‌روزرسانی شده است زیرا نرخ ارزش‌گذاری مجاز صفر برای آیتم صفر {0} بررسی می‌شود" @@ -27323,10 +27356,14 @@ msgstr "" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "ارسال مجدد ارزیابی آیتم در حال انجام است. گزارش ممکن است ارزش گذاری اقلام نادرست را نشان دهد." -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "گونه آیتم {0} با همان ویژگی‌ها وجود دارد" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27340,7 +27377,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "آیتم {0} را نمی‌توان بیش از {1} در مقابل سفارش کلی {2} سفارش داد." #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "آیتم {0} وجود ندارد" @@ -27348,7 +27385,7 @@ msgstr "آیتم {0} وجود ندارد" msgid "Item {0} does not exist in the system or has expired" msgstr "مورد {0} در سیستم وجود ندارد یا منقضی شده است" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "آیتم {0} وجود ندارد." @@ -27364,15 +27401,15 @@ msgstr "مورد {0} قبلاً برگردانده شده است" msgid "Item {0} has been disabled" msgstr "مورد {0} غیرفعال شده است" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "مورد {0} در تاریخ {1} به پایان عمر خود رسیده است" @@ -27384,19 +27421,23 @@ msgstr "مورد {0} نادیده گرفته شد زیرا کالای موجود msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "مورد {0} قبلاً در برابر سفارش فروش {1} رزرو شده/تحویل شده است." -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "آیتم {0} لغو شده است" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "آیتم {0} غیرفعال است" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "آیتم {0} یک آیتم سریالی نیست" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "آیتم {0} یک آیتم موجودی نیست" @@ -27404,7 +27445,11 @@ msgstr "آیتم {0} یک آیتم موجودی نیست" msgid "Item {0} is not a subcontracted item" msgstr "آیتم {0} یک آیتم قرارداد فرعی شده نیست" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "آیتم {0} یک آیتم الگو نیست." + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "آیتم {0} فعال نیست یا به پایان عمر رسیده است" @@ -27420,7 +27465,7 @@ msgstr "مورد {0} باید یک کالای غیر موجودی باشد" msgid "Item {0} must be a non-stock item" msgstr "مورد {0} باید یک کالای غیر موجودی باشد" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "مورد {0} در جدول \"مواد اولیه تامین شده\" در {1} {2} یافت نشد" @@ -27436,7 +27481,7 @@ msgstr "مورد {0}: تعداد سفارش‌شده {1} نمی‌تواند ک msgid "Item {0}: {1} qty produced. " msgstr "آیتم {0}: مقدار {1} تولید شده است. " -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "آیتم {} وجود ندارد." @@ -27546,7 +27591,7 @@ msgstr "آیتم‌ها برای درخواست مواد اولیه" msgid "Items not found." msgstr "آیتم‌ها یافت نشدند." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "نرخ آیتم‌ها به صفر به‌روزرسانی شده است زیرا نرخ ارزش‌گذاری مجاز صفر برای آیتم‌های زیر بررسی می‌شود: {0}" @@ -28179,7 +28224,7 @@ msgstr "آخرین انبار اسکن شده" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "آخرین تراکنش موجودی کالای {0} در انبار {1} در تاریخ {2} انجام شد." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28457,7 +28502,7 @@ msgstr "افسانه" msgid "Length (cm)" msgstr "طول (سانتی متر)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "کمتر از مبلغ" @@ -28598,7 +28643,7 @@ msgstr "فاکتورهای مرتبط" msgid "Linked Location" msgstr "مکان پیوند داده شده" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "مرتبط با اسناد ارسالی" @@ -28993,11 +29038,6 @@ msgstr "حفظ دارایی" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "حفظ همان نرخ در طول چرخه خرید" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29009,6 +29049,11 @@ msgstr "نگهداری موجودی" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29205,7 +29250,7 @@ msgid "Major/Optional Subjects" msgstr "موضوعات اصلی/اختیاری" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29374,8 +29419,8 @@ msgstr "بخش اجباری" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29434,8 +29479,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29584,7 +29629,7 @@ msgstr "تاریخ تولید" msgid "Manufacturing Manager" msgstr "مدیر تولید" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "مقدار تولید الزامی است" @@ -29860,7 +29905,7 @@ msgstr "مصرف مواد" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "مصرف مواد برای تولید" @@ -29931,6 +29976,7 @@ msgstr "رسید مواد" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30037,11 +30083,11 @@ msgstr "آیتم طرح درخواست مواد" msgid "Material Request Type" msgstr "نوع درخواست مواد" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "درخواست مواد از قبل برای مقدار سفارش داده شده ایجاد شده است" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "درخواست مواد ایجاد نشد، زیرا مقدار مواد اولیه از قبل موجود است." @@ -30156,7 +30202,7 @@ msgstr "مواد منتقل شده برای تولید" msgid "Material Transferred for Manufacturing" msgstr "مواد برای تولید منتقل شده است" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30285,11 +30331,11 @@ msgstr "حداکثر مبلغ پرداختی" msgid "Maximum Producible Items" msgstr "حداکثر آیتم‌های قابل تولید" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "حداکثر نمونه - {0} را می‌توان برای دسته {1} و مورد {2} حفظ کرد." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "حداکثر نمونه - {0} قبلاً برای دسته {1} و مورد {2} در دسته {3} حفظ شده است." @@ -30733,11 +30779,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "هزینه های متفرقه" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "عدم تطابق" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "جا افتاده" @@ -30775,7 +30821,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "دفتر مالی جا افتاده" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "از دست رفته به پایان رسید" @@ -30783,11 +30829,11 @@ msgstr "از دست رفته به پایان رسید" msgid "Missing Formula" msgstr "فرمول جا افتاده" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "آیتم جا افتاده" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30831,10 +30877,6 @@ msgstr "مقدار از دست رفته" msgid "Mixed Conditions" msgstr "شرایط مختلط" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "تلفن همراه: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31103,7 +31145,7 @@ msgstr "" msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "چندین سال مالی برای تاریخ {0} وجود دارد. لطفا شرکت را در سال مالی تعیین کنید" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "چند مورد را نمی‌توان به عنوان مورد تمام شده علامت گذاری کرد" @@ -31182,27 +31224,20 @@ msgstr "مکان نام‌گذاری شده" msgid "Naming Series Prefix" msgstr "پیشوند سری نام‌گذاری" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "نام‌گذاری سری ها و پیش‌فرض‌های قیمت" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "نام‌گذاری سری برای {0}" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "سری نام‌گذاری اجباری است" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "گزینه‌های سری نامگذاری" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "سری نام‌گذاری به‌روزرسانی شد" @@ -31250,16 +31285,16 @@ msgstr "نیاز به تحلیل دارد" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "مقدار منفی مجاز نیست" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "خطای موجودی منفی" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "نرخ ارزش‌گذاری منفی مجاز نیست" @@ -31873,7 +31908,7 @@ msgstr "هیچ نمایه POS یافت نشد. لطفا ابتدا یک نمای #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "بدون مجوز و اجازه" @@ -31886,7 +31921,7 @@ msgstr "هیچ سفارش خریدی ایجاد نشد" msgid "No Records for these settings." msgstr "هیچ رکوردی برای این تنظیمات وجود ندارد." -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "بدون انتخاب" @@ -31931,7 +31966,7 @@ msgstr "هیچ پرداخت ناسازگاری برای این طرف یافت msgid "No Work Orders were created" msgstr "هیچ دستور کار ایجاد نشد" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "ثبت حسابداری برای انبارهای زیر وجود ندارد" @@ -31944,7 +31979,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "هیچ BOM فعالی برای آیتم {0} یافت نشد. تحویل با شماره سریال نمی‌تواند تضمین شود" @@ -31956,7 +31991,7 @@ msgstr "هیچ فیلد اضافی در دسترس نیست" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -31964,7 +31999,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32058,7 +32093,7 @@ msgstr "دیگر هیچ فرزندی در سمت چپ وجود ندارد" msgid "No more children on Right" msgstr "دیگر هیچ فرزندی در سمت راست وجود ندارد" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "هیچ سری نام‌گذاری تعریف نشده است" @@ -32233,7 +32268,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "هیچ ثبت در دفتر موجودی ایجاد نشد. لطفاً مقدار یا نرخ ارزش‌گذاری آیتم‌ها را به درستی تنظیم کرده و دوباره امتحان کنید." @@ -32325,7 +32360,7 @@ msgstr "غیر صفرها" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "هیچ یک از آیتم‌ها هیچ تغییری در مقدار یا ارزش ندارند." @@ -32429,7 +32464,7 @@ msgstr "مجاز نیست زیرا {0} بیش از حد مجاز است" msgid "Not authorized to edit frozen Account {0}" msgstr "مجاز به ویرایش حساب ثابت {0} نیست" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "پیکربندی نشده" @@ -32475,7 +32510,7 @@ msgstr "توجه: ثبت پرداخت ایجاد نخواهد شد زیرا «ح msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "توجه: این مرکز هزینه یک گروه است. نمی‌توان در مقابل گروه‌ها ثبت حسابداری انجام داد." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "توجه: برای ادغام آیتم‌ها، یک تطبیق موجودی جداگانه برای آیتم قدیمی {0} ایجاد کنید" @@ -32620,7 +32655,7 @@ msgstr "تعداد هفته‌ها/ماه‌ها" #. Settings' #: erpnext/accounts/doctype/subscription_settings/subscription_settings.json msgid "Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid" -msgstr "تعداد روزهای بعد از تاریخ فاکتور قبل از لغو اشتراک یا علامت گذاری اشتراک به عنوان بدون پرداخت گذشته است" +msgstr "تعداد روزهای پس از تاریخ فاکتور قبل از لغو اشتراک یا علامت گذاری اشتراک به عنوان بدون پرداخت گذشته است" #. Label of the advance_booking_days (Int) field in DocType 'Appointment #. Booking Settings' @@ -32952,7 +32987,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "فقط یک ثبت {0} می‌تواند در برابر دستور کار {1} ایجاد شود" @@ -33104,7 +33139,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "افتتاح" @@ -33263,16 +33298,16 @@ msgstr "فاکتورهای فروش افتتاحیه ایجاد شده است." #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "موجودی اولیه" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33629,7 +33664,7 @@ msgstr "اختیاری. این تنظیم برای فیلتر کردن در تر msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33763,7 +33798,7 @@ msgstr "مقدار سفارش داده شده" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "سفارش‌ها" @@ -33971,7 +34006,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34029,7 +34064,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "اضافه صورتحساب مجاز (%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34047,7 +34082,7 @@ msgstr "اضافه تحویل/دریافت مجاز (%)" msgid "Over Picking Allowance" msgstr "اجازه برداشت بیش از حد" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "بیش از رسید" @@ -34290,7 +34325,6 @@ msgstr "فیلد POS" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "فاکتور POS" @@ -34561,7 +34595,7 @@ msgstr "آیتم بسته بندی شده" msgid "Packed Items" msgstr "آیتم‌های بسته بندی شده" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "آیتم‌های بسته بندی شده را نمی‌توان به صورت داخلی منتقل کرد" @@ -35009,7 +35043,7 @@ msgstr "تا حدی دریافت شد" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35145,7 +35179,7 @@ msgstr "قطعات در میلیون" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35271,7 +35305,7 @@ msgstr "عدم تطابق طرف" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35357,7 +35391,7 @@ msgstr "آیتم خاص طرف" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35660,7 +35694,6 @@ msgstr "ثبت‌های پرداخت {0} لغو پیوند هستند" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35918,7 +35951,7 @@ msgstr "مراجع پرداخت" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -35997,10 +36030,6 @@ msgstr "" msgid "Payment Schedules" msgstr "زمان‌بندی‌های پرداخت" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "وضعیت پرداخت" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37020,7 +37049,7 @@ msgstr "لطفا اولویت را تعیین کنید" msgid "Please Set Supplier Group in Buying Settings." msgstr "لطفاً گروه تامین کننده را در تنظیمات خرید تنظیم کنید." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "لطفا حساب را مشخص کنید" @@ -37052,11 +37081,11 @@ msgstr "لطفاً یک حساب افتتاحیه موقت در نمودار ح msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "لطفا حداقل یک سری نامگذاری اضافه کنید." -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "لطفاً حداقل یک شماره سریال / شماره دسته اضافه کنید" @@ -37076,7 +37105,7 @@ msgstr "لطفاً حساب را به شرکت سطح ریشه اضافه کنی msgid "Please add {1} role to user {0}." msgstr "لطفاً نقش {1} را به کاربر {0} اضافه کنید." -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "لطفاً تعداد را تنظیم کنید یا برای ادامه {0} را ویرایش کنید." @@ -37183,7 +37212,7 @@ msgstr "لطفا خرید را از فروش داخلی یا سند تحویل msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "لطفاً رسید خرید یا فاکتور خرید برای آیتم {0} ایجاد کنید" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "لطفاً قبل از ادغام {1} در {2}، باندل محصول {0} را حذف کنید" @@ -37252,11 +37281,11 @@ msgstr "لطفاً حساب را برای تغییر مبلغ وارد کنید" msgid "Please enter Approving Role or Approving User" msgstr "لطفاً نقش تأیید یا کاربر تأیید را وارد کنید" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "لطفا شماره دسته را وارد کنید" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "لطفا مرکز هزینه را وارد کنید" @@ -37268,7 +37297,7 @@ msgstr "لطفا تاریخ تحویل را وارد کنید" msgid "Please enter Employee Id of this sales person" msgstr "لطفا شناسه کارمند این فروشنده را وارد کنید" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "لطفا حساب هزینه را وارد کنید" @@ -37313,7 +37342,7 @@ msgstr "لطفا تاریخ مرجع را وارد کنید" msgid "Please enter Root Type for account- {0}" msgstr "لطفاً نوع ریشه را برای حساب وارد کنید- {0}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "لطفا شماره سریال را وارد کنید" @@ -37390,7 +37419,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "لطفا ابتدا شماره تلفن را وارد کنید" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "لطفاً {schedule_date} را وارد کنید." @@ -37504,12 +37533,12 @@ msgstr "لطفا قبل از اضافه کردن زمان‌بندی تحویل msgid "Please select Template Type to download template" msgstr "لطفاً نوع الگو را برای دانلود الگو انتخاب کنید" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "لطفاً Apply Discount On را انتخاب کنید" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "لطفاً BOM را در مقابل مورد {0} انتخاب کنید" @@ -37525,13 +37554,13 @@ msgstr "لطفا حساب بانکی را انتخاب کنید" msgid "Please select Category first" msgstr "لطفاً ابتدا دسته را انتخاب کنید" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "لطفاً ابتدا نوع شارژ را انتخاب کنید" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "لطفا شرکت را انتخاب کنید" @@ -37540,7 +37569,7 @@ msgstr "لطفا شرکت را انتخاب کنید" msgid "Please select Company and Posting Date to getting entries" msgstr "لطفاً شرکت و تاریخ ارسال را برای دریافت ورودی انتخاب کنید" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "لطفا ابتدا شرکت را انتخاب کنید" @@ -37589,7 +37618,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "لطفاً قبل از انتخاب طرف، تاریخ ارسال را انتخاب کنید" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "لطفا ابتدا تاریخ ارسال را انتخاب کنید" @@ -37597,11 +37626,11 @@ msgstr "لطفا ابتدا تاریخ ارسال را انتخاب کنید" msgid "Please select Price List" msgstr "لطفا لیست قیمت را انتخاب کنید" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "لطفاً تعداد را در برابر مورد {0} انتخاب کنید" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "لطفاً ابتدا انبار نگهداری نمونه را در تنظیمات انبار انتخاب کنید" @@ -37654,7 +37683,7 @@ msgstr "لطفاً سفارش خرید پیمانکاری فرعی را انتخ msgid "Please select a Supplier" msgstr "لطفا یک تامین کننده انتخاب کنید" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "لطفاً یک انبار انتخاب کنید" @@ -37715,7 +37744,7 @@ msgstr "لطفاً یک ردیف برای ایجاد یک ورودی ارسال msgid "Please select a supplier for fetching payments." msgstr "لطفاً یک تامین کننده برای واکشی پرداخت‌ها انتخاب کنید." -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "لطفا یک تراکنش را انتخاب کنید." @@ -37735,7 +37764,7 @@ msgstr "لطفاً قبل از تنظیم انبار یک کد آیتم را ا msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37842,7 +37871,7 @@ msgstr "لطفا نوع سند معتبر را انتخاب کنید." msgid "Please select weekly off day" msgstr "لطفاً روز تعطیل هفتگی را انتخاب کنید" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "لطفاً ابتدا {0} را انتخاب کنید" @@ -37982,7 +38011,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "لطفاً یک آدرس در شرکت \"%s\" تنظیم کنید" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "لطفاً یک حساب هزینه در جدول آیتم‌ها تنظیم کنید" @@ -38026,7 +38055,7 @@ msgstr "لطفاً حساب هزینه پیش‌فرض را در شرکت {0} ت msgid "Please set default UOM in Stock Settings" msgstr "لطفاً UOM پیش‌فرض را در تنظیمات موجودی تنظیم کنید" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "لطفاً حساب پیش‌فرض بهای تمام‌شده کالای فروش رفته را در شرکت {0} برای ثبت گرد کردن سود و زیان در طول انتقال موجودی، تنظیم کنید" @@ -38145,7 +38174,7 @@ msgstr "لطفا ابتدا یک {0} را مشخص کنید." msgid "Please specify at least one attribute in the Attributes table" msgstr "لطفا حداقل یک ویژگی را در جدول Attributes مشخص کنید" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "لطفاً مقدار یا نرخ ارزش‌گذاری یا هر دو را مشخص کنید" @@ -38316,7 +38345,7 @@ msgstr "نوشته شده در" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38341,7 +38370,7 @@ msgstr "نوشته شده در" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38456,7 +38485,7 @@ msgstr "" msgid "Posting Time" msgstr "زمان ارسال" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "تاریخ ارسال و زمان ارسال الزامی است" @@ -38474,7 +38503,7 @@ msgstr "" #: erpnext/controllers/sales_and_purchase_return.py:66 msgid "Posting timestamp must be after {0}" -msgstr "مهر زمانی ارسال باید بعد از {0} باشد" +msgstr "مهر زمانی ارسال باید پس از {0} باشد" #. Description of a DocType #: erpnext/crm/doctype/opportunity/opportunity.json @@ -38635,6 +38664,12 @@ msgstr "تعمیر و نگهداری پیشگیرانه" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -38928,7 +38963,9 @@ msgstr "طبقه های تخفیف قیمت یا محصول مورد نیاز ا msgid "Price per Unit (Stock UOM)" msgstr "قیمت هر واحد (واحد اندازه‌گیری موجودی)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -39140,7 +39177,7 @@ msgstr "چاپ رسید در صورت کامل شدن سفارش" #: erpnext/setup/install.py:114 msgid "Print UOM after Quantity" -msgstr "چاپ UOM بعد از مقدار" +msgstr "چاپ UOM پس از مقدار" #. Label of the print_without_amount (Check) field in DocType 'Delivery Note' #: erpnext/stock/doctype/delivery_note/delivery_note.json @@ -40283,6 +40320,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40319,6 +40357,12 @@ msgstr "پیش‌فاکتور خرید" msgid "Purchase Invoice Item" msgstr "کالای فاکتور خرید" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "تنظیمات فاکتور خرید" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40370,6 +40414,7 @@ msgstr "فاکتورهای خرید" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40379,7 +40424,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40496,7 +40541,7 @@ msgstr "سفارش خرید {0} ایجاد شد" msgid "Purchase Order {0} is not submitted" msgstr "سفارش خرید {0} ارسال نشده است" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "سفارش‌های خرید" @@ -40559,6 +40604,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40573,7 +40619,7 @@ msgstr "لیست قیمت خرید" msgid "Purchase Receipt" msgstr "رسید خرید" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40839,7 +40885,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -40941,7 +40986,7 @@ msgstr "مقدار (بر حسب واحد موجودی)" #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json #: erpnext/stock/report/negative_batch_report/negative_batch_report.py:66 msgid "Qty After Transaction" -msgstr "مقدار بعد از تراکنش" +msgstr "مقدار پس از تراکنش" #. Label of the actual_qty (Float) field in DocType 'Stock Closing Balance' #. Label of the actual_qty (Float) field in DocType 'Stock Ledger Entry' @@ -41427,7 +41472,7 @@ msgstr "بررسی کیفیت" msgid "Quality Review Objective" msgstr "هدف بررسی کیفیت" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41488,7 +41533,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41682,7 +41727,7 @@ msgstr "رشته مسیر پرسمان" msgid "Queue Size should be between 5 and 100" msgstr "اندازه صف باید بین 5 تا 100 باشد" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "ثبت سریع دفتر روزنامه" @@ -41737,7 +41782,7 @@ msgstr "% پیش‌فاکتور/سرنخ" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41900,7 +41945,6 @@ msgstr "مطرح شده توسط (ایمیل)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42310,8 +42354,8 @@ msgstr "مواد اولیه به مشتری" msgid "Raw SQL" msgstr "SQL خام" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42719,11 +42763,10 @@ msgstr "تراکنش بانکی را تطبیق دهید" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43247,7 +43290,7 @@ msgstr "باندل سریال و دسته رد شده" msgid "Rejected Warehouse" msgstr "انبار مرجوعی" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "انبار رد شده و انبار پذیرفته شده نمی‌توانند یکسان باشند." @@ -43297,7 +43340,7 @@ msgid "Remaining Balance" msgstr "موجودی باقی مانده" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43351,7 +43394,7 @@ msgstr "ملاحظات" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43390,7 +43433,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "آیتم‌های بدون تغییر در مقدار یا ارزش حذف شدند." @@ -43794,6 +43837,7 @@ msgstr "درخواست اطلاعات" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44067,7 +44111,7 @@ msgstr "رزرو برای زیر مونتاژ" msgid "Reserved" msgstr "رزرو شده است" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44680,7 +44724,7 @@ msgstr "" msgid "Reversal Of" msgstr "معکوس شدن" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "ثبت معکوس دفتر روزنامه" @@ -44829,10 +44873,7 @@ msgstr "نقش مجاز به تحویل/دریافت بیش از حد" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "نقش مجاز برای نادیده گرفتن اقدام توقف" @@ -44847,8 +44888,11 @@ msgstr "نقش مجاز برای دور زدن محدودیت اعتبار" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45049,8 +45093,8 @@ msgstr "زیان گرد کردن مجاز" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "زیان گرد کردن مجاز باید بین 0 و 1 باشد" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "گرد کردن ثبت سود/زیان برای انتقال موجودی" @@ -45077,11 +45121,11 @@ msgstr "نام مسیریابی" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "ردیف # {0}: نمی‌توان بیش از {1} را برای مورد {2} برگرداند" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "ردیف # {0}: لطفاً باندل سریال و دسته را برای آیتم {1} اضافه کنید" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45107,7 +45151,7 @@ msgstr "ردیف #{0} (جدول پرداخت): مبلغ باید منفی باش msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "ردیف #{0} (جدول پرداخت): مبلغ باید مثبت باشد" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "ردیف #{0}: یک ورودی سفارش مجدد از قبل برای انبار {1} با نوع سفارش مجدد {2} وجود دارد." @@ -45308,7 +45352,7 @@ msgstr "ردیف #{0}: ورودی تکراری در منابع {1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "ردیف #{0}: تاریخ تحویل مورد انتظار نمی‌تواند قبل از تاریخ سفارش خرید باشد" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "ردیف #{0}: حساب هزینه برای مورد {1} تنظیم نشده است. {2}" @@ -45337,7 +45381,7 @@ msgstr "ردیف #{0}: کالای تمام شده باید {1} باشد" #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:585 msgid "Row #{0}: Finished Good reference is mandatory for Secondary Item {1}." -msgstr "" +msgstr "ردیف #{0}: مرجع کالای تمام شده برای آیتم ثانویه {1} الزامی است." #: erpnext/controllers/subcontracting_inward_controller.py:170 #: erpnext/controllers/subcontracting_inward_controller.py:294 @@ -45368,7 +45412,7 @@ msgstr "ردیف #{0}: فیلدهای «از زمان» و «تا زمان» ا msgid "Row #{0}: Item added" msgstr "ردیف #{0}: مورد اضافه شد" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45396,7 +45440,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "ردیف #{0}: آیتم {1} یک آیتم ارائه شده توسط مشتری نیست." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "ردیف #{0}: آیتم {1} یک آیتم سریال/دسته‌ای نیست. نمی‌تواند یک شماره سریال / شماره دسته در مقابل آن داشته باشد." @@ -45449,7 +45493,7 @@ msgstr "ردیف #{0}: فقط {1} برای رزرو مورد {2} موجود اس msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "ردیف #{0}: عملیات {1} برای تعداد {2} کالای نهایی در دستور کار {3} تکمیل نشده است. لطفاً وضعیت عملیات را از طریق کارت کار {4} به روز کنید." @@ -45474,7 +45518,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "ردیف #{0}: لطفاً انبار زیر مونتاژ را انتخاب کنید" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "ردیف #{0}: لطفاً مقدار سفارش مجدد را تنظیم کنید" @@ -45500,15 +45544,15 @@ msgstr "ردیف #{0}: تعداد باید یک عدد مثبت باشد" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "ردیف #{0}: تعداد باید کمتر یا برابر با تعداد موجود برای رزرو (تعداد واقعی - تعداد رزرو شده) {1} برای Iem {2} در مقابل دسته {3} در انبار {4} باشد." -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "ردیف #{0}: بازرسی کیفیت {1} برای آیتم ارسال نشده است: {2}" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "ردیف #{0}: بازرسی کیفیت {1} برای آیتم {2} رد شد" @@ -45539,11 +45583,11 @@ msgstr "ردیف #{0}: مقدار قابل رزرو برای مورد {1} بای msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "ردیف #{0}: نرخ باید مانند {1} باشد: {2} ({3} / {4})" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "ردیف #{0}: نوع سند مرجع باید یکی از سفارش خرید، فاکتور خرید یا ورودی روزنامه باشد." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "ردیف #{0}: نوع سند مرجع باید یکی از سفارش‌های فروش، فاکتور فروش، ثبت دفتر روزنامه یا اخطار بدهی باشد" @@ -45586,7 +45630,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "ردیف #{0}: شناسه توالی برای عملیات {3} باید {1} یا {2} باشد." -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "ردیف #{0}: شماره سریال {1} به دسته {2} تعلق ندارد" @@ -45634,11 +45678,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45691,11 +45735,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "ردیف #{0}: دسته {1} قبلاً منقضی شده است." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "" @@ -45723,7 +45767,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "ردیف #{0}: نمی‌توانید از بعد موجودی «{1}» در تطبیق موجودی برای تغییر مقدار یا نرخ ارزش‌گذاری استفاده کنید. تطبیق موجودی با ابعاد موجودی صرفاً برای انجام ورودی های افتتاحیه در نظر گرفته شده است." @@ -45759,23 +45803,23 @@ msgstr "ردیف #{1}: انبار برای کالای موجودی {0} اجبا msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "ردیف #{idx}: هنگام تامین مواد اولیه به پیمانکار فرعی، نمی‌توان انبار تامین کننده را انتخاب کرد." -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "ردیف #{idx}: نرخ آیتم براساس نرخ ارزش‌گذاری به‌روزرسانی شده است، زیرا یک انتقال داخلی موجودی است." -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "ردیف #{idx}: لطفاً مکانی برای آیتم دارایی {item_code} وارد کنید." -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "ردیف #{idx}: مقدار دریافتی باید برابر با تعداد پذیرفته شده + تعداد رد شده برای آیتم {item_code} باشد." -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "ردیف #{idx}: {field_label} نمی‌تواند برای مورد {item_code} منفی باشد." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "ردیف #{idx}: {field_label} اجباری است." @@ -45783,7 +45827,7 @@ msgstr "ردیف #{idx}: {field_label} اجباری است." msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "ردیف #{idx}: {from_warehouse_field} و {to_warehouse_field} نمی‌توانند یکسان باشند." -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "ردیف #{idx}: {schedule_date} نمی‌تواند قبل از {transaction_date} باشد." @@ -45848,7 +45892,7 @@ msgstr "ردیف #{}: {}" msgid "Row #{}: {} {} does not exist." msgstr "ردیف #{}: {} {} وجود ندارد." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "ردیف #{}: {} {} به شرکت {} تعلق ندارد. لطفاً {} معتبر را انتخاب کنید." @@ -45864,7 +45908,7 @@ msgstr "ردیف {0} : عملیات در برابر مواد اولیه {1} مو msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "مقدار انتخابی ردیف {0} کمتر از مقدار مورد نیاز است، {1} {2} اضافی مورد نیاز است." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "ردیف {0}# آیتم {1} در جدول «مواد اولیه تامین شده» در {2} {3} یافت نشد" @@ -45896,7 +45940,7 @@ msgstr "ردیف {0}: مبلغ تخصیص یافته {1} باید کمتر یا msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "ردیف {0}: مبلغ تخصیص یافته {1} باید کمتر یا مساوی با مبلغ پرداخت باقی مانده باشد {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -45954,7 +45998,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "ردیف {0}: مرجع مورد یادداشت تحویل یا کالای بسته بندی شده اجباری است." #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "ردیف {0}: نرخ ارز اجباری است" @@ -45995,7 +46039,7 @@ msgstr "ردیف {0}: از زمان و تا زمان اجباری است." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "ردیف {0}: از زمان و تا زمان {1} با {2} همپوشانی دارد" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "ردیف {0}: از انبار برای نقل و انتقالات داخلی اجباری است" @@ -46119,7 +46163,7 @@ msgstr "ردیف {0}: تعداد باید بیشتر از 0 باشد." msgid "Row {0}: Quantity cannot be negative." msgstr "ردیف {0}: مقدار نمی‌تواند منفی باشد." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "ردیف {0}: مقدار برای {4} در انبار {1} در زمان ارسال ورودی موجود نیست ({2} {3})" @@ -46131,11 +46175,11 @@ msgstr "" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "ردیف {0}: Shift را نمی‌توان تغییر داد زیرا استهلاک قبلاً پردازش شده است" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "ردیف {0}: آیتم قرارداد فرعی شده برای مواد اولیه اجباری است {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "ردیف {0}: انبار هدف برای نقل و انتقالات داخلی اجباری است" @@ -46159,7 +46203,7 @@ msgstr "" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "ردیف {0}: برای تنظیم تناوب {1}، تفاوت بین تاریخ و تاریخ باید بزرگتر یا مساوی با {2} باشد." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46212,7 +46256,7 @@ msgstr "ردیف {0}: {2} آیتم {1} در {2} {3} وجود ندارد" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "ردیف {1}: مقدار ({0}) نمی‌تواند کسری باشد. برای اجازه دادن به این کار، \"{2}\" را در UOM {3} غیرفعال کنید." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "ردیف {idx}: سری نام‌گذاری دارایی برای ایجاد خودکار دارایی‌ها برای آیتم {item_code} الزامی است." @@ -46242,7 +46286,7 @@ msgstr "ردیف هایی با سرهای حساب یکسان در دفتر اد msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "ردیف‌هایی با تاریخ سررسید تکراری در ردیف‌های دیگر یافت شد: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "ردیف‌ها: {0} دارای \"ثبت پرداخت\" به عنوان reference_type هستند. این نباید به صورت دستی تنظیم شود." @@ -46308,7 +46352,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "قوانین پیکربندی سری‌ها" @@ -46605,7 +46649,7 @@ msgstr "نرخ ورودی فروش" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46779,7 +46823,7 @@ msgstr "فرصت های فروش بر اساس منبع" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46902,8 +46946,8 @@ msgstr "سفارش فروش برای آیتم {0} لازم است" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "سفارش فروش {0} در مقابل سفارش خرید مشتری {1} وجود دارد. برای مجاز کردن چندین سفارش فروش، {2} را در {3} فعال کنید" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47314,7 +47358,7 @@ msgstr "آیتم مشابه" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "همان کالا و ترکیب انبار قبلا وارد شده است." @@ -47351,7 +47395,7 @@ msgstr "انبار نگهداری نمونه" msgid "Sample Size" msgstr "اندازه‌ی نمونه" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "مقدار نمونه {0} نمی‌تواند بیشتر از مقدار دریافتی {1} باشد" @@ -47640,7 +47684,7 @@ msgstr "جستجو بر اساس کد آیتم، شماره سریال یا با msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47785,7 +47829,7 @@ msgstr "انتخاب برند..." msgid "Select Columns and Filters" msgstr "انتخاب ستون‌ها و فیلترها" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "انتخاب شرکت" @@ -48245,7 +48289,7 @@ msgstr "کالاهای نیمه تمام / کالاهای تمام شده" #. Schedule' #: erpnext/crm/doctype/campaign_email_schedule/campaign_email_schedule.json msgid "Send After (days)" -msgstr "ارسال بعد از (بر حسب روز)" +msgstr "ارسال پس از (بر حسب روز)" #. Label of the send_attached_files (Check) field in DocType 'Request for #. Quotation' @@ -48481,7 +48525,7 @@ msgstr "محدوده شماره سریال" msgid "Serial No Reserved" msgstr "شماره سریال رزرو شده" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48542,7 +48586,7 @@ msgstr "شماره سریال اجباری است" msgid "Serial No is mandatory for Item {0}" msgstr "شماره سریال برای آیتم {0} اجباری است" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "شماره سریال {0} از قبل وجود دارد" @@ -48828,7 +48872,7 @@ msgstr "شماره‌های سریال برای آیتم {0} در انبار {1} #: 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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48854,7 +48898,7 @@ msgstr "شماره‌های سریال برای آیتم {0} در انبار {1} #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49078,7 +49122,7 @@ msgstr "تاریخ توقف خدمات" #: erpnext/accounts/deferred_revenue.py:44 #: erpnext/public/js/controllers/transaction.js:1775 msgid "Service Stop Date cannot be after Service End Date" -msgstr "تاریخ توقف سرویس نمی‌تواند بعد از تاریخ پایان سرویس باشد" +msgstr "تاریخ توقف سرویس نمی‌تواند پس از تاریخ پایان سرویس باشد" #: erpnext/accounts/deferred_revenue.py:41 #: erpnext/public/js/controllers/transaction.js:1772 @@ -49252,12 +49296,6 @@ msgstr "تنظیم انبار هدف" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "نرخ ارزش‌گذاری را بر اساس انبار منبع تنظیم کنید" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "تنظیم انبار" @@ -49363,6 +49401,12 @@ msgstr "این مقدار را روی ۰ تنظیم کنید تا این ویژ msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "تنظیم نرخ ارزیابی برای مواد رد شده" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "تنظیم {0} در دسته دارایی {1} برای شرکت {2}" @@ -49861,7 +49905,7 @@ msgstr "نمایش موجودی در نمودار حساب" msgid "Show Barcode Field in Stock Transactions" msgstr "نمایش فیلد بارکد در تراکنش‌های موجودی" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "نمایش ثبت‌های لغو شده" @@ -49869,7 +49913,7 @@ msgstr "نمایش ثبت‌های لغو شده" msgid "Show Completed" msgstr "نمایش کامل شد" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "نمایش بدهکاری/بستانکاری به واحد پول شرکت" @@ -49952,7 +49996,7 @@ msgstr "نمایش یادداشت های تحویل مرتبط" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "نمایش ارزش خالص در حساب طرف" @@ -49964,7 +50008,7 @@ msgstr "" msgid "Show Open" msgstr "نمایش باز" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "نمایش ثبت‌های افتتاحیه" @@ -49977,11 +50021,6 @@ msgstr "نمایش تراز افتتاحیه و اختتامیه" msgid "Show Operations" msgstr "نمایش عملیات" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "نمایش دکمه پرداخت در پورتال سفارش خرید" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "نمایش جزئیات پرداخت" @@ -49997,7 +50036,7 @@ msgstr "نمایش برنامه پرداخت در چاپ" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "نمایش ملاحظات" @@ -50064,6 +50103,11 @@ msgstr "فقط POS نمایش داده شود" msgid "Show only the Immediate Upcoming Term" msgstr "فقط عبارت فوری آینده را نشان دهید" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "نمایش دکمه پرداخت در پورتال سفارش خرید" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "نمایش ثبت‌های در انتظار" @@ -50350,11 +50394,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50420,7 +50464,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "منبع و مکان هدف نمی‌توانند یکسان باشند" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "منبع و انبار هدف نمی‌توانند برای ردیف {0} یکسان باشند" @@ -50434,8 +50478,8 @@ msgid "Source of Funds (Liabilities)" msgstr "منبع وجوه (بدهی ها)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "انبار منبع برای ردیف {0} اجباری است" @@ -50600,8 +50644,8 @@ msgstr "هزینه های رتبه‌بندی استاندارد" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "فروش استاندارد" @@ -50759,7 +50803,7 @@ msgstr "" #: banking/src/pages/BankStatementImporter.tsx:139 msgid "Statement Import Instructions" -msgstr "" +msgstr "دستورالعمل‌های درون‌بُرد صورت‌حساب" #: erpnext/accounts/report/general_ledger/general_ledger.html:124 msgid "Statement Of Accounts" @@ -50934,7 +50978,7 @@ msgstr "لاگ اختتامیه موجودی" msgid "Stock Details" msgstr "جزئیات موجودی" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "ثبت‌های موجودی قبلاً برای دستور کار {0} ایجاد شده‌اند: {1}" @@ -51205,7 +51249,7 @@ msgstr "موجودی دریافت شده اما صورتحساب نشده" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51217,7 +51261,7 @@ msgstr "تطبیق موجودی" msgid "Stock Reconciliation Item" msgstr "آیتم تطبیق موجودی" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "تطبیق‌های موجودی" @@ -51255,7 +51299,7 @@ msgstr "تنظیمات ارسال مجدد موجودی" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51283,7 +51327,7 @@ msgstr "ثبت‌های رزرو موجودی لغو شد" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "نوشته های رزرو موجودی ایجاد شد" @@ -51665,7 +51709,7 @@ msgstr "دستور کار متوقف شده را نمی‌توان لغو کرد #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "مغازه ها" @@ -51743,10 +51787,6 @@ msgstr "عملیات فرعی" msgid "Sub Procedure" msgstr "رویه فرعی" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -51963,7 +52003,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "سفارش پیمانکاری فرعی" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -51989,7 +52029,7 @@ msgstr "آیتم خدمات سفارش پیمانکاری فرعی" msgid "Subcontracting Order Supplied Item" msgstr "آیتم تامین شده سفارش پیمانکاری فرعی" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "سفارش پیمانکاری فرعی {0} ایجاد شد." @@ -52078,7 +52118,7 @@ msgstr "" msgid "Subdivision" msgstr "زیر مجموعه" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "اقدام ارسال نشد" @@ -52152,7 +52192,7 @@ msgstr "تاریخ پایان اشتراک برای پیروی از ماه ها #: erpnext/accounts/doctype/subscription/subscription.py:353 msgid "Subscription End Date must be after {0} as per the subscription plan" -msgstr "تاریخ پایان اشتراک طبق طرح اشتراک باید بعد از {0} باشد" +msgstr "تاریخ پایان اشتراک طبق طرح اشتراک باید پس از {0} باشد" #. Name of a DocType #: erpnext/accounts/doctype/subscription_invoice/subscription_invoice.json @@ -52253,7 +52293,7 @@ msgstr "با موفقیت تطبیق کرد" msgid "Successfully Set Supplier" msgstr "تامین کننده با موفقیت تنظیم شد" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "UOM موجودی با موفقیت تغییر کرد، لطفاً فاکتورهای تبدیل را برای UOM جدید دوباره تعریف کنید." @@ -52303,7 +52343,7 @@ msgstr "رکورد {0} با موفقیت به روز شد." #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:263 msgid "Suggest creating a" -msgstr "" +msgstr "پیشنهاد ایجاد یک" #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:876 msgid "Suggested" @@ -52409,6 +52449,7 @@ msgstr "مقدار تامین شده" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52450,8 +52491,8 @@ msgstr "مقدار تامین شده" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52499,6 +52540,12 @@ msgstr "" msgid "Supplier Contact" msgstr "مخاطب تامین کننده" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "پیش‌فرض‌های تأمین‌کننده" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52593,7 +52640,7 @@ msgstr "تاریخ فاکتور تامین کننده" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "شماره فاکتور تامین کننده" @@ -52873,19 +52920,10 @@ msgstr "تامین کننده کالا یا خدمات." msgid "Supplier {0} not found in {1}" msgstr "تامین کننده {0} در {1} یافت نشد" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "تامین کننده(های)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "تجزیه و تحلیل فروش مبتنی بر تامین کننده" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -52947,7 +52985,7 @@ msgstr "تیم پشتیبانی" msgid "Support Tickets" msgstr "تیکت‌های پشتیبانی" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "متغیرهای پشتیبانی‌شده:" @@ -53206,8 +53244,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "انبار هدف برای ردیف {0} اجباری است" @@ -53675,7 +53713,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "مبلغ مشمول مالیات" @@ -53836,7 +53874,7 @@ msgstr "مالیات ها و هزینه های کسر شده" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "مالیات ها و هزینه های کسر شده (ارز شرکت)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "ردیف مالیات #{0}: {1} نمی‌تواند کوچکتر از {2} باشد" @@ -54026,7 +54064,6 @@ msgstr "الگوی شرایط" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54218,7 +54255,7 @@ msgstr "دسترسی به درخواست پیش‌فاکتور از پورتال msgid "The BOM which will be replaced" msgstr "BOM که جایگزین خواهد شد" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54262,7 +54299,7 @@ msgstr "مدت پرداخت در ردیف {0} احتمالاً تکراری اس 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:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "مقدار هدررفت فرآیند مطابق با مقدار هدررفت فرآیند کارت کارها بازنشانی شده است" @@ -54278,7 +54315,7 @@ msgstr "شماره سریال ردیف #{0}: {1} در انبار {2} موجود 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:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "باندل سریال و دسته {0} برای این تراکنش معتبر نیست. «نوع تراکنش» باید به جای «ورودی» در باندل سریال و دسته {0} «خروجی» باشد" @@ -54314,7 +54351,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "دسته {0} از قبل در {1} {2} رزرو شده است. بنابراین، نمی‌توان با {3} {4} که به ازای {5} {6} ایجاد شده است، ادامه داد." @@ -54420,7 +54457,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "ویژگی‌های حذف شده زیر در گونه‌ها وجود دارد اما در قالب وجود ندارد. می‌توانید گونه‌ها را حذف کنید یا ویژگی(ها) را در قالب نگه دارید." @@ -54464,15 +54501,15 @@ msgstr "تعطیلات در {0} بین از تاریخ و تا تاریخ نیس msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "آیتم‌های {0} و {1} در {2} زیر موجود هستند:" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54628,7 +54665,7 @@ msgstr "اشتراک‌گذاری‌ها با {0} وجود ندارند" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "موجودی آیتم {0} در انبار {1} در تاریخ {2} منفی بود. برای ثبت نرخ ارزیابی صحیح، باید یک ثبت مثبت {3} قبل از تاریخ {4} و زمان {5} ایجاد کنید. برای جزئیات بیشتر، لطفاً مستندات را مطالعه کنید." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "موجودی برای اقلام و انبارهای زیر رزرو شده است، همان را در {0} تطبیق موجودی لغو کنید:

{1}" @@ -54650,11 +54687,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "تسک به عنوان یک کار پس‌زمینه در نوبت قرار گرفته است. در صورت وجود هرگونه مشکل در پردازش در پس‌زمینه، سیستم نظری در مورد خطا در این تطبیق موجودی اضافه می‌کند و به مرحله پیش‌نویس باز می‌گردد." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "تسک به عنوان یک کار پس‌زمینه در نوبت قرار گرفته است. در صورت وجود هرگونه مشکل در پردازش در پس‌زمینه، سیستم نظری در مورد خطا در این تطبیق موجودی اضافه می‌کند و به مرحله ارسال باز می‌گردد." @@ -54726,7 +54763,7 @@ msgstr "{0} ({1}) باید برابر با {2} ({3}) باشد" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54779,7 +54816,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "هیچ اسلاتی در این تاریخ موجود نیست" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54823,7 +54860,7 @@ msgstr "هیچ دسته ای در برابر {0} یافت نشد: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "باید حداقل 1 کالای تمام شده در این ثبت موجودی وجود داشته باشد" @@ -54879,11 +54916,11 @@ msgstr "این آیتم یک گونه {0} (الگو) است." msgid "This Month's Summary" msgstr "خلاصه این ماه" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -54946,7 +54983,7 @@ msgstr "" #. Description of the 'Target Warehouse' (Link) field in DocType 'Work Order' #: erpnext/manufacturing/doctype/work_order/work_order.json msgid "This is a location where final product stored." -msgstr "این مکانی است که محصول نهایی در آن ذخیره می‌شود." +msgstr "این مکانی است که کالای تمام شده در آن ذخیره می‌شود." #. Description of the 'Work-in-Progress Warehouse' (Link) field in DocType #. 'Work Order' @@ -55684,7 +55721,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "برای گنجاندن مالیات در ردیف {0} در نرخ مورد، مالیات‌های ردیف {1} نیز باید لحاظ شود" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "برای ادغام، ویژگی‌های زیر باید برای هر دو مورد یکسان باشد" @@ -55719,7 +55756,7 @@ msgstr "برای استفاده از یک دفتر مالی متفاوت، لط #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "برای استفاده از یک دفتر مالی متفاوت، لطفاً علامت «شامل ثبت‌های پیش‌فرض FB» را بردارید" @@ -55870,7 +55907,7 @@ msgstr "مجموع تخصیص ها" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "مبلغ کل" @@ -56293,7 +56330,7 @@ msgstr "مبلغ کل درخواست پرداخت نمی‌تواند بیشتر msgid "Total Payments" msgstr "کل پرداخت‌ها" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "مقدار کل برداشت‌شده {0} بیشتر از مقدار سفارش داده‌شده {1} است. می‌توانید حد مجاز برداشت اضافی را در تنظیمات موجودی تعیین کنید." @@ -56325,7 +56362,7 @@ msgstr "کل هزینه خرید (از طریق فاکتور خرید)" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "مجموع تعداد" @@ -56711,7 +56748,7 @@ msgstr "URL پیگیری" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56722,7 +56759,7 @@ msgstr "تراکنش" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "ارز تراکنش" @@ -57179,7 +57216,7 @@ msgstr "تاریخ شروع دوره آزمایشی" #: erpnext/accounts/doctype/subscription/subscription.py:345 msgid "Trial Period Start date cannot be after Subscription Start Date" -msgstr "تاریخ شروع دوره آزمایشی نمی‌تواند بعد از تاریخ شروع اشتراک باشد" +msgstr "تاریخ شروع دوره آزمایشی نمی‌تواند پس از تاریخ شروع اشتراک باشد" #. Option for the 'Status' (Select) field in DocType 'Subscription' #: erpnext/accounts/doctype/subscription/subscription.json @@ -57394,11 +57431,11 @@ msgstr "تنظیمات مالیات بر ارزش افزوده امارات مت #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57470,7 +57507,7 @@ msgstr "ضریب تبدیل UOM در ردیف {0} لازم است" msgid "UOM Name" msgstr "نام UOM" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "ضریب تبدیل UOM مورد نیاز برای UOM: {0} در مورد: {1}" @@ -57546,7 +57583,7 @@ msgstr "نمی‌توان امتیازی را که از {0} شروع می‌شو msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "قادر به یافتن متغیر نیست:" @@ -57619,7 +57656,7 @@ msgstr "" #: erpnext/manufacturing/doctype/workstation/workstation.js:78 msgid "Under Working Hours table, you can add start and end times for a Workstation. For example, a Workstation may be active from 9 am to 1 pm, then 2 pm to 5 pm. You can also specify the working hours based on shifts. While scheduling a Work Order, the system will check for the availability of the Workstation based on the working hours specified." -msgstr "در جدول ساعات کاری، می‌توانید زمان شروع و پایان یک ایستگاه کاری را اضافه کنید. به عنوان مثال، یک ایستگاه کاری ممکن است از ساعت 9 صبح تا 1 بعد از ظهر و سپس از 2 بعد از ظهر تا 5 بعد از ظهر فعال باشد. همچنین می‌توانید ساعت کاری را بر اساس شیفت ها مشخص کنید. هنگام برنامه‌ریزی یک دستور کار، سیستم بر اساس ساعات کاری مشخص شده، در دسترس بودن ایستگاه کاری را بررسی می‌کند." +msgstr "در جدول ساعات کاری، می‌توانید زمان شروع و پایان یک ایستگاه کاری را اضافه کنید. به عنوان مثال، یک ایستگاه کاری ممکن است از ساعت 9 صبح تا 1 پس از ظهر و سپس از 2 پس از ظهر تا 5 پس از ظهر فعال باشد. همچنین می‌توانید ساعت کاری را بر اساس شیفت ها مشخص کنید. هنگام برنامه‌ریزی یک دستور کار، سیستم بر اساس ساعات کاری مشخص شده، در دسترس بودن ایستگاه کاری را بررسی می‌کند." #: banking/src/components/features/BankReconciliation/BankTransactionUnreconcileModal.tsx:30 msgid "Undo Transaction Reconciliation" @@ -57665,7 +57702,7 @@ msgstr "واحد اندازه‌گیری" msgid "Unit of Measure (UOM)" msgstr "واحد اندازه‌گیری (UOM)" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "واحد اندازه‌گیری {0} بیش از یک بار در جدول ضریب تبدیل وارد شده است" @@ -57785,10 +57822,9 @@ msgid "Unreconcile Transaction" msgstr "تراکنش ناسازگار" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "تطبیق نشده" @@ -57811,10 +57847,6 @@ msgstr "ثبت‌های تطبیق نگرفته" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57860,7 +57892,7 @@ msgstr "برنامه‌ریزی نشده" msgid "Unsecured Loans" msgstr "وام های بدون وثیقه" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58075,12 +58107,6 @@ msgstr "به‌روزرسانی موجودی" msgid "Update Type" msgstr "نوع به‌روزرسانی" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "فرکانس به‌روزرسانی پروژه" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58121,7 +58147,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "به‌روزرسانی گونه‌ها..." @@ -58512,7 +58538,7 @@ msgstr "معتبر از تاریخ غیر در سال مالی {0}" #: erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.py:82 msgid "Valid From must be after {0} as last GL Entry against the cost center {1} posted on this date" -msgstr "معتبر از باید بعد از {0} به عنوان آخرین ثبت دفتر کل در برابر مرکز هزینه {1} پست شده در این تاریخ باشد" +msgstr "معتبر از باید پس از {0} به عنوان آخرین ثبت دفتر کل در برابر مرکز هزینه {1} پست شده در این تاریخ باشد" #. Label of the valid_till (Date) field in DocType 'Supplier Quotation' #. Label of the valid_till (Date) field in DocType 'Quotation' @@ -58579,12 +58605,6 @@ msgstr "اعتبارسنجی قانون اعمال شده" msgid "Validate Components and Quantities Per BOM" msgstr "اعتبارسنجی مقادیر و اجزاء در هر BOM" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58608,6 +58628,12 @@ msgstr "اعتبارسنجی قانون قیمت‌گذاری" msgid "Validate Stock on Save" msgstr "اعتبارسنجی موجودی در ذخیره" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "اعتبارسنجی مقدار مصرف (مطابق با BOM)" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58714,11 +58740,11 @@ msgstr "نرخ ارزش‌گذاری وجود ندارد" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "نرخ ارزش‌گذاری برای آیتم {0}، برای انجام ثبت‌های حسابداری برای {1} {2} لازم است." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "در صورت ثبت موجودی افتتاحیه، نرخ ارزش‌گذاری الزامی است" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "نرخ ارزش‌گذاری الزامی است برای آیتم {0} در ردیف {1}" @@ -58728,7 +58754,7 @@ msgstr "نرخ ارزش‌گذاری الزامی است برای آیتم {0} msgid "Valuation and Total" msgstr "ارزش گذاری و کل" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "نرخ ارزش‌گذاری برای آیتم‌های ارائه شده توسط مشتری صفر تعیین شده است." @@ -58878,7 +58904,7 @@ msgstr "واریانس ({})" msgid "Variant" msgstr "گونه" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "خطای ویژگی گونه" @@ -58897,7 +58923,7 @@ msgstr "BOM گونه" msgid "Variant Based On" msgstr "گونه بر اساس" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "گونه بر اساس قابل تغییر نیست" @@ -58915,7 +58941,7 @@ msgstr "فیلد گونه" msgid "Variant Item" msgstr "آیتم گونه" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "آیتم‌های گونه" @@ -59296,7 +59322,7 @@ msgstr "نام سند مالی" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59336,7 +59362,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "زیرنوع سند مالی" @@ -59368,7 +59394,7 @@ msgstr "زیرنوع سند مالی" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59603,7 +59629,7 @@ msgstr "انبار {0} وجود ندارد" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "انبار {0} برای سفارش فروش {1} مجاز نیست، باید {2} باشد" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "انبار {0} به هیچ حسابی مرتبط نیست، لطفاً حساب را در سابقه انبار ذکر کنید یا حساب موجودی پیش‌فرض را در شرکت {1} تنظیم کنید." @@ -59650,7 +59676,7 @@ msgstr "انبارهای دارای تراکنش موجود را نمی‌توا #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59706,6 +59732,12 @@ msgstr "هشدار برای درخواست جدید برای پیش‌فاکتو msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "هشدار - ردیف {0}: ساعات صورتحساب بیشتر از ساعت‌های واقعی است" @@ -59889,7 +59921,7 @@ msgstr "مشخصات وب سایت" msgid "Website:" msgstr "وب‌سایت:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "هفته سال" @@ -60263,7 +60295,7 @@ msgstr "مواد مصرفی دستور کار" msgid "Work Order Item" msgstr "آیتم دستور کار" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "عدم تطابق دستور کار" @@ -60325,11 +60357,11 @@ msgstr "دستور کار ایجاد نشد" msgid "Work Order {0} created" msgstr "دستور کار {0} ایجاد شد" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "دستور کار {0}: کارت کار برای عملیات {1} یافت نشد" @@ -60645,11 +60677,11 @@ msgstr "نام سال" msgid "Year Start Date" msgstr "تاریخ شروع سال" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "سال به صورت ۲ رقمی" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "سال به صورت ۴ رقمی" @@ -60702,7 +60734,7 @@ msgstr "همچنین می‌توانید این لینک را در مرورگر msgid "You can also set default CWIP account in Company {}" msgstr "همچنین می‌توانید حساب پیش‌فرض «کارهای سرمایه‌ای در دست اجرا» را در شرکت {} تنظیم کنید" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "همچنین می‌توانید با قرار دادن متغیرها بین (.) نقطه، از آنها در نام سری استفاده کنید" @@ -60856,6 +60888,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "شما اجازه به‌روزرسانی فیلد تعداد دریافتی برای آیتم {0} را ندارید" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60884,7 +60920,7 @@ msgstr "شما {0} و {1} را در {2} فعال کرده‌اید. این می msgid "You have entered a duplicate Delivery Note on Row" msgstr "شما یک یادداشت تحویل تکراری در ردیف وارد کرده اید" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60892,7 +60928,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "برای حفظ سطوح سفارش مجدد، باید سفارش مجدد خودکار را در تنظیمات موجودی فعال کنید." @@ -60963,8 +60999,11 @@ msgstr "دارای امتیاز صفر" msgid "Zero quantity" msgstr "مقدار صفر" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61076,7 +61115,7 @@ msgstr "exchangerate.host" msgid "fieldname" msgstr "fieldname" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "نام فیلد در سند، مثلاً" @@ -61294,6 +61333,10 @@ msgstr "تراکنش‌ها انتخاب شدند" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "منحصر به فرد به عنوان مثال SAVE20 برای استفاده از تخفیف" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "تعداد تحویل داده شده برای آیتم {0} به {1} به‌روزرسانی شد" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "واریانس" @@ -61352,7 +61395,8 @@ msgstr "{0} کوپن استفاده شده {1} است. مقدار مجاز تم msgid "{0} Digest" msgstr "{0} خلاصه" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "{0} سری نام‌گذاری" @@ -61372,7 +61416,7 @@ msgstr "{0} عملیات: {1}" msgid "{0} Request for {1}" msgstr "درخواست {0} برای {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} نگهداری نمونه بر اساس دسته است، لطفاً برای نگهداری نمونه آیتم، شماره دسته را بررسی کنید" @@ -61485,7 +61529,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} دو بار در مالیات آیتم وارد شد" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "{0} دو بار {1} در مالیات آیتم وارد شد" @@ -61653,7 +61697,7 @@ msgstr "پارامتر {0} نامعتبر است" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} ثبت‌های پرداخت را نمی‌توان با {1} فیلتر کرد" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "{0} تعداد مورد {1} در انبار {2} با ظرفیت {3} در حال دریافت است." @@ -61666,7 +61710,7 @@ msgstr "{0} تا {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "{0} تراکنش‌ها به سیستم درون‌بُرد خواهند شد. لطفاً جزئیات زیر را بررسی کرده و برای ادامه روی دکمه «درون‌بُرد» کلیک کنید." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "{0} واحد برای مورد {1} در انبار {2} رزرو شده است، لطفاً همان را در {3} تطبیق موجودی لغو کنید." @@ -61868,7 +61912,7 @@ msgstr "{0} {1}: حساب {2} غیرفعال است" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: ورود حسابداری برای {2} فقط به ارز انجام می‌شود: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: مرکز هزینه برای مورد {2} اجباری است" @@ -61915,7 +61959,7 @@ msgstr "{0}% از ارزش کل فاکتور به عنوان تخفیف داده #: erpnext/projects/doctype/task/task.py:130 msgid "{0}'s {1} cannot be after {2}'s Expected End Date." -msgstr "{1} {0} نمی‌تواند بعد از تاریخ پایان مورد انتظار {2} باشد." +msgstr "{1} {0} نمی‌تواند پس از تاریخ پایان مورد انتظار {2} باشد." #: erpnext/manufacturing/doctype/job_card/job_card.py:1304 #: erpnext/manufacturing/doctype/job_card/job_card.py:1312 @@ -61954,23 +61998,23 @@ msgstr "{0}: {1} وجود ندارد" msgid "{0}: {1} is a group account." msgstr "{0}: {1} یک حساب گروه است." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} باید کمتر از {2} باشد" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "{count} دارایی برای {item_code} ایجاد شد" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} لغو یا بسته شدهه است." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "اندازه نمونه {item_name} ({sample_size}) نمی‌تواند بیشتر از مقدار مورد قبول ({accepted_quantity}) باشد." -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "{ref_doctype} {ref_name} {status} است." diff --git a/erpnext/locale/fr.po b/erpnext/locale/fr.po index 774e597c5d8..5eb2ae85198 100644 --- a/erpnext/locale/fr.po +++ b/erpnext/locale/fr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:20\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:20\n" "Last-Translator: hello@frappe.io\n" "Language-Team: French\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr " Sous-Ruche" msgid " Summary" msgstr " Résumé" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "Un \"article fourni par un client\" ne peut pas être également un article d'achat" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "Un \"article fourni par un client\" ne peut pas avoir de taux de valorisation" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "'Est un Actif Immobilisé’ doit être coché car il existe une entrée d’Actif pour cet article" @@ -302,7 +302,7 @@ msgstr "'Date début' est requise" msgid "'From Date' must be after 'To Date'" msgstr "La ‘Du (date)’ doit être antérieure à la ‘Au (date) ’" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "'A un Numéro de Série' ne peut pas être 'Oui' pour un article non géré en stock" @@ -338,7 +338,7 @@ msgstr "'Mettre à Jour le Stock' ne peut pas être coché car les articles ne s msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "'Mettre à Jour Le Stock’ ne peut pas être coché pour la vente d'actifs immobilisés" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "Le compte « {0} » est déjà utilisé par {1}. Utilisez un autre compte." @@ -1024,7 +1024,7 @@ msgstr "Un conducteur doit être défini pour soumettre." msgid "A logical Warehouse against which stock entries are made." msgstr "Entrepôt logique pour lequel des entrées en stock sont effectuées." -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1236,7 +1236,7 @@ msgstr "La clé d'accès est requise pour le fournisseur de service : {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "Selon CEFACT/ICG/2010/IC013 ou CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1906,8 +1906,8 @@ msgstr "Écritures Comptables" msgid "Accounting Entry for Asset" msgstr "Ecriture comptable pour l'actif" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1915,7 +1915,7 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Écriture comptable pour le service" @@ -1928,16 +1928,16 @@ msgstr "Écriture comptable pour le service" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Ecriture comptable pour stock" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "Entrée comptable pour {0}" @@ -2235,12 +2235,6 @@ msgstr "Action si l'inspection qualité n'est pas soumise" msgid "Action If Quality Inspection Is Rejected" msgstr "Action si l'inspection qualité est rejetée" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "Action si le même taux n'est pas maintenu" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "Action initialisée" @@ -2299,6 +2293,12 @@ msgstr "" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2566,7 +2566,7 @@ msgstr "Temps Réel (en Heures)" msgid "Actual qty in stock" msgstr "Qté réelle en stock" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "Le type de taxe réel ne peut pas être inclus dans le prix de l'Article à la ligne {0}" @@ -2580,7 +2580,7 @@ msgstr "" msgid "Add / Edit Prices" msgstr "Ajouter / Modifier Prix" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "Ajouter des colonnes dans la devise de la transaction" @@ -2734,7 +2734,7 @@ msgstr "Ajouter une série / numéro de lot" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "Ajouter numéro de série / numéro de lot (Qté rejetée)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -2979,7 +2979,7 @@ msgstr "Montant de la remise supplémentaire" msgid "Additional Discount Amount (Company Currency)" msgstr "Montant de la Remise Supplémentaire (Devise de la Société)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -3264,7 +3264,7 @@ msgstr "" msgid "Adjustment Against" msgstr "Ajustement pour" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "Ajustement basé sur le taux de la facture d'achat" @@ -3377,7 +3377,7 @@ msgstr "" msgid "Advance amount" msgstr "Montant de l'Avance" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Montant de l'avance ne peut être supérieur à {0} {1}" @@ -3446,7 +3446,7 @@ msgstr "Contre" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Contrepartie" @@ -3564,7 +3564,7 @@ msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "Pour le Bon" @@ -3588,7 +3588,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "Pour le Type de Bon" @@ -3869,7 +3869,7 @@ msgstr "Toutes les communications, celle-ci et celles au dessus de celle-ci incl msgid "All items are already requested" msgstr "Tous les articles sont déjà demandés" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "Tous les articles ont déjà été facturés / retournés" @@ -3877,7 +3877,7 @@ msgstr "Tous les articles ont déjà été facturés / retournés" msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Tous les articles ont déjà été transférés pour cet ordre de fabrication." @@ -3926,7 +3926,7 @@ msgstr "Allouer" msgid "Allocate Advances Automatically (FIFO)" msgstr "Allouer automatiquement les avances (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Allouer le montant du paiement" @@ -3936,7 +3936,7 @@ msgstr "Allouer le montant du paiement" msgid "Allocate Payment Based On Payment Terms" msgstr "Attribuer le paiement en fonction des conditions de paiement" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "" @@ -3966,7 +3966,7 @@ msgstr "Alloué" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4087,15 +4087,15 @@ msgstr "Autoriser les retours" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "Autoriser l'ajout d'un article plusieurs fois dans une transaction" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4124,12 +4124,6 @@ msgstr "Autoriser un Stock Négatif" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4342,8 +4336,11 @@ msgstr "Autoriser les factures multi-devises en contrepartie d'un seul compte de msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4435,7 +4432,7 @@ msgstr "Autorisé à faire affaire avec" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4632,7 +4629,7 @@ msgstr "Toujours demander" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4662,7 +4659,6 @@ msgstr "Toujours demander" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4832,10 +4828,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "Montant dans la devise du compte" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "Montant en lettres" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5455,7 +5447,7 @@ msgstr "Comme le champ {0} est activé, le champ {1} est obligatoire." msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "Lorsque le champ {0} est activé, la valeur du champ {1} doit être supérieure à 1." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "" @@ -5605,7 +5597,7 @@ msgstr "Compte de Catégorie d'Actif" msgid "Asset Category Name" msgstr "Nom de Catégorie d'Actif" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "Catégorie d'Actif est obligatoire pour l'article Immobilisé" @@ -6001,7 +5993,7 @@ msgstr "" msgid "Asset {0} must be submitted" msgstr "L'actif {0} doit être soumis" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6039,11 +6031,11 @@ msgstr "Actifs - Immo." msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "Éléments non créés pour {item_code}. Vous devrez créer un actif manuellement." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "" @@ -6116,7 +6108,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "" @@ -6148,7 +6140,7 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "" @@ -6212,7 +6204,11 @@ msgstr "Nom de l'Attribut" msgid "Attribute Value" msgstr "Valeur de l'Attribut" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "Table d'Attribut est obligatoire" @@ -6220,11 +6216,19 @@ msgstr "Table d'Attribut est obligatoire" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "Attribut {0} sélectionné à plusieurs reprises dans le Tableau des Attributs" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Attributs" @@ -6284,24 +6288,12 @@ msgstr "Valeur Autorisée" msgid "Auto Create Exchange Rate Revaluation" msgstr "" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6420,6 +6412,18 @@ msgstr "Erreur de création automatique d'utilisateur" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "Fermeture automatique de l'opportunité de réponse après le nombre de jours mentionné ci-dessus." +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6637,7 +6641,7 @@ msgstr "" msgid "Available for use date is required" msgstr "La date de mise en service est nécessaire" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "La quantité disponible est {0}. Vous avez besoin de {1}." @@ -6736,7 +6740,7 @@ msgstr "" msgid "BIN Qty" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7009,7 +7013,7 @@ msgstr "Article de nomenclature du Site Internet" msgid "BOM Website Operation" msgstr "Opération de nomenclature du Site Internet" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7100,8 +7104,8 @@ msgstr "Rembourrage des matières premières dans l'entrepôt de travaux en cour #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "Sortir rétroactivement les matières premières d'un contrat de sous-traitance sur la base de" +msgid "Backflush raw materials of subcontract based on" +msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7121,7 +7125,7 @@ msgstr "Solde" msgid "Balance (Dr - Cr)" msgstr "Solde (Debit - Crédit)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Solde ({0})" @@ -7652,11 +7656,11 @@ msgstr "Banque" msgid "Barcode Type" msgstr "Type de code-barres" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "Le Code Barre {0} est déjà utilisé dans l'article {1}" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "Le code-barres {0} n'est pas un code {1} valide" @@ -8023,12 +8027,12 @@ msgstr "Lot {0} et entrepôt" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "Lot {0} de l'Article {1} a expiré." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "Le lot {0} de l'élément {1} est désactivé." @@ -8101,8 +8105,8 @@ msgstr "Numéro de facture" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "Facturation de la quantité rejetée dans la facture d'achat" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8442,8 +8446,11 @@ msgstr "Article de commande avec limites" msgid "Blanket Order Rate" msgstr "Prix unitaire de commande avec limites" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -8958,7 +8965,7 @@ msgstr "L'achat et la vente" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "Achat doit être vérifié, si Applicable Pour {0} est sélectionné" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "" @@ -9323,7 +9330,7 @@ msgstr "Impossible de filtrer sur la base du N° de Coupon, si les lignes sont r msgid "Can only make payment against unbilled {0}" msgstr "Le paiement n'est possible qu'avec les {0} non facturés" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9379,9 +9386,9 @@ msgstr "" msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "Impossible de fusionner" @@ -9409,7 +9416,7 @@ msgstr "" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "Ne peut pas être un article immobilisé car un Journal de Stock a été créé." @@ -9445,7 +9452,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9453,7 +9460,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "Impossible d'annuler la transaction lorsque l'ordre de fabrication est terminé." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "Impossible de modifier les attributs après des mouvements de stock. Faites un nouvel article et transférez la quantité en stock au nouvel article" @@ -9465,7 +9472,7 @@ msgstr "" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "Impossible de modifier la date d'arrêt du service pour l'élément de la ligne {0}" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "Impossible de modifier les propriétés de variante après une transaction de stock. Vous devrez créer un nouvel article pour pouvoir le faire." @@ -9493,11 +9500,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "Conversion impossible en Groupe car le Type de Compte est sélectionné." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "Impossible de créer une liste de prélèvement pour la Commande client {0} car il y a du stock réservé. Veuillez annuler la réservation de stock pour créer une liste de prélèvement." @@ -9523,7 +9530,7 @@ msgstr "Impossible de déclarer comme perdu, parce que le Devis a été fait." msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "Déduction impossible lorsque la catégorie est pour 'Évaluation' ou 'Vaulation et Total'" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -9560,7 +9567,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9568,8 +9575,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "Impossible de garantir la livraison par numéro de série car l'article {0} est ajouté avec et sans Assurer la livraison par numéro de série" @@ -9613,7 +9620,7 @@ msgstr "" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9631,8 +9638,8 @@ msgstr "" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9648,7 +9655,7 @@ msgstr "Impossible de définir comme perdu alors qu'une Commande client a été msgid "Cannot set authorization on basis of Discount for {0}" msgstr "Impossible de définir l'autorisation sur la base des Prix Réduits pour {0}" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "Impossible de définir plusieurs valeurs par défaut pour une entreprise." @@ -10559,7 +10566,7 @@ msgstr "Fermeture (Cr)" msgid "Closing (Dr)" msgstr "Fermeture (Dr)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "Fermeture (ouverture + total)" @@ -11020,7 +11027,7 @@ msgstr "Sociétés" #: 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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11302,7 +11309,7 @@ msgstr "Société" msgid "Company Abbreviation" msgstr "Abréviation de la Société" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11315,7 +11322,7 @@ msgstr "L'abréviation de l'entreprise ne peut pas comporter plus de 5 caractèr msgid "Company Account" msgstr "Compte d'entreprise" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "" @@ -11491,7 +11498,7 @@ msgstr "" msgid "Company is mandatory" msgstr "L'entreprise est obligatoire" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "" @@ -11762,7 +11769,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11775,7 +11782,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11793,13 +11802,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "Configurez une action pour stopper la transaction ou alertez simplement su le prix unitaie n'est pas maintenu." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "Configurez la liste de prix par défaut lors de la création d'une nouvelle transaction d'achat. Les prix des articles seront extraits de cette liste de prix." @@ -11977,7 +11986,7 @@ msgstr "" msgid "Consumed" msgstr "Consommé" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "Montant Consommé" @@ -12021,7 +12030,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12194,10 +12203,6 @@ msgstr "" msgid "Contact:" msgstr "Contact:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Contact: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12375,7 +12380,7 @@ msgstr "Facteur de Conversion" msgid "Conversion Rate" msgstr "Taux de Conversion" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "Facteur de conversion de l'Unité de Mesure par défaut doit être 1 dans la ligne {0}" @@ -12647,7 +12652,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12742,7 +12747,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "Le Centre de Coûts est requis à la ligne {0} dans le tableau des Taxes pour le type {1}" @@ -13080,7 +13085,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "Créer une entrée de journal inter-entreprises" @@ -13453,7 +13458,7 @@ msgstr "" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "" @@ -13594,15 +13599,15 @@ msgstr "" msgid "Credit" msgstr "Crédit" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "Crédit (transaction)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "Crédit ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "Compte créditeur" @@ -13797,7 +13802,7 @@ msgstr "" msgid "Creditors" msgstr "Créditeurs" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14095,7 +14100,7 @@ msgstr "" msgid "Current Serial No" msgstr "Numéro de série actuel" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14296,7 +14301,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15069,7 +15074,7 @@ msgstr "" msgid "Day Of Week" msgstr "Jour de la semaine" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15185,11 +15190,11 @@ msgstr "Revendeur" msgid "Debit" msgstr "Débit" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "Débit (Transaction)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "Débit ({0})" @@ -15199,7 +15204,7 @@ msgstr "Débit ({0})" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "Compte de débit" @@ -15310,7 +15315,7 @@ msgstr "" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15452,7 +15457,7 @@ msgstr "" msgid "Default BOM" msgstr "Nomenclature par Défaut" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "Nomenclature par défaut ({0}) doit être actif pour ce produit ou son modèle" @@ -15809,15 +15814,15 @@ msgstr "Région par Défaut" msgid "Default Unit of Measure" msgstr "Unité de Mesure par Défaut" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "L’Unité de Mesure par Défaut pour l’Article {0} ne peut pas être modifiée directement parce que vous avez déjà fait une (des) transaction (s) avec une autre unité de mesure. Vous devez créer un nouvel article pour utiliser une UdM par défaut différente." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "L’Unité de mesure par défaut pour la variante '{0}' doit être la même que dans le Modèle '{1}'" @@ -16118,7 +16123,7 @@ msgstr "" msgid "Delivered" msgstr "Livré" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Montant Livré" @@ -16168,8 +16173,8 @@ msgstr "Articles Livrés à Facturer" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16180,11 +16185,11 @@ msgstr "Qté Livrée" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16273,7 +16278,7 @@ msgstr "Gestionnaire des livraisons" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16798,7 +16803,7 @@ msgstr "" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "Le Compte d’Écart doit être un compte de type Actif / Passif, puisque cette Réconciliation de Stock est une écriture d'à-nouveau" @@ -16962,11 +16967,9 @@ msgstr "" msgid "Disable In Words" msgstr "Désactiver \"En Lettres\"" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "Désactiver le dernier prix d'achat" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17007,6 +17010,12 @@ msgstr "Désactiver le sélecteur de numéro de lot/série" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17063,7 +17072,7 @@ msgstr "Désassembler" msgid "Disassemble Order" msgstr "Ordre de Désassemblage" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17588,6 +17597,12 @@ msgstr "" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17678,9 +17693,12 @@ msgstr "Recherche de documents" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17698,6 +17716,10 @@ msgstr "Type de document" msgid "Document Type already used as a dimension" msgstr "" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18002,7 +18024,7 @@ msgstr "Projet en double avec tâches" msgid "Duplicate Sales Invoices found" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18122,8 +18144,8 @@ msgstr "ID utilisateur ERPNext" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18346,7 +18368,7 @@ msgstr "" msgid "Email Sent to Supplier {0}" msgstr "E-mail envoyé au fournisseur {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18536,7 +18558,7 @@ msgstr "" msgid "Employee cannot report to himself." msgstr "L'employé ne peut pas rendre de compte à lui-même." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "Employé requis" @@ -18544,7 +18566,7 @@ msgstr "Employé requis" msgid "Employee is required while issuing Asset {0}" msgstr "L'employé est requis lors de l'émission de l'actif {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18557,7 +18579,7 @@ msgstr "" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "Employé {0} introuvable" @@ -18600,7 +18622,7 @@ msgstr "Activer la planification des rendez-vous" msgid "Enable Auto Email" msgstr "Activer la messagerie automatique" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "Activer la re-commande automatique" @@ -19198,7 +19220,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "Erreur: {0} est un champ obligatoire" @@ -19244,7 +19266,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "" @@ -19273,7 +19295,7 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "Rôle d'approbateur de budget exceptionnel" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19632,7 +19654,7 @@ msgstr "Valeur Attendue Après Utilisation Complète" msgid "Expense" msgstr "Charges" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "Compte de Charge / d'Écart ({0}) doit être un Compte «de Résultat»" @@ -19680,7 +19702,7 @@ msgstr "Compte de Charge / d'Écart ({0}) doit être un Compte «de Résultat»" msgid "Expense Account" msgstr "Compte de Charge" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "Compte de dépenses manquant" @@ -20143,7 +20165,7 @@ msgstr "Filtrer les totaux pour les qtés égales à zéro" msgid "Filter by Reference Date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20473,7 +20495,7 @@ msgstr "Entrepôt de produits finis" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20568,7 +20590,7 @@ msgstr "Le régime fiscal est obligatoire, veuillez définir le régime fiscal d msgid "Fiscal Year" msgstr "Exercice fiscal" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20632,7 +20654,7 @@ msgstr "Compte d'Actif Immobilisé" msgid "Fixed Asset Defaults" msgstr "" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "Un Article Immobilisé doit être un élément non stocké." @@ -20782,7 +20804,7 @@ msgstr "Pour la Société" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20813,7 +20835,7 @@ msgstr "Pour la Liste de Prix" msgid "For Production" msgstr "Pour la Production" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "Pour Quantité (Qté Produite) est obligatoire" @@ -20897,6 +20919,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20918,7 +20946,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -20927,7 +20955,7 @@ msgstr "" msgid "For reference" msgstr "Pour référence" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "Pour la ligne {0} dans {1}. Pour inclure {2} dans le prix de l'article, les lignes {3} doivent également être incluses" @@ -20951,7 +20979,7 @@ msgstr "Pour la condition "Appliquer la règle à l'autre", le champ { 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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -20960,7 +20988,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -21573,7 +21601,7 @@ msgstr "" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21585,7 +21613,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "Écriture GL" @@ -22100,7 +22128,7 @@ msgstr "Les marchandises en transit" msgid "Goods Transferred" msgstr "Marchandises transférées" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "Les marchandises sont déjà reçues pour l'entrée sortante {0}" @@ -22283,7 +22311,7 @@ msgstr "" msgid "Grant Commission" msgstr "Eligible aux commissions" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "Plus grand que le montant" @@ -22924,10 +22952,10 @@ msgstr "A quelle fréquence ?" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23082,7 +23110,7 @@ msgstr "" msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "Si ce champ est vide, le compte d'entrepôt parent ou la valeur par défaut de la société sera pris en compte dans les transactions" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23264,7 +23292,7 @@ msgstr "" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23436,11 +23464,11 @@ msgstr "" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "Si cet article a des variantes, alors il ne peut pas être sélectionné dans les commandes clients, etc." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "Si cette option est configurée «Oui», ERPNext vous empêchera de créer une facture d'achat ou un reçu sans créer d'abord une Commande d'Achat. Cette configuration peut être remplacée pour un fournisseur particulier en cochant la case «Autoriser la création de facture d'achat sans commmande d'achat» dans la fiche fournisseur." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "Si cette option est configurée «Oui», ERPNext vous empêchera de créer une facture d'achat sans créer d'abord un reçu d'achat. Cette configuration peut être remplacée pour un fournisseur particulier en cochant la case "Autoriser la création de facture d'achat sans reçu d'achat" dans la fiche fournisseur." @@ -23556,7 +23584,7 @@ msgstr "" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23608,7 +23636,7 @@ msgstr "" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "" @@ -23651,7 +23679,7 @@ msgstr "Ignorer les chevauchements de temps des stations de travail" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23665,6 +23693,7 @@ msgid "Implementation Partner" msgstr "" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24018,7 +24047,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24272,7 +24301,7 @@ msgstr "Equilibre des quantités aprés une transaction" msgid "Incorrect Batch Consumed" msgstr "" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" @@ -24280,7 +24309,7 @@ msgstr "" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "" @@ -24490,14 +24519,14 @@ msgstr "Initié" msgid "Inspected By" msgstr "Inspecté Par" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "Inspection obligatoire" @@ -24514,7 +24543,7 @@ msgstr "Inspection Requise à l'expedition" msgid "Inspection Required before Purchase" msgstr "Inspection Requise à la réception" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "" @@ -24596,8 +24625,8 @@ msgstr "Permissions insuffisantes" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "Stock insuffisant" @@ -24817,7 +24846,7 @@ msgstr "" msgid "Internal Work History" msgstr "Historique de Travail Interne" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -24910,7 +24939,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -24940,7 +24969,7 @@ msgstr "" msgid "Invalid Item" msgstr "Élément non valide" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "" @@ -25026,12 +25055,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "Prix de vente invalide" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25068,7 +25097,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "Motif perdu non valide {0}, veuillez créer un nouveau motif perdu" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Masque de numérotation non valide (. Manquante) pour {0}" @@ -25197,7 +25226,6 @@ msgstr "Annulation de facture" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "Date de la Facture" @@ -25218,10 +25246,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "Total général de la facture" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25743,13 +25767,13 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "Une Commande d'Achat est-il requis pour la création de factures d'achat et de reçus?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "Un reçu d'achat est-il requis pour la création d'une facture d'achat?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -26021,7 +26045,7 @@ msgstr "Tickets" msgid "Issuing Date" msgstr "Date d'émission" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" @@ -26091,7 +26115,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26138,6 +26162,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26153,7 +26178,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26917,6 +26941,7 @@ msgstr "Fabricant d'Article" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26927,7 +26952,6 @@ msgstr "Fabricant d'Article" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27187,11 +27211,11 @@ msgstr "Paramètres de Variante d'Article" msgid "Item Variant {0} already exists with same attributes" msgstr "La Variante de l'Article {0} existe déjà avec les mêmes caractéristiques" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "Variantes d'article mises à jour" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "" @@ -27230,6 +27254,15 @@ msgstr "Spécification de l'Article sur le Site Web" msgid "Item Weight Details" msgstr "Détails du poids de l'article" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27259,7 +27292,7 @@ msgstr "Détail des Taxes par Article" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27279,11 +27312,11 @@ msgstr "" msgid "Item and Warranty Details" msgstr "Détails de l'Article et de la Garantie" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "L'élément de la ligne {0} ne correspond pas à la demande de matériel" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "L'article a des variantes." @@ -27313,7 +27346,7 @@ msgstr "Opération de l'article" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27332,10 +27365,14 @@ msgstr "" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "La variante de l'article {0} existe avec les mêmes caractéristiques" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27349,7 +27386,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "Article {0} n'existe pas" @@ -27357,7 +27394,7 @@ msgstr "Article {0} n'existe pas" msgid "Item {0} does not exist in the system or has expired" msgstr "L'article {0} n'existe pas dans le système ou a expiré" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "Article {0} n'existe pas." @@ -27373,15 +27410,15 @@ msgstr "L'article {0} a déjà été retourné" msgid "Item {0} has been disabled" msgstr "L'article {0} a été désactivé" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "L'article {0} a atteint sa fin de vie le {1}" @@ -27393,19 +27430,23 @@ msgstr "L'article {0} est ignoré puisqu'il n'est pas en stock" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "Article {0} est annulé" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "Article {0} est désactivé" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "L'article {0} n'est pas un article avec un numéro de série" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "Article {0} n'est pas un article stocké" @@ -27413,7 +27454,11 @@ msgstr "Article {0} n'est pas un article stocké" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "L'article {0} n’est pas actif ou sa fin de vie a été atteinte" @@ -27429,7 +27474,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "L'article {0} doit être un article hors stock" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27445,7 +27490,7 @@ msgstr "L'article {0} : Qté commandée {1} ne peut pas être inférieure à la msgid "Item {0}: {1} qty produced. " msgstr "Article {0}: {1} quantité produite." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "" @@ -27555,7 +27600,7 @@ msgstr "Articles pour demande de matière première" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -28188,7 +28233,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "La dernière transaction de stock pour l'article {0} dans l'entrepôt {1} a eu lieu le {2}." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28466,7 +28511,7 @@ msgstr "" msgid "Length (cm)" msgstr "Longueur (cm)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "Moins que le montant" @@ -28607,7 +28652,7 @@ msgstr "Factures liées" msgid "Linked Location" msgstr "Lieu lié" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "" @@ -29002,11 +29047,6 @@ msgstr "" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "Maintenir les même prix tout au long du cycle d'achat" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29018,6 +29058,11 @@ msgstr "Maintenir Stock" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29214,7 +29259,7 @@ msgid "Major/Optional Subjects" msgstr "Sujets Principaux / En Option" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29383,8 +29428,8 @@ msgstr "" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29443,8 +29488,8 @@ msgstr "La saisie manuelle ne peut pas être créée! Désactivez la saisie auto #: 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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29593,7 +29638,7 @@ msgstr "Date de production" msgid "Manufacturing Manager" msgstr "Responsable de Production" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "Quantité de production obligatoire" @@ -29869,7 +29914,7 @@ msgstr "Consommation de matériel" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "Consommation de matériaux pour la production" @@ -29940,6 +29985,7 @@ msgstr "Réception Matériel" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30046,11 +30092,11 @@ msgstr "Article du plan de demande de matériel" msgid "Material Request Type" msgstr "Type de Demande de Matériel" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "Demande de matériel non créée, car la quantité de matières premières est déjà disponible." @@ -30165,7 +30211,7 @@ msgstr "Matériel Transféré pour la Production" msgid "Material Transferred for Manufacturing" msgstr "Matériel Transféré pour la Production" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30294,11 +30340,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "Maximum d'échantillons - {0} peut être conservé pour le lot {1} et l'article {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "Nombre maximum d'échantillons - {0} ont déjà été conservés pour le lot {1} et l'article {2} dans le lot {3}." @@ -30742,11 +30788,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "Charges Diverses" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "" @@ -30784,7 +30830,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "" @@ -30792,11 +30838,11 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30840,10 +30886,6 @@ msgstr "" msgid "Mixed Conditions" msgstr "Conditions mixtes" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "" - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31112,7 +31154,7 @@ msgstr "" msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "Plusieurs Exercices existent pour la date {0}. Veuillez définir la société dans l'Exercice" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31191,27 +31233,20 @@ msgstr "" msgid "Naming Series Prefix" msgstr "Préfix du masque de numérotation" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "Nom de série et Tarifs" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31259,16 +31294,16 @@ msgstr "Analyse des besoins" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "Quantité Négative n'est pas autorisée" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "Taux de Valorisation Négatif n'est pas autorisé" @@ -31882,7 +31917,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "Aucune autorisation" @@ -31895,7 +31930,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "" @@ -31940,7 +31975,7 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "Pas d’écritures comptables pour les entrepôts suivants" @@ -31953,7 +31988,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "Aucune nomenclature active trouvée pour l'article {0}. La livraison par numéro de série ne peut pas être assurée" @@ -31965,7 +32000,7 @@ msgstr "" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -31973,7 +32008,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32067,7 +32102,7 @@ msgstr "" msgid "No more children on Right" msgstr "" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32242,7 +32277,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32334,7 +32369,7 @@ msgstr "" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "Aucun des Articles n’a de changement en quantité ou en valeur." @@ -32438,7 +32473,7 @@ msgstr "" msgid "Not authorized to edit frozen Account {0}" msgstr "Vous n'êtes pas autorisé à modifier le compte gelé {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32484,7 +32519,7 @@ msgstr "Remarque : Écriture de Paiement ne sera pas créée car le compte 'Comp msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "Remarque : Ce Centre de Coûts est un Groupe. Vous ne pouvez pas faire des écritures comptables sur des groupes." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -32961,7 +32996,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33112,7 +33147,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "Ouverture" @@ -33271,16 +33306,16 @@ msgstr "" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Stock d'Ouverture" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33637,7 +33672,7 @@ msgstr "Facultatif. Ce paramètre sera utilisé pour filtrer différentes transa msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33771,7 +33806,7 @@ msgstr "Quantité Commandée" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "Commandes" @@ -33979,7 +34014,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34037,7 +34072,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34055,7 +34090,7 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "" @@ -34298,7 +34333,6 @@ msgstr "Champ POS" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "Facture PDV" @@ -34569,7 +34603,7 @@ msgstr "Article Emballé" msgid "Packed Items" msgstr "Articles Emballés" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -35017,7 +35051,7 @@ msgstr "Partiellement reçu" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35153,7 +35187,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35279,7 +35313,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35365,7 +35399,7 @@ msgstr "Restriction d'article disponible" #: 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:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35668,7 +35702,6 @@ msgstr "Écritures de Paiement {0} ne sont pas liées" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35926,7 +35959,7 @@ msgstr "Références de Paiement" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36005,10 +36038,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37028,7 +37057,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "Veuillez définir un groupe de fournisseurs par défaut dans les paramètres d'achat." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "" @@ -37060,11 +37089,11 @@ msgstr "Veuillez ajouter un compte d'ouverture temporaire dans le plan comptable msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "" @@ -37084,7 +37113,7 @@ msgstr "Veuillez ajouter le compte à la société au niveau racine - {}" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -37191,7 +37220,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "Veuillez créer un reçu d'achat ou une facture d'achat pour l'article {0}" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "" @@ -37260,11 +37289,11 @@ msgstr "Veuillez entrez un Compte pour le Montant de Change" msgid "Please enter Approving Role or Approving User" msgstr "Veuillez entrer un Rôle Approbateur ou un Rôle Utilisateur" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "Veuillez entrer un Centre de Coûts" @@ -37276,7 +37305,7 @@ msgstr "Entrez la Date de Livraison" msgid "Please enter Employee Id of this sales person" msgstr "Veuillez entrer l’ID Employé de ce commercial" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "Veuillez entrer un Compte de Charges" @@ -37321,7 +37350,7 @@ msgstr "Veuillez entrer la date de Référence" msgid "Please enter Root Type for account- {0}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "" @@ -37398,7 +37427,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "Veuillez d'abord saisir le numéro de téléphone" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37512,12 +37541,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "Veuillez sélectionner le type de modèle pour télécharger le modèle" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "Veuillez sélectionnez Appliquer Remise Sur" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "Veuillez sélectionner la nomenclature pour l'article {0}" @@ -37533,13 +37562,13 @@ msgstr "" msgid "Please select Category first" msgstr "Veuillez d’abord sélectionner une Catégorie" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "Veuillez d’abord sélectionner le Type de Facturation" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "Veuillez sélectionner une Société" @@ -37548,7 +37577,7 @@ msgstr "Veuillez sélectionner une Société" msgid "Please select Company and Posting Date to getting entries" msgstr "Veuillez sélectionner la société et la date de comptabilisation pour obtenir les écritures" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "Veuillez d’abord sélectionner une Société" @@ -37597,7 +37626,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "Veuillez sélectionner la Date de Comptabilisation avant de sélectionner le Tiers" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "Veuillez d’abord sélectionner la Date de Comptabilisation" @@ -37605,11 +37634,11 @@ msgstr "Veuillez d’abord sélectionner la Date de Comptabilisation" msgid "Please select Price List" msgstr "Veuillez sélectionner une Liste de Prix" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "Veuillez sélectionner Qté par rapport à l'élément {0}" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "Veuillez d'abord définir un entrepôt de stockage des échantillons dans les paramètres de stock" @@ -37662,7 +37691,7 @@ msgstr "" msgid "Please select a Supplier" msgstr "Veuillez sélectionner un fournisseur" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "" @@ -37723,7 +37752,7 @@ msgstr "Veuillez sélectionner une ligne pour créer une écriture de recomptabi msgid "Please select a supplier for fetching payments." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37743,7 +37772,7 @@ msgstr "" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37850,7 +37879,7 @@ msgstr "" msgid "Please select weekly off day" msgstr "Veuillez sélectionnez les jours de congé hebdomadaires" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "Veuillez d’abord sélectionner {0}" @@ -37990,7 +38019,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -38034,7 +38063,7 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "Veuillez définir l'UdM par défaut dans les paramètres de stock" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" @@ -38153,7 +38182,7 @@ msgstr "" msgid "Please specify at least one attribute in the Attributes table" msgstr "Veuillez spécifier au moins un attribut dans la table Attributs" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "Veuillez spécifier la Quantité, le Taux de Valorisation ou les deux" @@ -38324,7 +38353,7 @@ msgstr "Publié le" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38349,7 +38378,7 @@ msgstr "Publié le" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38464,7 +38493,7 @@ msgstr "" msgid "Posting Time" msgstr "Heure de Publication" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "La Date et l’heure de comptabilisation sont obligatoires" @@ -38643,6 +38672,12 @@ msgstr "Maintenance préventive" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -38936,7 +38971,9 @@ msgstr "Des dalles de prix ou de remise de produit sont requises" msgid "Price per Unit (Stock UOM)" msgstr "Prix unitaire (Stock UdM)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40291,6 +40328,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40327,6 +40365,12 @@ msgstr "Avance sur Facture d’Achat" msgid "Purchase Invoice Item" msgstr "Article de la Facture d'Achat" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40378,6 +40422,7 @@ msgstr "Factures d'achat" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40387,7 +40432,7 @@ msgstr "Factures d'achat" #: 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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40504,7 +40549,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "La Commande d'Achat {0} n’est pas soumise" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "Acheter en ligne" @@ -40567,6 +40612,7 @@ msgstr "Liste des Prix d'Achat" #: 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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40581,7 +40627,7 @@ msgstr "Liste des Prix d'Achat" msgid "Purchase Receipt" msgstr "Reçu d’Achat" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40847,7 +40893,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41435,7 +41480,7 @@ msgstr "Examen de la qualité" msgid "Quality Review Objective" msgstr "Objectif de revue de qualité" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41496,7 +41541,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41690,7 +41735,7 @@ msgstr "Chaîne de caractères du lien de requête" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "Écriture Rapide dans le Journal" @@ -41745,7 +41790,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41908,7 +41953,6 @@ msgstr "Créé par (Email)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42318,8 +42362,8 @@ msgstr "" msgid "Raw SQL" msgstr "" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42727,11 +42771,10 @@ msgstr "" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43255,7 +43298,7 @@ msgstr "" msgid "Rejected Warehouse" msgstr "Entrepôt Rejeté" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "" @@ -43305,7 +43348,7 @@ msgid "Remaining Balance" msgstr "Solde restant" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43359,7 +43402,7 @@ msgstr "Remarque" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43398,7 +43441,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "Les articles avec aucune modification de quantité ou de valeur ont étés retirés." @@ -43802,6 +43845,7 @@ msgstr "Demande de Renseignements" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44075,7 +44119,7 @@ msgstr "" msgid "Reserved" msgstr "Réservé" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44688,7 +44732,7 @@ msgstr "" msgid "Reversal Of" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "Ecriture de journal de contre-passation" @@ -44837,10 +44881,7 @@ msgstr " Rôle autorisé à dépasser cette limite" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "Rôle autorisé à outrepasser l'action Stop" @@ -44855,8 +44896,11 @@ msgstr "Rôle autorisé à contourner la limite de crédit" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45057,8 +45101,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -45085,11 +45129,11 @@ msgstr "Nom d'acheminement" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "Ligne # {0} : Vous ne pouvez pas retourner plus de {1} pour l’Article {2}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45115,7 +45159,7 @@ msgstr "Row # {0} (Table de paiement): le montant doit être négatif" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "Ligne #{0} (Table de paiement): Le montant doit être positif" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "" @@ -45316,7 +45360,7 @@ msgstr "Ligne # {0}: entrée en double dans les références {1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "Ligne {0}: la date de livraison prévue ne peut pas être avant la date de commande" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -45376,7 +45420,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "Ligne n ° {0}: élément ajouté" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45404,7 +45448,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "Ligne # {0}: l'article {1} n'est pas un article sérialisé / en lot. Il ne peut pas avoir de numéro de série / de lot contre lui." @@ -45457,7 +45501,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "Ligne n ° {0}: l'opération {1} n'est pas terminée pour {2} quantité de produits finis dans l'ordre de fabrication {3}. Veuillez mettre à jour le statut de l'opération via la carte de travail {4}." @@ -45482,7 +45526,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Ligne #{0} : Veuillez sélectionner l'entrepôt de sous-assemblage" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "Ligne #{0} : Veuillez définir la quantité de réapprovisionnement" @@ -45508,15 +45552,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45547,11 +45591,11 @@ msgstr "" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "Ligne #{0} : Type de Document de Référence doit être une Commande d'Achat, une Facture d'Achat ou une Écriture de Journal" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "Ligne n ° {0}: le type de document de référence doit être l'un des suivants: Commande client, facture client, écriture de journal ou relance" @@ -45594,7 +45638,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "Ligne # {0}: le numéro de série {1} n'appartient pas au lot {2}" @@ -45642,11 +45686,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45699,11 +45743,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "Ligne n ° {0}: le lot {1} a déjà expiré." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "" @@ -45731,7 +45775,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "Ligne #{0}: Vous ne pouvez pas utiliser la dimension de stock '{1}' dans l'inventaire pour modifier la quantité ou le taux de valorisation. L'inventaire avec les dimensions du stock est destiné uniquement à effectuer les écritures d'ouverture." @@ -45767,23 +45811,23 @@ msgstr "" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "Ligne #{idx} : {field_label} ne peut pas être négatif pour l’article {item_code}." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45791,7 +45835,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45856,7 +45900,7 @@ msgstr "Rangée #{}: {}" msgid "Row #{}: {} {} does not exist." msgstr "Ligne n ° {}: {} {} n'existe pas." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" @@ -45872,7 +45916,7 @@ msgstr "Ligne {0}: l'opération est requise pour l'article de matière première msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -45904,7 +45948,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:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -45962,7 +46006,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "Ligne {0} : Le Taux de Change est obligatoire" @@ -46003,7 +46047,7 @@ msgstr "Ligne {0} : Heure de Début et Heure de Fin obligatoires." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "Ligne {0} : Heure de Début et Heure de Fin de {1} sont en conflit avec {2}" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -46127,7 +46171,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "Ligne {0}: quantité non disponible pour {4} dans l'entrepôt {1} au moment de la comptabilisation de l'entrée ({2} {3})." @@ -46139,11 +46183,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:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "Ligne {0}: l'article sous-traité est obligatoire pour la matière première {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -46167,7 +46211,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:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46220,7 +46264,7 @@ msgstr "" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "Ligne {1}: la quantité ({0}) ne peut pas être une fraction. Pour autoriser cela, désactivez «{2}» dans UdM {3}." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -46250,7 +46294,7 @@ msgstr "Les lignes associées aux mêmes codes comptables seront fusionnées dan msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "Des lignes avec des dates d'échéance en double dans les autres lignes ont été trouvées : {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" @@ -46316,7 +46360,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46613,7 +46657,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46787,7 +46831,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46910,8 +46954,8 @@ msgstr "Commande Client requise pour l'Article {0}" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47322,7 +47366,7 @@ msgstr "Même article" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "" @@ -47359,7 +47403,7 @@ msgstr "Entrepôt de stockage des échantillons" msgid "Sample Size" msgstr "Taille de l'Échantillon" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "La quantité d'échantillon {0} ne peut pas dépasser la quantité reçue {1}" @@ -47648,7 +47692,7 @@ msgstr "" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47793,7 +47837,7 @@ msgstr "Sélectionner une Marque ..." msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "Sélectionnez une entreprise" @@ -48488,7 +48532,7 @@ msgstr "" msgid "Serial No Reserved" msgstr "" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48549,7 +48593,7 @@ msgstr "" msgid "Serial No is mandatory for Item {0}" msgstr "N° de Série est obligatoire pour l'Article {0}" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "" @@ -48835,7 +48879,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48861,7 +48905,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49259,12 +49303,6 @@ msgstr "Définir le magasin cible" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "" @@ -49370,6 +49408,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "" @@ -49868,7 +49912,7 @@ msgstr "Afficher les soldes dans le plan comptable" msgid "Show Barcode Field in Stock Transactions" msgstr "Afficher le champ Code Barre dans les transactions de stock" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "Afficher les entrées annulées" @@ -49876,7 +49920,7 @@ msgstr "Afficher les entrées annulées" msgid "Show Completed" msgstr "Montrer terminé" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -49959,7 +50003,7 @@ msgstr "Afficher les bons de livraison liés" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "" @@ -49971,7 +50015,7 @@ msgstr "" msgid "Show Open" msgstr "Afficher ouverte" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "Afficher les entrées d'ouverture" @@ -49984,11 +50028,6 @@ msgstr "" msgid "Show Operations" msgstr "Afficher Opérations" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "Afficher les détails du paiement" @@ -50004,7 +50043,7 @@ msgstr "Afficher le calendrier de paiement dans Imprimer" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "" @@ -50071,6 +50110,11 @@ msgstr "Afficher uniquement les points de vente" msgid "Show only the Immediate Upcoming Term" msgstr "" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "" @@ -50357,11 +50401,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50427,7 +50471,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "Les localisations source et cible ne peuvent pas être identiques" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "L'entrepôt source et destination ne peuvent être similaire dans la ligne {0}" @@ -50441,8 +50485,8 @@ msgid "Source of Funds (Liabilities)" msgstr "Source des Fonds (Passif)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "Entrepôt source est obligatoire à la ligne {0}" @@ -50607,8 +50651,8 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "Vente standard" @@ -50941,7 +50985,7 @@ msgstr "" msgid "Stock Details" msgstr "Détails du Stock" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -51212,7 +51256,7 @@ msgstr "Stock Reçus Mais Non Facturés" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51224,7 +51268,7 @@ msgstr "Réconciliation du Stock" msgid "Stock Reconciliation Item" msgstr "Article de Réconciliation du Stock" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "Rapprochements des stocks" @@ -51262,7 +51306,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51290,7 +51334,7 @@ msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "" @@ -51672,7 +51716,7 @@ msgstr "Un ordre de fabrication arrêté ne peut être annulé, Re-démarrez le #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "Magasins" @@ -51750,10 +51794,6 @@ msgstr "" msgid "Sub Procedure" msgstr "Sous-procédure" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -51970,7 +52010,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -51996,7 +52036,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "" @@ -52085,7 +52125,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "" @@ -52260,7 +52300,7 @@ msgstr "Réconcilié avec succès" msgid "Successfully Set Supplier" msgstr "Fournisseur défini avec succès" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "" @@ -52416,6 +52456,7 @@ msgstr "Qté Fournie" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52457,8 +52498,8 @@ msgstr "Qté Fournie" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52506,6 +52547,12 @@ msgstr "Adresses et contacts des fournisseurs" msgid "Supplier Contact" msgstr "Contact fournisseur" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52600,7 +52647,7 @@ msgstr "Date de la Facture du Fournisseur" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "N° de Facture du Fournisseur" @@ -52880,19 +52927,10 @@ msgstr "" msgid "Supplier {0} not found in {1}" msgstr "Fournisseur {0} introuvable dans {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Fournisseur(s)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "Analyse des Ventes par Fournisseur" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -52954,7 +52992,7 @@ msgstr "Équipe de Support" msgid "Support Tickets" msgstr "Ticket d'assistance" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53213,8 +53251,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "L’Entrepôt cible est obligatoire pour la ligne {0}" @@ -53682,7 +53720,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "Montant Taxable" @@ -53843,7 +53881,7 @@ msgstr "Taxes et Frais Déductibles" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "Taxes et Frais Déductibles (Devise Société)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "" @@ -54033,7 +54071,6 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54225,7 +54262,7 @@ msgstr "L'accès à la demande de devis du portail est désactivé. Pour autoris msgid "The BOM which will be replaced" msgstr "La nomenclature qui sera remplacée" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54269,7 +54306,7 @@ msgstr "Le délai de paiement à la ligne {0} est probablement un doublon." 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 "Une liste de prélèvement avec une écriture de réservation de stock ne peut être modifié. Si vous souhaitez la modifier, nous recommandons d'annuler l'écriture de réservation de stock et avant de modifier la liste de prélèvement." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54285,7 +54322,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "" @@ -54321,7 +54358,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54427,7 +54464,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "Les attributs supprimés suivants existent dans les variantes mais pas dans le modèle. Vous pouvez supprimer les variantes ou conserver le ou les attributs dans le modèle." @@ -54471,15 +54508,15 @@ msgstr "Le jour de vacances {0} n’est pas compris entre la Date Initiale et la msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54635,7 +54672,7 @@ msgstr "Les actions n'existent pas pour {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "Le stock a été réservé pour les articles et entrepôts suivants, annulez-le pour {0} l'inventaire:

{1}" @@ -54657,11 +54694,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "La tâche a été mise en file d'attente en tant que tâche en arrière-plan. En cas de problème de traitement en arrière-plan, le système ajoute un commentaire concernant l'erreur sur ce rapprochement des stocks et revient au stade de brouillon." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -54733,7 +54770,7 @@ msgstr "Le {0} ({1}) doit être égal à {2} ({3})" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54786,7 +54823,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54830,7 +54867,7 @@ msgstr "Aucun lot trouvé pour {0}: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54886,11 +54923,11 @@ msgstr "Cet article est une Variante de {0} (Modèle)." msgid "This Month's Summary" msgstr "Résumé Mensuel" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55691,7 +55728,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "Pour inclure la taxe de la ligne {0} dans le prix de l'Article, les taxes des lignes {1} doivent également être incluses" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "Pour fusionner, les propriétés suivantes doivent être les mêmes pour les deux articles" @@ -55726,7 +55763,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "" @@ -55877,7 +55914,7 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Montant total" @@ -56300,7 +56337,7 @@ msgstr "Le montant total de la demande de paiement ne peut être supérieur à { msgid "Total Payments" msgstr "Total des paiements" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56332,7 +56369,7 @@ msgstr "Coût d'Achat Total (via Facture d'Achat)" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Qté Totale" @@ -56718,7 +56755,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56729,7 +56766,7 @@ msgstr "" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "Devise de la Transaction" @@ -57401,11 +57438,11 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57477,7 +57514,7 @@ msgstr "Facteur de conversion de l'UdM est obligatoire dans la ligne {0}" msgid "UOM Name" msgstr "Nom UdM" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57553,7 +57590,7 @@ msgstr "Impossible de trouver un score démarrant à {0}. Vous devez avoir des s msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "" @@ -57672,7 +57709,7 @@ msgstr "Unité de mesure" msgid "Unit of Measure (UOM)" msgstr "Unité de mesure (UdM)" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "Unité de Mesure {0} a été saisie plus d'une fois dans la Table de Facteur de Conversion" @@ -57792,10 +57829,9 @@ msgid "Unreconcile Transaction" msgstr "" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "Non réconcilié" @@ -57818,10 +57854,6 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57867,7 +57899,7 @@ msgstr "Non programmé" msgid "Unsecured Loans" msgstr "Prêts non garantis" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58082,12 +58114,6 @@ msgstr "Mettre à Jour le Stock" msgid "Update Type" msgstr "Type de mise à jour" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58128,7 +58154,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "Mise à jour des variantes ..." @@ -58586,12 +58612,6 @@ msgstr "Valider la règle appliquée" msgid "Validate Components and Quantities Per BOM" msgstr "" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58615,6 +58635,12 @@ msgstr "" msgid "Validate Stock on Save" msgstr "" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58721,11 +58747,11 @@ msgstr "Taux de valorisation manquant" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "Le taux de valorisation de l'article {0} est requis pour effectuer des écritures comptables pour {1} {2}." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "Le Taux de Valorisation est obligatoire si un Stock Initial est entré" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "Taux de valorisation requis pour le poste {0} à la ligne {1}" @@ -58735,7 +58761,7 @@ msgstr "Taux de valorisation requis pour le poste {0} à la ligne {1}" msgid "Valuation and Total" msgstr "Valorisation et Total" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "" @@ -58885,7 +58911,7 @@ msgstr "" msgid "Variant" msgstr "Variante" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "Erreur d'attribut de variante" @@ -58904,7 +58930,7 @@ msgstr "Variante de nomenclature" msgid "Variant Based On" msgstr "Variante Basée Sur" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "Les variantes basées sur ne peuvent pas être modifiées" @@ -58922,7 +58948,7 @@ msgstr "Champ de Variante" msgid "Variant Item" msgstr "Élément de variante" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "Articles de variante" @@ -59303,7 +59329,7 @@ msgstr "Nom du bon" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59343,7 +59369,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "" @@ -59375,7 +59401,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59610,7 +59636,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "" @@ -59657,7 +59683,7 @@ msgstr "Les entrepôts avec des transactions existantes ne peuvent pas être con #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59713,6 +59739,12 @@ msgstr "Avertir lors d'une nouvelle Demande de Devis" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" @@ -59896,7 +59928,7 @@ msgstr "Spécifications du Site Web" msgid "Website:" msgstr "Site Web:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60270,7 +60302,7 @@ msgstr "" msgid "Work Order Item" msgstr "Article d'ordre de fabrication" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60332,11 +60364,11 @@ msgstr "Ordre de fabrication non créé" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "Bon de travail {0}: carte de travail non trouvée pour l'opération {1}" @@ -60652,11 +60684,11 @@ msgstr "Nom de l'Année" msgid "Year Start Date" msgstr "Date de Début de l'Exercice" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60709,7 +60741,7 @@ msgstr "Vous pouvez également copier-coller ce lien dans votre navigateur" msgid "You can also set default CWIP account in Company {}" msgstr "Vous pouvez également définir le compte CWIP par défaut dans Entreprise {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60863,6 +60895,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60891,7 +60927,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60899,7 +60935,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "Vous devez activer la re-commande automatique dans les paramètres de stock pour maintenir les niveaux de ré-commande." @@ -60970,8 +61006,11 @@ msgstr "" msgid "Zero quantity" msgstr "" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61083,7 +61122,7 @@ msgstr "" msgid "fieldname" msgstr "nom du Champ" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61301,6 +61340,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "unique, par exemple SAVE20 À utiliser pour obtenir une remise" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "" @@ -61359,7 +61402,8 @@ msgstr "Le {0} coupon utilisé est {1}. La quantité autorisée est épuisée" msgid "{0} Digest" msgstr "Résumé {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61379,7 +61423,7 @@ msgstr "{0} Opérations: {1}" msgid "{0} Request for {1}" msgstr "{0} demande de {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} Conserver l'échantillon est basé sur le lot, veuillez cocher A un numéro de lot pour conserver l'échantillon d'article" @@ -61492,7 +61536,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} est entré deux fois dans la Taxe de l'Article" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "" @@ -61660,7 +61704,7 @@ msgstr "Le paramètre {0} n'est pas valide" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} écritures de paiement ne peuvent pas être filtrées par {1}" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61673,7 +61717,7 @@ msgstr "{0} à {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" @@ -61875,7 +61919,7 @@ msgstr "{0} {1} : Compte {2} inactif" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1} : L’Écriture Comptable pour {2} peut seulement être faite en devise: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: Centre de Coûts est obligatoire pour l’Article {2}" @@ -61961,23 +62005,23 @@ msgstr "{0} : {1} n’existe pas" msgid "{0}: {1} is a group account." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} doit être inférieur à {2}" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} est annulé ou fermé." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" diff --git a/erpnext/locale/hr.po b/erpnext/locale/hr.po index 75fefbb3b49..740a77fd507 100644 --- a/erpnext/locale/hr.po +++ b/erpnext/locale/hr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-12 19:34\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:21\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Croatian\n" "MIME-Version: 1.0\n" @@ -100,15 +100,15 @@ msgstr " Podsklop" msgid " Summary" msgstr " Sažetak" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"Klijent Dostavljeni Artikal\" ne može biti Nabavni Artikal" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"Klijent Dostavljen Artikal\" ne može imati Stopu Vrednovanja" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "Ne može se poništiti izbor opcije \"Fiksna Imovina\", jer postoji zapis imovine naspram artikla" @@ -307,7 +307,7 @@ msgstr "'Od datuma' je obavezan" msgid "'From Date' must be after 'To Date'" msgstr "'Od datuma' mora biti nakon 'Do datuma'" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "'Ima Serijski Broj' ne može biti 'Da' za artikal koji nije na zalihama" @@ -343,7 +343,7 @@ msgstr "'Ažuriraj Zalihe' se ne može provjeriti jer se artikli ne isporučuju msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "'Ažuriraj Zalihe' ne može se provjeriti za prodaju osnovne Imovine" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "Račun '{0}' već koristi {1}. Koristite drugi račun." @@ -1098,7 +1098,7 @@ msgstr "Vozač mora biti naveden da bi se podnijelo." msgid "A logical Warehouse against which stock entries are made." msgstr "Logičko skladište naspram kojeg se vrše knjiženja zaliha." -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "Došlo je do sukoba imenovanja serije prilikom stvaranja serijskih brojeva. Molimo promijenite imenovanje serije za stavku {0}." @@ -1310,7 +1310,7 @@ msgstr "Pristupni ključ je potreban za davaoca usluga: {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "Prema CEFACT/ICG/2010/IC013 ili CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "Prema Sastavnici {0}, artikal '{1}' nedostaje u unosu zaliha." @@ -1980,8 +1980,8 @@ msgstr "Knjigovodstveni Unosi" msgid "Accounting Entry for Asset" msgstr "Knjigovodstveni Unos za Imovinu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "Knjigovodstveni Unos za Verifikat Obračunatih Troškova u Unosu Zaliha {0}" @@ -1989,7 +1989,7 @@ msgstr "Knjigovodstveni Unos za Verifikat Obračunatih Troškova u Unosu Zaliha msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "Knjigovodstveni Unos verifikat troškova nabave za podizvođački račun {0}" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Knjigovodstveni Unos za Servis" @@ -2002,16 +2002,16 @@ msgstr "Knjigovodstveni Unos za Servis" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Knjigovodstveni Unos za Zalihe" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "Knjigovodstveni Unos za {0}" @@ -2309,12 +2309,6 @@ msgstr "Radnja ako nije podnesena Kontrola Kvaliteta" msgid "Action If Quality Inspection Is Rejected" msgstr "Radnja ako je Kontrola Kvaliteta odbijena" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "Radnja ako se Ista Cijena ne Održava" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "Radnja je Pokrenuta" @@ -2373,6 +2367,12 @@ msgstr "Radnja ako je godišnji proračun prekoračen kumulativnim troškom" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "Radnja ako se ista stopa ne održava tijekom cijele interne transakcije" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "Radnja ako se ne održava ista stopa" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2640,7 +2640,7 @@ msgstr "Stvarno vrijeme u satima (preko rasporeda vremena)" msgid "Actual qty in stock" msgstr "Stvarna Količina na Zalihama" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "Stvarni tip PDV-a ne može se uključiti u cijenu Artikla u redu {0}" @@ -2654,7 +2654,7 @@ msgstr "Namjenska Količina" msgid "Add / Edit Prices" msgstr "Dodaj / Uredi cijene" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "Dodaj Kolone u Valuti Transakcije" @@ -2808,7 +2808,7 @@ msgstr "Dodaj Serijski / Šaržni Broj" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "Dodaj Serijski / Šaržni Broj (Odbijena Količina)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "Dodaj Prefiks Serije Imenovanja" @@ -3053,7 +3053,7 @@ msgstr "Iznos dodatnog popusta" msgid "Additional Discount Amount (Company Currency)" msgstr "Dodatni iznos popusta (Valuta Tvrtke)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "Dodatni Iznos Popusta ({discount_amount}) ne može premašiti ukupan iznos prije takvog popusta ({total_before_discount})" @@ -3342,7 +3342,7 @@ msgstr "Prilagodi Količinu" msgid "Adjustment Against" msgstr "Usaglašavanje Naspram" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "Usklađivanje na osnovu stope fakture nabavke" @@ -3455,7 +3455,7 @@ msgstr "Tip Verifikata Predujma" msgid "Advance amount" msgstr "Iznos Predujma" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Iznos Predujma ne može biti veći od {0} {1}" @@ -3524,7 +3524,7 @@ msgstr "Naspram" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Naspram Računa" @@ -3642,7 +3642,7 @@ msgstr "Naspram Fakture Dobavljača {0}" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "Naspram Verifikata" @@ -3666,7 +3666,7 @@ msgstr "Naspram Verifikata Broj" #: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "Naspram Verifikata Tipa" @@ -3947,7 +3947,7 @@ msgstr "Sva komunikacija uključujući i iznad ovoga bit će premještena u novi msgid "All items are already requested" msgstr "Svi artikli su već traženi" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "Svi Artikli su već Fakturisani/Vraćeni" @@ -3955,7 +3955,7 @@ msgstr "Svi Artikli su već Fakturisani/Vraćeni" msgid "All items have already been received" msgstr "Svi Artikli su već primljeni" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Svi Artikli su već prenesen za ovaj Radni Nalog." @@ -4004,7 +4004,7 @@ msgstr "Dodijeli" msgid "Allocate Advances Automatically (FIFO)" msgstr "Automatski Dodjeli Predujam (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Alociraj iznos uplate" @@ -4014,7 +4014,7 @@ msgstr "Alociraj iznos uplate" msgid "Allocate Payment Based On Payment Terms" msgstr "Dodjeli Plaćanje na osnovu Uslova Plaćanja" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "Dodijeli zahtjev za plaćanje" @@ -4044,7 +4044,7 @@ msgstr "Dodjeljeno" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4165,15 +4165,15 @@ msgstr "Dozvoli u Povratima" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "Dozvoli interne transfere po tržišnoj cijeni" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "Dozvoli da se Artikal doda više puta u Transakciji" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "Dozvolite da se artikal doda više puta u transakciji" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "Dopusti dodavanje artikla više puta u transakciji" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4202,12 +4202,6 @@ msgstr "Dozvoli Negativne Zalihe" msgid "Allow Negative Stock for Batch" msgstr "Dopusti negativnu zalihu za šaržu" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "Dozvolite negativne cijene za Artikle" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4420,8 +4414,11 @@ msgstr "Dozvoli viševalutne fakture naspram računa jedne stranke " msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "Dopusti više Prodajnih Nalogs naspram Nabavnog Naloga Klijenta" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "Dopusti negativne cijene za Artikle" @@ -4513,7 +4510,7 @@ msgstr "Dozvoljena Transakcija sa" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "Dozvoljene primarne uloge su 'Klijent' i 'Dobavljač'. Molimo odaberite samo jednu od ovih uloga." -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "Dopušteni posebni znakovi su '/' i '-'" @@ -4710,7 +4707,7 @@ msgstr "Uvijek Pitaj" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4740,7 +4737,6 @@ msgstr "Uvijek Pitaj" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4910,10 +4906,6 @@ msgstr "Iznos ne odgovara odabranoj transakciji" msgid "Amount in Account Currency" msgstr "Iznos u Valuti Računa" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "Iznos U Riječima" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5533,7 +5525,7 @@ msgstr "Pošto je polje {0} omogućeno, polje {1} je obavezno." msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "Pošto je polje {0} omogućeno, vrijednost polja {1} bi trebala biti veća od 1." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "Pošto postoje postojeće podnešene transakcije naspram artikla {0}, ne možete promijeniti vrijednost {1}." @@ -5683,7 +5675,7 @@ msgstr "Račun kategorije imovine" msgid "Asset Category Name" msgstr "Naziv kategorije imovine" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "Kategorija Imovine je obavezna za Artikal Fiksne Imovine" @@ -6079,7 +6071,7 @@ msgstr "Imovina {0} nije podnešena. Podnesi imovinu prije nego što nastavite." msgid "Asset {0} must be submitted" msgstr "Imovina {0} mora biti podnešena" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "Sredstvo {assets_link} stvoreno za {item_code}" @@ -6117,11 +6109,11 @@ msgstr "Imovina" msgid "Assets Setup" msgstr "Postavljanje Imovine" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "Imovina nije kreirana za {item_code}. Morat ćete kreirati Imovinu ručno." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "Sredstva {assets_link} stvorena za {item_code}" @@ -6194,7 +6186,7 @@ msgstr "U zalihi tipa {0} mora biti prisutna barem jedna sirovina" msgid "At least one row is required for a financial report template" msgstr "Za predložak financijskog izvješća potreban je barem jedan redak" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "Najmanje jedno skladište je obavezno" @@ -6226,7 +6218,7 @@ msgstr "Red {0}: Količina je obavezna za Šaržu {1}" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "Red {0}: Serijski Broj je obavezan za Artikal {1}" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "Red {0}: Serijski i Šaržni Paket {1} je već kreiran. Molimo uklonite vrijednosti iz polja serijski broj ili šarža." @@ -6290,7 +6282,11 @@ msgstr "Naziv Atributa" msgid "Attribute Value" msgstr "Vrijednost Atributa" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "Vrijednost atributa {0} nije valjana za odabrani atribut {1}." + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "Tabela Atributa je obavezna" @@ -6298,11 +6294,19 @@ msgstr "Tabela Atributa je obavezna" msgid "Attribute value: {0} must appear only once" msgstr "Vrijednost Atributa: {0} se mora pojaviti samo jednom" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "Atribut {0} je onemogućen." + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "Atribut {0} nije valjan za odabrani predložak." + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "Atribut {0} izabran više puta u Tabeli Atributa" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Atributi" @@ -6362,24 +6366,12 @@ msgstr "Ovlaštena Vrijednost" msgid "Auto Create Exchange Rate Revaluation" msgstr "Automatsko Kreiranje Revalorizacije Deviznog Kursa" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "Automatsko Kreiranje Nabavnog Računa" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "Automatsko Kreiranje Serijskog i Šarža paketa za Dostavu" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "Automatsko Kreiranje Podugovornog Naloga" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6498,6 +6490,18 @@ msgstr "Pogreška Automatskog Stvaranja Korisnika" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "Automatski zatvori Odgovoran na Mogućnost nakon broja gore navedenih dana" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "Automatsko Kreiranje Nabavnog Računa" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "Automatsko Kreiranje Podugovornog Naloga" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6715,7 +6719,7 @@ msgstr "Datum Dostupnosti za Upotrebu" msgid "Available for use date is required" msgstr "Datum dostupnosti za upotrebu je obavezan" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "Dostupna količina je {0}, potrebno vam je {1}" @@ -6814,7 +6818,7 @@ msgstr "Polovi Kjnigovodstveni Izvod" msgid "BIN Qty" msgstr "Spremnička Količina" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7087,7 +7091,7 @@ msgstr "Artikal Web Stranice Sastavnice" msgid "BOM Website Operation" msgstr "Operacija Web Stranice Sastavnice" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "Sastavnica i Količina Gotovog Proizvoda su obavezni za Rastavljanje" @@ -7178,8 +7182,8 @@ msgstr "Povrat Sirovine iz Skladišta za Posao U Toku" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "Povrati Sirovina iz Podugovora na osnovu" +msgid "Backflush raw materials of subcontract based on" +msgstr "Retroaktivno Preuzmi Sirovina od Podizvođača na temelju" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7199,7 +7203,7 @@ msgstr "Stanje" msgid "Balance (Dr - Cr)" msgstr "Stanje (Dr - Cr)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Stanje ({0})" @@ -7463,18 +7467,18 @@ msgstr "Bankovne Naknade, Plaća itd." #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/workspace_sidebar/banking.json msgid "Bank Clearance" -msgstr "Bankarsko Odobrenje" +msgstr "Bankovno Odobrenje" #. Name of a DocType #: erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json msgid "Bank Clearance Detail" -msgstr "Detalji Bankarskog Odobrenja" +msgstr "Detalji Bankovnog Odobrenja" #. Name of a report #: banking/src/pages/BankReconciliation.tsx:119 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.json msgid "Bank Clearance Summary" -msgstr "Sažetak Bankarskog Odobrenja" +msgstr "Sažetak Bankovnog Odobrenja" #. Label of the credit_balance (Check) field in DocType 'Email Digest' #: erpnext/setup/doctype/email_digest/email_digest.json @@ -7730,11 +7734,11 @@ msgstr "Bankarstvo" msgid "Barcode Type" msgstr "Barkod Tip" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "Barkod {0} se već koristi za artikal {1}" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "Barkod {0} nije važeći {1} kod" @@ -8101,12 +8105,12 @@ msgstr "Šarža {0} i Skladište" msgid "Batch {0} is not available in warehouse {1}" msgstr "Šarža {0} nije dostupna u skladištu {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "Šarža {0} artikla {1} je istekla." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "Šarža {0} artikla {1} je onemogućena." @@ -8179,8 +8183,8 @@ msgstr "Broj Fakture" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "Faktura za odbijenu količinu u Nabavnoj Fakturi" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "Račun za odbijenu količinu u Nabavnoj Fakturi" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8520,8 +8524,11 @@ msgstr "Ugovorni Nalog Artikal" msgid "Blanket Order Rate" msgstr "Cijena po Ugovornom Nalogu" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "Okvirni Nalozi" @@ -9036,7 +9043,7 @@ msgstr "Nabava & Prodaja" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "Nabava se mora provjeriti ako je Primjenjivo za odabrano kao {0}" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "Prema standard postavkama, Ime dobavljača je postavljeno prema unesenom imenu dobavljača. Ako želite da dobavljači budu imenovani po Imenovanje Serije odaberi opciju 'Imenovanje Serije'." @@ -9401,7 +9408,7 @@ msgstr "Ne može se filtrirati na osnovu broja verifikata, ako je grupiran prema msgid "Can only make payment against unbilled {0}" msgstr "Plaćanje se može izvršiti samo protiv nefakturisanog(e) {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9457,9 +9464,9 @@ msgstr "Nije moguće promijeniti Postavke Računa Zaliha" msgid "Cannot Create Return" msgstr "Nije moguće stvoriti Povrat" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "Nije moguće spojiti" @@ -9487,7 +9494,7 @@ msgstr "Nije moguće izmijeniti {0} {1}, umjesto toga kreirajte novi." msgid "Cannot apply TDS against multiple parties in one entry" msgstr "Ne može se primijeniti TDS naspram više strana u jednom unosu" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "Ne može biti artikal fiksne imovine jer je kreiran Registar Zaliha." @@ -9523,7 +9530,7 @@ msgstr "Nije moguće otkazati ovaj Unos Proizvodnih Zaliha jer količina proizve msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "Ne može se poništiti ovaj dokument jer je povezan s podnesenim Usklađavanjem Vrijednosti Imovine {0}. Poništi Usklađavanje Vrijednosti Imovine da biste nastavili." -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "Nije moguće poništiti ovaj dokument jer je povezan s poslanim materijalom {asset_link}. Za nastavak otkažite sredstvo." @@ -9531,7 +9538,7 @@ msgstr "Nije moguće poništiti ovaj dokument jer je povezan s poslanim materija msgid "Cannot cancel transaction for Completed Work Order." msgstr "Nije moguće otkazati transakciju za Završeni Radni Nalog." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "Nije moguće promijeniti atribute nakon transakcije zaliha. Napravi novi artikal i prebaci zalihe na novi artikal" @@ -9543,7 +9550,7 @@ msgstr "Nije moguće promijeniti tip referentnog dokumenta." msgid "Cannot change Service Stop Date for item in row {0}" msgstr "Nije moguće promijeniti datum zaustavljanja servisa za artikal u redu {0}" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "Ne mogu promijeniti svojstva varijante nakon transakcije zaliha. Morat ćete napraviti novi artikal da biste to učinili." @@ -9571,11 +9578,11 @@ msgstr "Nije moguće pretvoriti u Grupu jer je odabran Tip Računa." msgid "Cannot covert to Group because Account Type is selected." msgstr "Nije moguće pretvoriti u Grupu jer je odabran Tip Računa." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "Nije moguće kreirati Unose Rezervisanja Zaliha za buduće datume Nabavnih Računa." -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "Nije moguće kreirati Listu Odabira za Prodajni Nalog {0} jer ima rezervisane zalihe. Poništi rezervacije zaliha kako biste kreirali Listu Odabira." @@ -9601,7 +9608,7 @@ msgstr "Ne može se proglasiti izgubljenim, jer je Ponuda napravljena." msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "Ne može se odbiti kada je kategorija za 'Vrednovanje' ili 'Vrednovanje i Ukupno'" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "Nije moguće izbrisati red Dobitka/Gubitka Deviznog Kursa" @@ -9638,7 +9645,7 @@ msgstr "Nije moguće onemogućiti {0} jer to može dovesti do netočne procjene msgid "Cannot disassemble more than produced quantity." msgstr "Ne može se demontirati više od proizvedene količine." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "Ne može se demontirati {0} količine u odnosu na unos zaliha {1}. Samo je {2} količina dostupna za rastavljanje." @@ -9646,8 +9653,8 @@ msgstr "Ne može se demontirati {0} količine u odnosu na unos zaliha {1}. Samo msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "Nije moguće omogućiti račun zaliha po stavkama jer postoje postojeći unosi u glavnu knjigu zaliha za tvrtku {0} s računom zaliha po skladištu. Prvo otkažite transakcije zaliha i pokušajte ponovno." -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "Nije moguće osigurati dostavu serijskim brojem jer je artikal {0} dodan sa i bez Osiguraj Dostavu Serijskim Brojem." @@ -9691,7 +9698,7 @@ msgstr "Ne može se primiti od klijenta naspram negativnog nepodmirenog" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "Ne može se smanjiti količina naručene ili nabavljene količine" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9709,8 +9716,8 @@ msgstr "Nije moguće preuzeti oznaku veze. Provjerite zapisnik grešaka za više msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "Nije moguće odabrati tip grupe \"Klijent Grupa\". Odaberi klijent grupu koja nije grupa." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9726,7 +9733,7 @@ msgstr "Ne može se postaviti kao Izgubljeno pošto je Prodajni Nalog napravljen msgid "Cannot set authorization on basis of Discount for {0}" msgstr "Nije moguće postaviti autorizaciju na osnovu Popusta za {0}" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "Nije moguće postaviti više Standard Artikal Postavki za tvrtku." @@ -10637,7 +10644,7 @@ msgstr "Zatvaranje (Cr)" msgid "Closing (Dr)" msgstr "Zatvaranje (Dr)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "Zatvaranje (Otvaranje + Ukupno)" @@ -11098,7 +11105,7 @@ msgstr "Tvrtke" #: 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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11380,7 +11387,7 @@ msgstr "Tvrtka" msgid "Company Abbreviation" msgstr "Kratica Tvrtke" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "Kratica Tvrtke (potrebno je instalirati Sustav)" @@ -11393,7 +11400,7 @@ msgstr "Kratica tvrtke ne može imati više od 5 znakova" msgid "Company Account" msgstr "Račun Tvrtke" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "Račun tvrtke je obavezan" @@ -11569,7 +11576,7 @@ msgstr "Filter tvrtke nije postavljen!" msgid "Company is mandatory" msgstr "Tvrtka je obavezna" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "Tvrtka je obavezna za račun tvrtke" @@ -11840,7 +11847,7 @@ msgstr "Konfiguriraj Račune" msgid "Configure Accounts for Bank Entry" msgstr "Konfiguriraj račune za bankovni unos" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "Konfiguriraj Bankovne Račune" @@ -11853,7 +11860,9 @@ msgstr "Konfiguriši Kontni Plan" msgid "Configure Product Assembly" msgstr "Konfiguriši Proizvodnju Artikla" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "Konfiguriraj Seriju Imenovanja" @@ -11871,13 +11880,13 @@ msgstr "Konfiguriraj pravila kako biste uštedjeli vrijeme prilikom usklađivanj msgid "Configure settings for the banking module" msgstr "Konfiguriraj postavke za bankarski modul" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "Konfiguriši akciju za zaustavljanje transakcije ili samo upozorite ako se ista stopa marže ne održava." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "Konfiguriši standard Cijenik prilikom kreiranja nove transakcije Nabave. Cijene artikala se preuzimaju iz ovog Cijenika." @@ -12055,7 +12064,7 @@ msgstr "Konzumirane Komponente" msgid "Consumed" msgstr "Potrošeno" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "Potrošeni Iznos" @@ -12099,7 +12108,7 @@ msgstr "Trošak Potrošenih Artikala" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12272,10 +12281,6 @@ msgstr "Kontakt Osoba ne pripada {0}" msgid "Contact:" msgstr "Kontakt:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Kontakt: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12453,7 +12458,7 @@ msgstr "Faktor Pretvaranja" msgid "Conversion Rate" msgstr "Stopa Pretvaranja" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "Faktor pretvaranja za standard jedinicu mora biti 1 u redu {0}" @@ -12725,7 +12730,7 @@ msgstr "Raspodjela Troškova / Gubitak Procesa" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12820,7 +12825,7 @@ msgid "Cost Center is required" msgstr "Centar Troškova je obavezan" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "Centar Troškova je obavezan u redu {0} u tabeli PDV za tip {1}" @@ -13158,7 +13163,7 @@ msgstr "Kreiraj Gotove Proizvode" msgid "Create Grouped Asset" msgstr "Kreiraj Grupiranu Imovinu" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "Kreiraj Naloga Knjiženja za Inter Tvrtku" @@ -13531,7 +13536,7 @@ msgstr "Kreiraj {0} {1}?" msgid "Created By Migration" msgstr "Izrađeno Migracijom" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "Kreirano {0} tablica bodova za {1} između:" @@ -13674,15 +13679,15 @@ msgstr "Kreiranje {0} nije uspjelo.\n" msgid "Credit" msgstr "Kredit" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "Kredit (Transakcija)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "Kredit ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "Kreditni Račun" @@ -13877,7 +13882,7 @@ msgstr "Omjer Obrta Kreditora" msgid "Creditors" msgstr "Povjerioci" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "Krediti" @@ -14175,7 +14180,7 @@ msgstr "Trenutni Serijski / Šarža Paket" msgid "Current Serial No" msgstr "Trenutni Serijski Broj" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "Trenutna Serija Imenovanja" @@ -14376,7 +14381,7 @@ msgstr "Prilagođeni Razdjelnici" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15149,7 +15154,7 @@ msgstr "Datumi za Obradu" msgid "Day Of Week" msgstr "Dan u Sedmici" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "Dan u mjesecu" @@ -15265,11 +15270,11 @@ msgstr "Diler" msgid "Debit" msgstr "Debit" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "Debit (Transakcija)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "Debit ({0})" @@ -15279,7 +15284,7 @@ msgstr "Debit ({0})" msgid "Debit / Credit Note Posting Date" msgstr "Datum knjiženja Debitne / Kreditne Fakture" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "Debitni Račun" @@ -15390,7 +15395,7 @@ msgstr "Debit-Kredit je neusklađeno" msgid "Debit/Credit" msgstr "Debit/Kredit" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "Debiti" @@ -15532,7 +15537,7 @@ msgstr "Zadani Raspon Starenja" msgid "Default BOM" msgstr "Standard Sastavnica" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "Standard Sastavnica ({0}) mora biti aktivna za ovaj artikal ili njegov šablon" @@ -15889,15 +15894,15 @@ msgstr "Standard Distrikt" msgid "Default Unit of Measure" msgstr "Standard Jedinica" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "Standard Jedinica za artikal {0} ne može se promijeniti direktno jer ste već izvršili neke transakcije sa drugom Jedinicom. Morate ili otkazati povezane dokumente ili kreirati novi artikal." -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "Standard Jedinica za artikal {0} ne može se promijeniti direktno jer ste već izvršili neke transakcije sa drugom Jedinicom. Morat ćete kreirati novi artikal da biste koristili drugu Jedinicu." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "Standard Jedinica za Varijantu '{0}' mora biti ista kao u Šablonu '{1}'" @@ -16198,7 +16203,7 @@ msgstr "Dostavi sekundarne artikle" msgid "Delivered" msgstr "Dostavljeno" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Dostavljeni Iznos" @@ -16248,8 +16253,8 @@ msgstr "Isporučeni Artikli za Fakturisanje" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16260,11 +16265,11 @@ msgstr "Dostavljena Količina" msgid "Delivered Qty (in Stock UOM)" msgstr "Isporučena količina (u Jedinici Zaliha)" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "Dostavna količina se ne može povećati za više od {0} za artikal {1}" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "Dostavna količina ne može se smanjiti za više od {0} za artikal {1}" @@ -16353,7 +16358,7 @@ msgstr "Upravitelj Dostave" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16878,7 +16883,7 @@ msgstr "Razlika u kontu stavki u tablici" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "Razlika u računu mora biti račun tipa Imovina/Obveza (Privremeno otvaranje), budući da je ovaj unos zaliha početni unos" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "Račun razlike mora biti račun tipa Imovina/Obaveze, budući da je ovo usaglašavanje Zaliha Početni Unos" @@ -17042,11 +17047,9 @@ msgstr "Onemogući Kumulativni Prag" msgid "Disable In Words" msgstr "Onemogući U Riječima" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "Onemogući posljednju Cijenu Nabave" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "Onemogući Izračun Početnog Stanja" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17087,6 +17090,12 @@ msgstr "Onemogući Serijski i Šaržni Odabirač" msgid "Disable Transaction Threshold" msgstr "Onemogući Transakcijski Prag" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "Onemogući posljednju Nabavnu Cijenu" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17143,7 +17152,7 @@ msgstr "Rastavi" msgid "Disassemble Order" msgstr "Nalog Rastavljanja" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "Količina rastavljenih dijelova ne može biti manja ili jednaka 0." @@ -17668,6 +17677,12 @@ msgstr "Ne koristi Šaržno Vrijednovanje" msgid "Do Not Use Batchwise Valuation" msgstr "Ne Koristi Šaržno Vrijednovanje" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "Ne preuzimaj nabavnu cijenu iz Serijskog Broja" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17758,9 +17773,12 @@ msgstr "Pretraga Dokumenata" msgid "Document Count" msgstr "Broj Dokumenata" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "Imenovanje Dokumenata" @@ -17778,6 +17796,10 @@ msgstr "Tip Dokumenta " msgid "Document Type already used as a dimension" msgstr "Tip dokumenta se već koristi kao dimenzija" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "Dokumentacija" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18082,7 +18104,7 @@ msgstr "Kopiraj Projekt sa Zadatcima" msgid "Duplicate Sales Invoices found" msgstr "Pronađeni duplikati Prodajnih Faktura" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "Pogreška dupliciranog serijskog broja" @@ -18202,8 +18224,8 @@ msgstr "ID Korisnika" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "Sustav će napraviti unos u registar zaliha za svaku transakciju ovog artikla. Ostavite onemogućeno za artikle koji nisu na zalihi ili su usluge." -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18426,7 +18448,7 @@ msgstr "E-pošta" msgid "Email Sent to Supplier {0}" msgstr "E-pošta poslana Dobavljaču {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "Za stvaranje korisnika obavezna je e-pošta" @@ -18616,7 +18638,7 @@ msgstr "Korisnički ID Personala" msgid "Employee cannot report to himself." msgstr "Personal ne može da izvještava sam sebe." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "Potreban je Personal" @@ -18624,7 +18646,7 @@ msgstr "Potreban je Personal" msgid "Employee is required while issuing Asset {0}" msgstr "Personal je obavezan prilikom izdavanja Imovine {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "Osoblje {0} već ima povezanog korisnika" @@ -18637,7 +18659,7 @@ msgstr "Personal {0} ne pripada {1}" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "{0} trenutno radi na drugoj radnoj stanici. Dodijeli drugi personal." -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "Personal {0} nije pronađen" @@ -18680,7 +18702,7 @@ msgstr "Omogući Zakazivanje Termina" msgid "Enable Auto Email" msgstr "Omogući Automatsku e-poštu" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "Omogući Automatsku Ponovnu Naložbu" @@ -19286,7 +19308,7 @@ msgstr "Greška: Ova imovina već ima {0} periode amortizacije.\n" "\t\t\t\t\tDatum `početka amortizacije` mora biti najmanje {1} perioda nakon datuma `dostupno za upotrebu`.\n" "\t\t\t\t\tMolimo ispravite datume u skladu s tim." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "Greška: {0} je obavezno polje" @@ -19332,7 +19354,7 @@ msgstr "Iz Fabrike" msgid "Example URL" msgstr "Primjer URL-a" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "Primjer povezanog dokumenta: {0}" @@ -19362,7 +19384,7 @@ msgstr "Primjer: Serijski Broj {0} je rezervisan u {1}." msgid "Exception Budget Approver Role" msgstr "Uloga Odobravatelja Izuzetka Proračuna" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "Prekomjerna Demontaža" @@ -19721,7 +19743,7 @@ msgstr "Očekivana vrijednost nakon korisnog vijeka trajanja" msgid "Expense" msgstr "Troškovi" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "Račun Rashoda/ Razlike ({0}) mora biti račun 'Dobitka ili Gubitka'" @@ -19769,7 +19791,7 @@ msgstr "Račun Rashoda/ Razlike ({0}) mora biti račun 'Dobitka ili Gubitka'" msgid "Expense Account" msgstr "Račun Troškova" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "Nedostaje Račun Troškova" @@ -20232,7 +20254,7 @@ msgstr "Filtriraj gdje je ukupna količina nula" msgid "Filter by Reference Date" msgstr "Filtriraj po Referentnom Datumu" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "Filtriraj po iznosu" @@ -20562,7 +20584,7 @@ msgstr "Skladište Gotovog Proizvoda" msgid "Finished Goods based Operating Cost" msgstr "Operativni troškovi zasnovani na Gotovom Proizvodu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "Gotov Proizvod {0} ne odgovara Radnom Nalogu {1}" @@ -20657,7 +20679,7 @@ msgstr "Fiskalni režim je obavezan, postavi fiskalni režim u tvrtki {0}" msgid "Fiscal Year" msgstr "Fiskalna Godina" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "Fiskalna Godina (potrebno je instalirati Sustav)" @@ -20721,7 +20743,7 @@ msgstr "Račun Fiksne Imovine" msgid "Fixed Asset Defaults" msgstr "Standard Postavke Fiksne Imovine" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "Artikal Fiksne Imovine mora biti artikal koja nije na zalihama." @@ -20871,7 +20893,7 @@ msgstr "Za Tvrtku" msgid "For Item" msgstr "Za Artikal" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "Za Artikal {0} ne može se primiti više od {1} količine naspram {2} {3}" @@ -20902,7 +20924,7 @@ msgstr "Za Cijenovnik" msgid "For Production" msgstr "Za Proizvodnju" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "Za Količinu (Proizvedena Količina) je obavezna" @@ -20986,6 +21008,12 @@ msgstr "Za stavku {0}, samo {1} elemenata je kreirano ili povezano msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "Za artikal {0}, cijena mora biti pozitivan broj. Da biste omogućili negativne cijene, omogućite {1} u {2}" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "Za stare serijske brojeve, nemojte preuzimati nabvnu cijenu iz serijskog broja i izračunajte je na osnovu nabavne transakcije" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "Za operaciju {0} u redu {1}, molimo dodajte sirovine ili postavite Sastavnicu naspram nje." @@ -21007,7 +21035,7 @@ msgstr "Za projekat - {0}, ažuriraj vaš status" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "Za projicirane i prognozirane količine, sustav će uzeti u obzir sva podređena skladišta unutar odabranog nadređenog skladišta." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "Za količinu {0} ne bi trebalo da bude veća od dozvoljene količine {1}" @@ -21016,7 +21044,7 @@ msgstr "Za količinu {0} ne bi trebalo da bude veća od dozvoljene količine {1} msgid "For reference" msgstr "Za Referencu" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "Za red {0} u {1}. Da biste uključili {2} u cijenu artikla, redovi {3} također moraju biti uključeni" @@ -21040,7 +21068,7 @@ msgstr "Za uslov 'Primijeni Pravilo na Drugo' polje {0} je obavezno" msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "Za praktičnost Klienta, ovi kodovi se mogu koristiti u formatima za ispisivanje kao što su Fakture i Dostavnice" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "Za artikal {0}, potrošena količina bi trebala biti {1} prema Sastavnici {2}." @@ -21049,7 +21077,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 "Kako bi novi {0} stupio na snagu, želite li izbrisati trenutni {1}?" -#: erpnext/controllers/stock_controller.py:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "Za {0} nema raspoloživih zaliha za povrat u skladištu {1}." @@ -21662,7 +21690,7 @@ msgstr "G - D" msgid "GENERAL LEDGER" msgstr "KNJIGOVODSTVENI REGISTAR" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "Knjigovodstveni Račun" @@ -21674,7 +21702,7 @@ msgstr "Stanje Knjigovodstvenog Registra" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "Stavka Knjigovodstvenog Registra" @@ -22189,7 +22217,7 @@ msgstr "Proizvod u Tranzitu" msgid "Goods Transferred" msgstr "Proizvod je Prenesen" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "Proizvod je već primljen naspram unosa izlaza {0}" @@ -22372,7 +22400,7 @@ msgstr "Ukupni iznos mora odgovarati zbroju referenci plaćanja" msgid "Grant Commission" msgstr "Odobri Proviziju" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "Veće od Iznosa" @@ -23013,10 +23041,10 @@ msgstr "Koliko Često?" msgid "How many units of the final product this BOM makes." msgstr "Koliko jedinica konačnog proizvoda proizvodi ova Sastavnica." -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "Koliko često treba ažurirati Projekat od Ukupnih Troškova Kupovine?" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23172,7 +23200,7 @@ msgstr "Ako je operacija podijeljena na podoperacije, one se mogu dodati ovdje." msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "Ako je prazno, u transakcijama će se uzeti u obzir Nadređeni Račun Sladišta ili Standard Skladište Tvrtke" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23296,7 +23324,7 @@ msgstr "Ako je omogućeno, unosi registra će biti knjiženi za iznos promjene u #. (Check) field in DocType 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json msgid "If enabled, rule matching algorithm will run every hour" -msgstr "Ako je omogućen, algoritam za isklađivanje pravila će se pokretati svakog sata" +msgstr "Ako je omogućen, algoritam za usklađivanje pravila će se pokretati svakog sata" #. Description of the 'Grant Commission' (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json @@ -23357,7 +23385,7 @@ msgstr "Ako je omogućeno, sustav će dopustiti odabir jedinica u transakcijama msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "Ako je omogućeno, sustav će korisnicima omogućiti uređivanje sirovina i njihovih količina u radnom nalogu. Sustav neće resetirati količine prema sastavnici ako ih je korisnik promijenio." -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23529,11 +23557,11 @@ msgstr "Ako je ovo nepoželjno, otkaži odgovarajući Unos Plaćanja." msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "Ako ovaj artikal ima varijante, onda se ne može odabrati u prodajnim nalozima itd." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "Ako je ova opcija konfigurirana kao 'Da', sustav će vas spriječiti da kreirate Fakturu Nabave ili Račun bez prethodnog kreiranja Naloga Nabave. Ova konfiguracija se može zaobići za određenog dobavljača tako što će se omogućiti 'Dozvoli kreiranje Fakture Nabave bez Naloga Nabave' u Postavkama Dobavljača." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "Ako je ova opcija konfigurirana kao 'Da', sustav će vas spriječiti da kreirate Fakturu Nabave bez prethodnog kreiranja Računa Nabave. Ova konfiguracija se može poništiti za određenog dobavljača tako što će se omogućiti 'Dozvoli kreiranje Fakture Nabave bez Računa Nabave' u Postavkama Dobavljača." @@ -23649,7 +23677,7 @@ msgstr "Zanemari Prazne Zalihe" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "Zanemari dnevnike revalorizacije deviynog tečaja i rezultata" @@ -23701,7 +23729,7 @@ msgstr "Zanemari da je Pravilnik Cijena omogućen. Nije moguće primijeniti kod #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "Zanemari Kreditne/Debitne Napomene Sustava" @@ -23744,7 +23772,7 @@ msgstr "Zanemari preklapanje vremena Radne Stanice" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "Zanemaruje naslijeđe polje 'Početno' u unosu Knjigovodstva koje omogućava dodavanje početnog stanja nakon što je sistem u upotrebi prilikom generiranja izvještaja" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "Slika u opisu je uklonjena. Da biste onemogućili ovo ponašanje, poništite odabir \"{0}\" u {1}." @@ -23758,6 +23786,7 @@ msgid "Implementation Partner" msgstr "Partner Implementacije" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24111,7 +24140,7 @@ msgstr "Uključi standard Finansijski Registar Imovinu" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24365,7 +24394,7 @@ msgstr "Netačna količina stanja nakon transakcije" msgid "Incorrect Batch Consumed" msgstr "Potrošena Pogrešna Šarža" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "Netačno prijavljivanje (grupno) skladište za ponovnu narudžbu" @@ -24373,7 +24402,7 @@ msgstr "Netačno prijavljivanje (grupno) skladište za ponovnu narudžbu" msgid "Incorrect Company" msgstr "Netočna Tvrtka" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "Netačna Količina Komponenti" @@ -24583,14 +24612,14 @@ msgstr "Pokrenut" msgid "Inspected By" msgstr "Inspektor" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "Inspekcija Odbijena" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "Inspekcija Obavezna" @@ -24607,7 +24636,7 @@ msgstr "Inspekcija Obavezna prije Dostave" msgid "Inspection Required before Purchase" msgstr "Inspekcija Obavezna prije Nabave" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "Podnošenje Kontrole" @@ -24689,8 +24718,8 @@ msgstr "Nedovoljne Dozvole" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "Nedovoljne Zalihe" @@ -24910,7 +24939,7 @@ msgstr "Interni Prenosi" msgid "Internal Work History" msgstr "Interna Radna Istorija" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "Interni prenosi se mogu vršiti samo u standard valuti tvrtke" @@ -25003,7 +25032,7 @@ msgstr "Nevažeći Datum Dostave" msgid "Invalid Discount" msgstr "Nevažeći Popust" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "Nevažeći Iznos Popusta" @@ -25033,7 +25062,7 @@ msgstr "Nevažeća Grupa po" msgid "Invalid Item" msgstr "Nevažeći Artikal" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "Nevažeće Standard Postavke Artikla" @@ -25119,12 +25148,12 @@ msgstr "Nevažeći Raspored" msgid "Invalid Selling Price" msgstr "Nevažeća Prodajna Cijena" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "Nevažeći Serijski i Šaržni Paket" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "Nevažeće izvorno i ciljno skladište" @@ -25161,7 +25190,7 @@ msgstr "Nevažeća formula filtra. Molimo provjerite sintaksu." msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "Nevažeći izgubljeni razlog {0}, kreiraj novi izgubljeni razlog" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Nevažeća serija imenovanja (. nedostaje) za {0}" @@ -25290,7 +25319,6 @@ msgstr "Otkazivanje Fakture" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "Datum Fakture" @@ -25311,10 +25339,6 @@ msgstr "Pogreška Odabira Faktura Tipa Dokumenta" msgid "Invoice Grand Total" msgstr "Ukupni Iznos Fakture" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "Faktura" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25836,12 +25860,12 @@ msgstr "Je Fantomska Stavka" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" msgstr "Da li je Nalog Nabave Obavezan za kreiranje Fakture Nabave i Računa Nabave?" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" msgstr "Da li je Račun Nabave obavezan za kreiranje Fakture Nabave?" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' @@ -26114,7 +26138,7 @@ msgstr "Slučajevi" msgid "Issuing Date" msgstr "Datum Izdavanja" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "Može potrajati i do nekoliko sati da tačne vrijednosti zaliha budu vidljive nakon spajanja artikala." @@ -26184,7 +26208,7 @@ msgstr "Kurzivni tekst za međuzbrojeve ili bilješke" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26231,6 +26255,7 @@ msgstr "Kurzivni tekst za međuzbrojeve ili bilješke" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26246,7 +26271,6 @@ msgstr "Kurzivni tekst za međuzbrojeve ili bilješke" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -27010,6 +27034,7 @@ msgstr "Proizvođač Artikla" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -27020,7 +27045,6 @@ msgstr "Proizvođač Artikla" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27280,11 +27304,11 @@ msgstr "Postavke Varijante Artikla" msgid "Item Variant {0} already exists with same attributes" msgstr "Varijanta Artikla {0} već postoji sa istim atributima" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "Varijante Artikla Ažurirane" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "Omogućeno je ponovno knjiženje Artikala na osnovi Skladišta." @@ -27323,6 +27347,15 @@ msgstr "Specifikacija Artikla Web Stranice" msgid "Item Weight Details" msgstr "Detalji Težine Artikla" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "Potrošnja po Artiklima" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27352,7 +27385,7 @@ msgstr "PDV Detalji po Artiklu" msgid "Item Wise Tax Details" msgstr "PDV Detalji po Stavki" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "PDV Detalji po Artiklu nisu uskađeni se s PDV i Naknadama u sljedećim redovima:" @@ -27372,11 +27405,11 @@ msgstr "Artikal i Skladište" msgid "Item and Warranty Details" msgstr "Detalji Artikla i Garancija" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "Artikal za red {0} ne odgovara Materijalnom Nalogu" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "Artikal ima Varijante." @@ -27406,7 +27439,7 @@ msgstr "Artikal Operacija" msgid "Item qty can not be updated as raw materials are already processed." msgstr "Količina artikla se ne može ažurirati jer su sirovine već obrađene." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "Cijena Artikla je ažurirana na nulu jer je Dozvoli Nultu Stopu Vrednovanja označena za artikal {0}" @@ -27425,10 +27458,14 @@ msgstr "Stopa vrednovanja artikla se preračunava s obzirom na iznos verifikata msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "Ponovno knjiženje vrijednosti artikla je u toku. Izvještaj može prikazati netačnu procjenu artikla." -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "Varijanta Artikla {0} postoji sa istim atributima" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "Artikal s nazivom {0} nije pronađena u Nalogu Nabave" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "Artikal {0} dodan je više puta pod isti nadređeni artikal {1} u redovima {2} i {3}" @@ -27442,7 +27479,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "Artikal {0} se nemože naručiti više od {1} u odnosu na Ugovorni Nalog {2}." #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "Artikal {0} ne postoji" @@ -27450,7 +27487,7 @@ msgstr "Artikal {0} ne postoji" msgid "Item {0} does not exist in the system or has expired" msgstr "Artikal {0} ne postoji u sustavu ili je istekao" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "Artikal {0} ne postoji." @@ -27466,15 +27503,15 @@ msgstr "Artikal {0} je već vraćen" msgid "Item {0} has been disabled" msgstr "Artikal {0} je onemogućen" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "Artikal {0} nema serijski broj. Samo serijski artikli mogu imati dostavu na osnovu serijskog broja" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "Artikal {0} nema promjena u isporučenoj količini. Molimo vas da poništite odabir reda ako ne želite ažurirati njegovu količinu." -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "Artikal {0} je dosego kraj svog vijeka trajanja {1}" @@ -27486,19 +27523,23 @@ msgstr "Artikal {0} zanemaren jer nije artikal na zalihama" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "Artikal {0} je već rezervisan/dostavljen naspram Prodajnog Naloga {1}." -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "Artikal {0} je otkazan" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "Artikal {0} je onemogućen" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "Artikal {0} nije artikl za direktno slanje. Samo artikli za direktno slanje mogu imati ažuriranu dostavnu količinu." + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "Artikal {0} nije serijalizirani Artikal" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "Artikal {0} nije artikal na zalihama" @@ -27506,7 +27547,11 @@ msgstr "Artikal {0} nije artikal na zalihama" msgid "Item {0} is not a subcontracted item" msgstr "Artikal {0} nije podugovoreni artikal" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "Artikal {0} nije predložak artikla." + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "Artikal {0} nije aktivan ili je dostignut kraj životnog vijeka" @@ -27522,7 +27567,7 @@ msgstr "Artikal {0} mora biti artikal koji nije na zalihama" msgid "Item {0} must be a non-stock item" msgstr "Artikal {0} mora biti artikal koji nije na zalihama" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "Artikal {0} nije pronađen u tabeli 'Dostavljene Sirovine' u {1} {2}" @@ -27538,7 +27583,7 @@ msgstr "Artikal {0}: Količina Naloga {1} ne može biti manja od minimalne koli msgid "Item {0}: {1} qty produced. " msgstr "Artikal {0}: {1} količina proizvedena. " -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "Atikal {} ne postoji." @@ -27648,7 +27693,7 @@ msgstr "Artikli Materijalnog Naloga Sirovina" msgid "Items not found." msgstr "Artikli nisu pronađeni." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "Cijena Artikala je ažurirana na nulu jer je Dozvoli Nultu Stopu Vrednovanja izabrana za sljedeće artikle: {0}" @@ -28281,7 +28326,7 @@ msgstr "Posljednje Skenirano Skladište" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "Zadnja transakcija zaliha za artikal {0} u skladištu {1} je bila {2}." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "Posljednja Sinhronizirana Transakcija" @@ -28559,7 +28604,7 @@ msgstr "Legenda" msgid "Length (cm)" msgstr "Dužina (cm)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "Manje od Iznosa" @@ -28700,7 +28745,7 @@ msgstr "Povezane Fakture" msgid "Linked Location" msgstr "Povezana Lokacija" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "Povezano sa podnešenim dokumentima" @@ -29095,11 +29140,6 @@ msgstr "Održavanje Imovine" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "Održavaj Istu Stopu tokom cijele interne transakcije" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "Održavaj Istu Stopu Marže tokom Ciklusa Nabave" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29111,6 +29151,11 @@ msgstr "Održavanje Zaliha" msgid "Maintain same rate throughout sales cycle" msgstr "Održavaj istu stopu marže tijekom cijelog prodajnog ciklusa" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "Održavaj Istu Stopu Marže tokom Ciklusa Nabave" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29307,7 +29352,7 @@ msgid "Major/Optional Subjects" msgstr "Glavni/Izborni Predmeti" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29476,8 +29521,8 @@ msgstr "Obavezna Sekcija" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29536,8 +29581,8 @@ msgstr "Ručni unos se ne može kreirati! Onemogući automatski unos za odgođen #: 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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29686,7 +29731,7 @@ msgstr "Datum Proizvodnje" msgid "Manufacturing Manager" msgstr "Upravitelj Proizvodnje" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "Proizvodna Količina je obavezna" @@ -29962,7 +30007,7 @@ msgstr "Potrošnja Materijala" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "Potrošnja Materijala za Proizvodnju" @@ -30033,6 +30078,7 @@ msgstr "Priznanica Materijala" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30139,11 +30185,11 @@ msgstr "Artikal Plana Materijalnog Zahtjeva" msgid "Material Request Type" msgstr "Tip Materijalnog Naloga" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "Zahtjev za materijal već je kreiran za naručenu količinu" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "Materijalni Nalog nije kreiran, jer je količina Sirovine već dostupna." @@ -30258,7 +30304,7 @@ msgstr "Prenos Materijala za Proizvodnju" msgid "Material Transferred for Manufacturing" msgstr "Materijal Prenesen za Proizvodnju" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30387,11 +30433,11 @@ msgstr "Maksimalni Iznos Uplate" msgid "Maximum Producible Items" msgstr "Maksimalni broj Proizvodnih Artikala" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "Maksimalni broj Uzoraka - {0} može se zadržati za Šaržu {1} i Artikal {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "Maksimalni broj Uzoraka - {0} su već zadržani za Šaržu {1} i Artikal {2} u Šarži {3}." @@ -30835,11 +30881,11 @@ msgstr "Razno" msgid "Miscellaneous Expenses" msgstr "Razni Troškovi" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "Neusklađeno" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "Nedostaje" @@ -30877,7 +30923,7 @@ msgstr "Nedostajući Filteri" msgid "Missing Finance Book" msgstr "Nedostaje Finansijski Registar" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "Nedostaje Gotov Proizvod" @@ -30885,11 +30931,11 @@ msgstr "Nedostaje Gotov Proizvod" msgid "Missing Formula" msgstr "Nedostaje Formula" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "Nedostaje Artikal" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "Nedostaje Parametar" @@ -30933,10 +30979,6 @@ msgstr "Nedostaje vrijednost" msgid "Mixed Conditions" msgstr "Mješani Uvjeti" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "Mobilni: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31205,7 +31247,7 @@ msgstr "Dostupno je više polja tvrtke: {0}. Molimo odaberite ručno." msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "Za datum {0} postoji više fiskalnih godina. Postavi Tvrtku u Fiskalnoj Godini" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "Više artikala se ne mogu označiti kao gotov proizvod" @@ -31284,27 +31326,20 @@ msgstr "Mjesto" msgid "Naming Series Prefix" msgstr "Prefiks Serije Imenovanja" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "Imenovanje Serije & Standard Cijene" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "Serija Imenovanje za {0}" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "Serija Imenovanja je obavezna" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "Opcije Imenovanja Serije" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "Serija Imenovanja ažurirana" @@ -31352,16 +31387,16 @@ msgstr "Treba Analiza" msgid "Negative Batch Report" msgstr "Izvještaj Negativne Šarže" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "Negativna Količina nije dozvoljena" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "Pogreška Negativne Zalihe" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "Negativna Stopa Vrednovanja nije dozvoljena" @@ -31975,7 +32010,7 @@ msgstr "Nije pronađen profil Blagajne. Kreiraj novi Profil Blagajne" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "Bez Dozvole" @@ -31988,7 +32023,7 @@ msgstr "Nalozi Nabave nisu kreirani" msgid "No Records for these settings." msgstr "Nema zapisa za ove postavke." -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "Bez Odabira" @@ -32033,7 +32068,7 @@ msgstr "Nisu pronađene neusaglašene uplate za ovu stranku" msgid "No Work Orders were created" msgstr "Radni Nalozi nisu kreirani" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "Nema knjigovodstvenih unosa za sljedeća skladišta" @@ -32046,7 +32081,7 @@ msgstr "Nema konfiguriranih računa" msgid "No accounts found." msgstr "Nisu pronađeni računi." -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "Nije pronađena aktivna Sastavnica za artikal {0}. Ne može se osigurati isporuka na osnovu serijskog broja" @@ -32058,7 +32093,7 @@ msgstr "Nema dostupnih dodatnih polja" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "Nema dostupne količine za rezervaciju artikla {0} na skladištu {1}" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "Nisu pronađeni bankovni računi" @@ -32066,7 +32101,7 @@ msgstr "Nisu pronađeni bankovni računi" msgid "No bank statements imported yet" msgstr "Još nema uvezenih bankovnih izvoda" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "Nisu pronađene bankovne transakcije" @@ -32160,7 +32195,7 @@ msgstr "Nema više podređenih na Lijevoj strani" msgid "No more children on Right" msgstr "Nema više podređenih na Desnoj strani" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "Nije definirana nijedna serija imenovanja" @@ -32335,7 +32370,7 @@ msgstr "Još nema postavljenih pravila" msgid "No stock available for this batch." msgstr "Nema dostupnih zaliha za ovu šaržu." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "Nisu kreirani unosi u glavnu knjigu zaliha. Molimo Vas da ispravno postavite količinu ili stopu vrednovanja za stavke i pokušate ponovno." @@ -32427,7 +32462,7 @@ msgstr "Ne Nule" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "Ne može se kreirati Šarža koja nije fantomska za artikal koja nije na zalihi {0}." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "Nijedan od artikala nema nikakve promjene u količini ili vrijednosti." @@ -32531,7 +32566,7 @@ msgstr "Nije ovlašteno jer {0} premašuje ograničenja" msgid "Not authorized to edit frozen Account {0}" msgstr "Nije ovlašten za uređivanje zamrznutog računa {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "Nije konfigurirano" @@ -32577,7 +32612,7 @@ msgstr "Napomena: Unos plaćanja neće biti kreiran jer 'Gotovina ili Bankovni R msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "Napomena: Ovaj Centar Troškova je Grupa. Ne mogu se izvršiti knjigovodstveni unosi naspram grupa." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "Napomena: Da biste spojili artikle, kreirajte zasebno Usaglašavanje Zaliha za stari artikal {0}" @@ -33054,7 +33089,7 @@ msgstr "Prilikom primjene isključene naknade, samo jedan od iznosa Uplata ili I msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "Samo jedna operacija može imati odabranu opciju 'Je li Gotov Proizvod' kada je omogućeno 'Praćenje Polugotovih Proizvoda'." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "Samo jedan {0} unos se može kreirati naspram Radnog Naloga {1}" @@ -33206,7 +33241,7 @@ msgstr "Otvorite dijalog postavki" msgid "Open {0} in a new tab" msgstr "Otvori {0} u novoj kartici" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "Početno" @@ -33365,16 +33400,16 @@ msgstr "Početne Fakture Prodaje su kreirane." #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Početna Zaliha" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "Unos početnih zaliha stvoren s nultom stopom vrednovanja: {0}" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "Početni Unos Zalha stvoren: {0}" @@ -33731,7 +33766,7 @@ msgstr "Opcija. Ova postavka će se koristiti za filtriranje u raznim transakcij msgid "Optional. Used with Financial Report Template" msgstr "Neobavezno. Koristi se s Predloškom Financijskog Izvješća" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "Po želji, postavite broj znamenki u nizu pomoću točke (.) nakon koje slijede ljestve (#). Na primjer, '.####' znači da će niz imati četiri znamenke. Zadano je pet znamenki." @@ -33865,7 +33900,7 @@ msgstr "Naručena Količina" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "Nalozi" @@ -34073,7 +34108,7 @@ msgstr "Nepodmireno (Valuta Tvrtke)" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34131,7 +34166,7 @@ msgstr "Eksterni Nalog" msgid "Over Billing Allowance (%)" msgstr "Dozvola za prekomjerno Fakturisanje (%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "Prekoračenje dopuštenog iznosa za artikal računa premašeno je za {0} ({1}) za {2}%" @@ -34149,7 +34184,7 @@ msgstr "Dozvola za prekomjernu Dostavu/Primanje (%)" msgid "Over Picking Allowance" msgstr "Dozvola za prekomjernu Odabir" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "Preko Dostavnice" @@ -34392,7 +34427,6 @@ msgstr "Polje Blagajne" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "Fakture Blagajne" @@ -34663,7 +34697,7 @@ msgstr "Upakovani Artikal" msgid "Packed Items" msgstr "Upakovani Artikli" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "Upakovani Artikli se ne mogu interno prenositi" @@ -35111,7 +35145,7 @@ msgstr "Djelimično Primljeno" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35247,7 +35281,7 @@ msgstr "Dijelova na Milion" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35373,7 +35407,7 @@ msgstr "Šarža se ne poklapa" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35459,7 +35493,7 @@ msgstr "Specifični Artikal Stranke" #: 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:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35762,7 +35796,6 @@ msgstr "Unosi Plaćanja {0} nisu povezani" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -36020,7 +36053,7 @@ msgstr "Reference Uplate" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36099,10 +36132,6 @@ msgstr "Zahtjevi za plaćanje temeljeni na rasporedu plaćanja ne mogu se kreira msgid "Payment Schedules" msgstr "Rasporedi Plaćanja" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "Status Plaćanja" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37123,7 +37152,7 @@ msgstr "Postavi Prioritet" msgid "Please Set Supplier Group in Buying Settings." msgstr "Podstavi Grupu Dobavljača u Postavkama Nabave." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "Navedi Račun" @@ -37155,11 +37184,11 @@ msgstr "Dodaj Račun za Privremeno Otvaranje u Kontni Plan" msgid "Please add an account for the Bank Entry rule." msgstr "Dodaj račun za pravilo bankovnog unosa." -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "Dodaj barem jednu seriju imenovanja." -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "Molimo dodaj barem jedan Serijski Broj/Šaržni Broj" @@ -37179,7 +37208,7 @@ msgstr "Dodaj Račun Matičnoj Tvrtki - {}" msgid "Please add {1} role to user {0}." msgstr "Dodaj {1} ulogu korisniku {0}." -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "Podesi količinu ili uredi {0} da nastavite." @@ -37286,7 +37315,7 @@ msgstr "Kreiraj nabavu iz interne prodaje ili samog dokumenta dostave" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "Kreiraj Račun Nabave ili Fakturu Nabave za artikal {0}" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "Izbriši Artikal Paket {0}, prije spajanja {1} u {2}" @@ -37355,11 +37384,11 @@ msgstr "Unesi Račun za Kusur" msgid "Please enter Approving Role or Approving User" msgstr "Unesi Odobravajuća Uloga ili Odobravajućeg Korisnika" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "Molimo unesite broj Šarže" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "Unesite Centar Troškova" @@ -37371,7 +37400,7 @@ msgstr "Unesi Datum Dostave" msgid "Please enter Employee Id of this sales person" msgstr "Unesi Personal Id ovog Prodavača" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "Unesi Račun Troškova" @@ -37416,7 +37445,7 @@ msgstr "Unesi Referentni Datum" msgid "Please enter Root Type for account- {0}" msgstr "Unesi Kontnu Klasu za račun- {0}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "Molimo unesite Serijski Broj" @@ -37493,7 +37522,7 @@ msgstr "Unesi prvi datum dostave" msgid "Please enter the phone number first" msgstr "Unesi broj telefona" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "Unesi {schedule_date}." @@ -37607,12 +37636,12 @@ msgstr "Sačuvaj Prodajni Nalog prije dodavanja rasporeda dostave." msgid "Please select Template Type to download template" msgstr "Odaberi Tip Šablona za preuzimanje šablona" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "Odaberi Primijeni Popust na" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "Odaberi Sastavnicu naspram Artikla {0}" @@ -37628,13 +37657,13 @@ msgstr "Odaberi Bankovni Račun" msgid "Please select Category first" msgstr "Odaberi Kategoriju" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "Odaberi Tip Naknade" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "Odaberi Tvrtku" @@ -37643,7 +37672,7 @@ msgstr "Odaberi Tvrtku" msgid "Please select Company and Posting Date to getting entries" msgstr "Odaberi Kompaniju i datum knjićenja da biste preuzeli unose" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "Odaberi Tvrtku" @@ -37692,7 +37721,7 @@ msgstr "Odaberi Račun Razlike za Periodični Unos" msgid "Please select Posting Date before selecting Party" msgstr "Odaberi Datum knjiženja prije odabira Stranke" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "Odaberi Datum Knjiženja" @@ -37700,11 +37729,11 @@ msgstr "Odaberi Datum Knjiženja" msgid "Please select Price List" msgstr "Odaberi Cjenovnik" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "Odaberi Količina naspram Artikla {0}" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "Odaberi Skladište za Zadržavanje Uzoraka u Postavkama Zaliha" @@ -37757,7 +37786,7 @@ msgstr "Odaberi Podugovorni Nalog Nabave." msgid "Please select a Supplier" msgstr "Odaberi Dobavljača" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "Odaberi Skladište" @@ -37818,7 +37847,7 @@ msgstr "Odaberi red za kreiranje Unosa Ponovnog Knjiženje" msgid "Please select a supplier for fetching payments." msgstr "Odaberi Dobavljača za preuzimanje plaćanja." -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "Odaberi Transakciju." @@ -37838,7 +37867,7 @@ msgstr "Odaberite kod artikla prije postavljanja skladišta." msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "Molimo odaberite barem jedan filter: Šifra Artikla, Šarža ili Serijski Broj." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "Molimo odaberite barem jedan artikal za ažuriranje dostavljene količine." @@ -37945,7 +37974,7 @@ msgstr "Odaberi važeći tip dokumenta." msgid "Please select weekly off day" msgstr "Odaberi sedmične neradne dane" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "Odaberi {0}" @@ -38085,7 +38114,7 @@ msgstr "Postavi stvarnu potražnju ili prognozu prodaje kako biste generirali iz msgid "Please set an Address on the Company '%s'" msgstr "Postavi Adresu Tvrtke '%s'" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "Postavi Račun Troškova u tabeli Artikala" @@ -38129,7 +38158,7 @@ msgstr "Postavi Standard Račun Troškova u Tvrtki {0}" msgid "Please set default UOM in Stock Settings" msgstr "Postavi Standard Jedinicu u Postavkama Zaliha" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "Postavi standardni račun troška prodanog proizvoda u tvrtki {0} za zaokruživanje knjiženja rezultata tokom prijenosa zaliha" @@ -38248,7 +38277,7 @@ msgstr "Navedi {0}." msgid "Please specify at least one attribute in the Attributes table" msgstr "Navedi barem jedan atribut u tabeli Atributa" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "Navedi ili Količinu ili Stopu Vrednovanja ili oboje" @@ -38419,7 +38448,7 @@ msgstr "Objavljeno" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38444,7 +38473,7 @@ msgstr "Objavljeno" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38559,7 +38588,7 @@ msgstr "Datum i vrijeme Knjiženja" msgid "Posting Time" msgstr "Vrijeme Knjiženja" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "Datum i vrijeme knjiženja su obavezni" @@ -38738,6 +38767,12 @@ msgstr "Preventivno Održavanje" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "Sprječava automatsku rezervaciju količina zaliha iz prodajnih naloga prilikom obrade povrata prodaje." +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "Sprječava sustav da automatski koristi cjene iz posljednje transakcije nabave prilikom kreiranja novih naloga nabave ili transakcija." + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39031,7 +39066,9 @@ msgstr "Tabele sa Cijenama ili Popustom su obevezne" msgid "Price per Unit (Stock UOM)" msgstr "Cijena po Jedinici (Jedinica Zaliha)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40386,6 +40423,7 @@ msgstr "Trošak Nabave Artikla {0}" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40422,6 +40460,12 @@ msgstr "Predujam Fakture Nabave" msgid "Purchase Invoice Item" msgstr "Artikal Fakture Nabave" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "Postavke Nabavne Fakture" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40473,6 +40517,7 @@ msgstr "Nabavne Fakture" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40482,7 +40527,7 @@ msgstr "Nabavne Fakture" #: 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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40599,7 +40644,7 @@ msgstr "Nalog Nabave {0} je izrađen" msgid "Purchase Order {0} is not submitted" msgstr "Nalog Nabave {0} nije podnešen" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "Nalozi Nabave" @@ -40662,6 +40707,7 @@ msgstr "Cijenik Nabave" #: 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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40676,7 +40722,7 @@ msgstr "Cijenik Nabave" msgid "Purchase Receipt" msgstr "Račun Nabave" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40942,7 +40988,6 @@ msgstr "K4" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41530,7 +41575,7 @@ msgstr "Pregled Kvaliteta" msgid "Quality Review Objective" msgstr "Cilj Revizije Kvaliteta" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "Količine su uspješno ažurirane." @@ -41591,7 +41636,7 @@ msgstr "Količine su uspješno ažurirane." #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41785,7 +41830,7 @@ msgstr "Niz Rute Upita" msgid "Queue Size should be between 5 and 100" msgstr "Veličina Reda čekanja treba biti između 5 i 100" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "Brzi Nalog Knjiženja" @@ -41840,7 +41885,7 @@ msgstr "Ponuda/Potencijalni Klijent %" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -42003,7 +42048,6 @@ msgstr "Podigao (e-pošta)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42413,8 +42457,8 @@ msgstr "Sirovine za Klijenta" msgid "Raw SQL" msgstr "Sirovi SQL" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "Količina potrošenih sirovina bit će validirana na temelju potrebne količine iz Sastavnice." @@ -42822,11 +42866,10 @@ msgstr "Usaglasi Bankovnu Transakciju" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43350,7 +43393,7 @@ msgstr "Odbijen Serijski i Šaržni Paket" msgid "Rejected Warehouse" msgstr "Odbijeno Skladište" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "Odbijeno i Prihvaćeno Skladište ne mogu biti isto." @@ -43400,7 +43443,7 @@ msgid "Remaining Balance" msgstr "Preostalo Stanje" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43454,7 +43497,7 @@ msgstr "Napomena" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43493,7 +43536,7 @@ msgstr "Ukloni nula brojeva" msgid "Remove item if charges is not applicable to that item" msgstr "Ukloni artikal ako se na taj artikal ne naplaćuju naknade" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "Uklonjeni artikli bez promjene Količine ili Vrijednosti." @@ -43898,6 +43941,7 @@ msgstr "Zahtjev za Informacijama" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44171,7 +44215,7 @@ msgstr "Rezerviši za Podsklop" msgid "Reserved" msgstr "Rezervisano" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "Konflikt Rezervirane Šarže" @@ -44784,7 +44828,7 @@ msgstr "Prihod primljen unaprijed (npr. godišnja pretplata) drži se ovdje i pr msgid "Reversal Of" msgstr "Suprotno od" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "Suprotni Nalog Knjiženja" @@ -44933,10 +44977,7 @@ msgstr "Uloga dozvoljena za prekomjernu Dostavu/Primanje" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "Uloga dozvoljena da Poništi Akciju Zaustavljanja" @@ -44951,8 +44992,11 @@ msgstr "Uloga dozvoljena da zaobiđe Kreditno Ograničenje" msgid "Role allowed to bypass period restrictions." msgstr "Uloga koja ima dopuštenje zaobilaziti ograničenja razdoblja." +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "Uloga kojoj je dopušteno poništavanje radnje zaustavljanja" @@ -45153,8 +45197,8 @@ msgstr "Dozvola Zaokruživanja Gubitka" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "Dozvola Zaokruživanje Gubitka treba da bude između 0 i 1" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "Unos Zaokruživanja Rezultat za Prijenos Zaliha" @@ -45181,11 +45225,11 @@ msgstr "Naziv Redoslijeda Operacija" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "Red # {0}: Ne može se vratiti više od {1} za artikal {2}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "Red # {0}: Dodaj Serijski i Šaržni Paket za Artikal {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "Redak br. {0}: Unesite količinu za stavku {1} jer nije nula." @@ -45211,7 +45255,7 @@ msgstr "Red #{0} (Tabela Plaćanja): Iznos mora da je negativan" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "Red #{0} (Tabela Plaćanja): Iznos mora da je pozitivan" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "Red #{0}: Unos ponovnog naručivanja već postoji za skladište {1} sa tipom ponovnog naručivanja {2}." @@ -45412,7 +45456,7 @@ msgstr "Red #{0}: Duplikat unosa u Referencama {1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "Red #{0}: Očekivani Datum Isporuke ne može biti prije datuma Nabavnog Naloga" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "Red #{0}: Račun Troškova nije postavljen za artikal {1}. {2}" @@ -45472,7 +45516,7 @@ msgstr "Red #{0}: Polja Od i Do su obavezna" msgid "Row #{0}: Item added" msgstr "Red #{0}: Artikel je dodan" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "Red #{0}: Artikal {1} se ne može prenijeti više od {2} u odnosu na {3} {4}" @@ -45500,7 +45544,7 @@ msgstr "Red #{0}: Artikal {1} u skladištu {2}: Dostupno {3}, Potrebno {4}." msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "Red #{0}: Artikal {1} nije Klijent Dostavljen Artikal." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "Red #{0}: Artikal {1} nije Serijalizirani/Šaržirani Artikal. Ne može imati Serijski Broj / Broj Šarže naspram sebe." @@ -45553,7 +45597,7 @@ msgstr "Red #{0}: Samo {1} je dostupno za rezervisanje za artikal {2}" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "Red #{0}: Početna akumulirana amortizacija mora biti manja ili jednaka {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "Red #{0}: Operacija {1} nije završena za {2} količinu gotovog proizvoda u Radnom Nalogu {3}. Ažuriraj status rada putem Radne Kartice {4}." @@ -45578,7 +45622,7 @@ msgstr "Red #{0}: Odaberi Artikal Gotovog Proizvoda za koju će se koristiti ova msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Red #{0}: Odaberi Skladište Podmontaže" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "Red #{0}: Postavite količinu za ponovnu narudžbu" @@ -45604,15 +45648,15 @@ msgstr "Red #{0}: Količina mora biti pozitivan broj" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "Red #{0}: Količina bi trebala biti manja ili jednaka Dostupnoj Količini za Rezervaciju (stvarna količina - rezervisana količina) {1} za artikal {2} naspram Šarže {3} u Skladištu {4}." -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "Red #{0}: Kontrola Kvaliteta je obavezna za artikal {1}" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "Red #{0}: Kontrola kKvaliteta {1} nije dostavljena za artikal: {2}" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "Red #{0}: Kontrola Kvaliteta {1} je odbijena za artikal {2}" @@ -45643,11 +45687,11 @@ msgstr "Red #{0}: Količina koju treba rezervisati za artikal {1} treba biti ve msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "Red #{0}: Cijena mora biti ista kao {1}: {2} ({3} / {4})" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "Red #{0}: Tip referentnog dokumenta mora biti jedan od Nalog Nabave, Faktura Nabave ili Nalog Knjiženja" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "Red #{0}: Tip referentnog dokumenta mora biti jedan od Prodajni Nalog, Prodajna Faktura, Nalog Knjiženja ili Opomena" @@ -45693,7 +45737,7 @@ msgstr "Red #{0}: Prodajna cijena za artikal {1} je niža od njegove {2}.\n" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "Red #{0}: ID Sekvence mora biti {1} ili {2} za Operaciju {3}." -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "Red #{0}: Serijski Broj {1} ne pripada Šarži {2}" @@ -45741,11 +45785,11 @@ msgstr "Red #{0}: Izvorno skladište {1} za artikal {2} ne može biti skladište msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "Red #{0}: Izvorno Skladište {1} za artikal {2} mora biti isto kao i Izvorno Skladište {3} u Radnom Nalogu." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "Redak #{0}: Izvorno i ciljno skladište ne mogu biti isti za prijenos materijala" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "Redak #{0}: Izvorne, Ciljne i Dimenzije zaliha ne mogu biti potpuno iste za prijenos materijala" @@ -45798,11 +45842,11 @@ msgstr "Red #{0}: Količina zaliha {1} ({2}) za artikal {3} ne može biti veća msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "Red #{0}: Ciljano skladište mora biti isto kao i skladište klijenta {1} iz povezanog Podizvođačkog Naloga" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "Red #{0}: Šarža {1} je već istekla." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "Red #{0}: Skladište {1} nije podređeno skladište grupnog skladišta {2}" @@ -45830,7 +45874,7 @@ msgstr "Red #{0}: Iznos Odbitka {1} ne odgovara izračunatom iznosu {2}." msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "Red #{0}: Radni Nalog postoji za punu ili djelomičnu količinu artiikla {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "Red #{0}: Ne možete koristiti dimenziju zaliha '{1}' u usaglašavanju zaliha za izmjenu količine ili stope vrednovanja. Usaglašavanje zaliha sa dimenzijama zaliha namijenjeno je isključivo za obavljanje početnih unosa." @@ -45866,23 +45910,23 @@ msgstr "Red #{1}: Skladište je obavezno za artikal {0}" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "Red #{idx}: Ne može se odabrati Skladište Dobavljača dok isporučuje sirovine podizvođaču." -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "Red #{idx}: Cijena artikla je ažurirana prema stopi vrednovanja zato što je ovo interni prijenos zaliha." -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "Redak #{idx}: Unesi lokaciju za artikel sredstava {item_code}." -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "Red #{idx}: Primljena količina mora biti jednaka Prihvaćenoj + Odbijenoj količini za Artikal {item_code}." -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "Red #{idx}: {field_label} ne može biti negativan za artikal {item_code}." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "Red #{idx}: {field_label} je obavezan." @@ -45890,7 +45934,7 @@ msgstr "Red #{idx}: {field_label} je obavezan." msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "Red #{idx}: {from_warehouse_field} i {to_warehouse_field} ne mogu biti isti." -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "Red #{idx}: {schedule_date} ne može biti prije {transaction_date}." @@ -45955,7 +45999,7 @@ msgstr "Red #{}: {}" msgid "Row #{}: {} {} does not exist." msgstr "Red #{}: {} {} ne postoji." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "Red #{}: {} {} ne pripada tvrtki {}. Odaberi važeći {}." @@ -45971,7 +46015,7 @@ msgstr "Red {0} : Operacija je obavezna naspram artikla sirovine {1}" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "Red {0} odabrana količina je manja od potrebne količine, potrebno je dodatno {1} {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "Red {0}# Artikal {1} nije pronađen u tabeli 'Isporučene Sirovine' u {2} {3}" @@ -46003,7 +46047,7 @@ msgstr "Red {0}: Dodijeljeni iznos {1} mora biti manji ili jednak nepodmirenom i msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "Red {0}: Dodijeljeni iznos {1} mora biti manji ili jednak preostalom iznosu plaćanja {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "Red {0}: Kako je {1} omogućen, sirovine se ne mogu dodati u {2} unos. Koristite {3} unos za potrošnju sirovina." @@ -46062,7 +46106,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "Red {0}: Ili je Artikal Dostavnice ili Pakirani Artikal referenca obavezna." #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "Red {0}: Devizni Kurs je obavezan" @@ -46103,7 +46147,7 @@ msgstr "Red {0}: Od vremena i do vremena je obavezano." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "Red {0}: Od vremena i do vremena {1} se preklapa sa {2}" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "Red {0}: Iz skladišta je obavezano za interne prijenose" @@ -46227,7 +46271,7 @@ msgstr "Red {0}: Količina mora biti veća od 0." msgid "Row {0}: Quantity cannot be negative." msgstr "Red {0}: Količina ne može biti negativna." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "Red {0}: Količina nije dostupna za {4} u skladištu {1} u vrijeme knjiženja unosa ({2} {3})" @@ -46239,11 +46283,11 @@ msgstr "Red {0}: Prodajna Faktura {1} je već kreirana za {2}" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "Red {0}: Smjena se ne može promijeniti jer je amortizacija već obrađena" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "Red {0}: Podugovorni Artikal je obavezan za sirovinu {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "Red {0}: Ciljno Skladište je obavezno za interne transfere" @@ -46267,7 +46311,7 @@ msgstr "Red {0}: {3} Račun {1} ne pripada tvrtki {2}" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "Red {0}: Za postavljanje {1} periodičnosti, razlika između od i do datuma mora biti veća ili jednaka {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "Redak {0}: Prenesena količina ne može biti veća od tražene količine." @@ -46320,7 +46364,7 @@ msgstr "Red {0}: {2} Artikal {1} ne postoji u {2} {3}" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "Red {1}: Količina ({0}) ne može biti razlomak. Da biste to omogućili, onemogućite '{2}' u Jedinici {3}." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "Redak {idx}: Serija Imenovanja sredstava obavezna je za automatsko stvaranje sredstava za artikal {item_code}." @@ -46350,7 +46394,7 @@ msgstr "Redovi sa unosom istog računa će se spojiti u Registru" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "Pronađeni su redovi sa dupliranim rokovima u drugim redovima: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "Redovi: {0} imaju 'Unos Plaćanja' kao Tip Reference. Ovo ne treba postavljati ručno." @@ -46416,7 +46460,7 @@ msgstr "Evaluacija pravila završena" msgid "Rules evaluation started" msgstr "Započeta je evaluacija pravila" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "Pravila za konfiguriranje Serija Imenovanja" @@ -46713,7 +46757,7 @@ msgstr "Prodajna Ulazna Cijena" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46887,7 +46931,7 @@ msgstr "Mogućnos Prodaje prema Izvoru" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -47010,8 +47054,8 @@ msgstr "Prodajni Nalog je obavezan za Artikal {0}" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "Prodajni Nalog {0} već postoji naspram Nabavnog Naloga Klijenta {1}. Da dozvolite višestruke Prodajne Naloge, omogući {2} u {3}" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "Prodajni Nalog {0} nije dostupan za proizvodnju" @@ -47422,7 +47466,7 @@ msgstr "Isti Artikal" msgid "Same day" msgstr "Isti dan" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "Ista kombinacija artikla i skladišta je već unesena." @@ -47459,7 +47503,7 @@ msgstr "Skladište Zadržavanja Uzoraka" msgid "Sample Size" msgstr "Veličina Uzorka" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "Količina uzorka {0} ne može biti veća od primljene količine {1}" @@ -47750,7 +47794,7 @@ msgstr "Pretražuj po kodu artikla, serijskom broju ili barkodu" msgid "Search company..." msgstr "Pretraži tvrtku..." -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "Pretraži transakcije" @@ -47895,7 +47939,7 @@ msgstr "Odaberi Marku..." msgid "Select Columns and Filters" msgstr "Odaberi Kolone i Filtere" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "Odaberi Tvrtku" @@ -48591,7 +48635,7 @@ msgstr "Serijski Broj Raspon" msgid "Serial No Reserved" msgstr "Rezervisan Serijski Broj" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "Preklapa se Serijski broj Šarže" @@ -48652,7 +48696,7 @@ msgstr "Serijski Broj je Obavezan" msgid "Serial No is mandatory for Item {0}" msgstr "Serijski Broj je obavezan za artikal {0}" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "Serijski Broj {0} već postoji" @@ -48938,7 +48982,7 @@ msgstr "Serijski brojevi nedostupni za artikal {0} u skladištu {1}. Pokušaj pr #: 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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48964,7 +49008,7 @@ msgstr "Serijski brojevi nedostupni za artikal {0} u skladištu {1}. Pokušaj pr #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49362,12 +49406,6 @@ msgstr "Postavi Ciljano Skladište" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "Postavi Stopu Vrednovanja na osnovu Izvornog Skladišta" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "Postavi stopu procjene za odbijeni materijal" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "Postavi Skladište" @@ -49473,6 +49511,12 @@ msgstr "Postavite ovu vrijednost na 0 da biste onemogućili funkciju." msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "Postavite pravila za automatsku klasifikaciju transakcija. Povucite i ispustite pravila da biste im promijenili prioritet." +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "Postavi stopu vrednovanja za odbijene materijale" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "Postavi {0} u kategoriju imovine {1} za tvrtku {2}" @@ -49643,7 +49687,7 @@ msgstr "Registar Dionica" #: erpnext/desktop_icon/share_management.json #: erpnext/workspace_sidebar/share_management.json msgid "Share Management" -msgstr "Upravljanje Dionicama" +msgstr "Dionice" #. Name of a DocType #. Label of a Link in the Invoicing Workspace @@ -49971,7 +50015,7 @@ msgstr "Prikaz Stanja u Kontnom Planu" msgid "Show Barcode Field in Stock Transactions" msgstr "Prikaži polje Barkoda u Transakcijama Artikala" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "Prikaži Otkazane Unose" @@ -49979,7 +50023,7 @@ msgstr "Prikaži Otkazane Unose" msgid "Show Completed" msgstr "Prikaži Završeno" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "Prikaži Kredit / Debit u valuti tvrtke" @@ -50062,7 +50106,7 @@ msgstr "Prikaži Povezane Dostavnice" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "Prikaži Neto Vrijednosti na Računu Stranke" @@ -50074,7 +50118,7 @@ msgstr "Prikaži samo točan iznos" msgid "Show Open" msgstr "Prikaži Otvoreno" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "Prikaži Početne Unose" @@ -50087,11 +50131,6 @@ msgstr "Prikaži Početno i Završno Stanje" msgid "Show Operations" msgstr "Prikaži Operacije" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "Prikaži gumb za Plaćanje na Portalu Nabavnog Naloga" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "Prikaži Detalje Plaćanja" @@ -50107,7 +50146,7 @@ msgstr "Prikaži Raspored Plaćanja u ispisu" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "Prikaži Napomene" @@ -50174,6 +50213,11 @@ msgstr "Prikaži samo Kasu" msgid "Show only the Immediate Upcoming Term" msgstr "Prikaži samo Neposredan Predstojeći Uslov" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "Prikaži gumb za Plaćanje na Portalu Nabavnog Naloga" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "Prikaži unose na čekanju" @@ -50462,11 +50506,11 @@ msgstr "Izvor Unosa Proizvodnje" msgid "Source Stock Entry (Manufacture)" msgstr "Izvor Unosa Zaliha (Proizvodnja)" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "Izvor Unos Zaliha {0} pripada radnom nalogu {1}, a ne {2}. Koristi unos proizvodnje iz istog radnog naloga." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "Izvor Unosa Zaliha {0} nema količinu gotovih proizvoda" @@ -50532,7 +50576,7 @@ msgstr "Izvorno skladište {0} mora biti isto kao i skladište klijenta {1} u Po msgid "Source and Target Location cannot be same" msgstr "Izvorna i Ciljna lokacija ne mogu biti iste" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "Izvorno i ciljno skladište ne mogu biti isto za red {0}" @@ -50546,8 +50590,8 @@ msgid "Source of Funds (Liabilities)" msgstr "Izvor Sredstava (Obaveze)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "Izvorno skladište je obavezno za red {0}" @@ -50712,8 +50756,8 @@ msgstr "Standard Ocenjeni Troškovi" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "Standard Prodaja" @@ -51046,7 +51090,7 @@ msgstr "Zapisnik Zaključavanja Zaliha" msgid "Stock Details" msgstr "Detalji Zaliha" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "Unosi Zaliha su već kreirani za Radni Nalog {0}: {1}" @@ -51317,7 +51361,7 @@ msgstr "Zaliha Primljena, ali nije Fakturisana" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51329,7 +51373,7 @@ msgstr "Popis Zaliha" msgid "Stock Reconciliation Item" msgstr "Artikal Popisa Zaliha" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "Popisi Zaliha" @@ -51367,7 +51411,7 @@ msgstr "Postavke Ponovnog Knjiženja Zaliha" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51395,7 +51439,7 @@ msgstr "Otkazani Unosi Rezervacije Zaliha" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "Kreirani Unosi Rezervacija Zaliha" @@ -51777,7 +51821,7 @@ msgstr "Zaustavljeni Radni Nalog se ne može otkazati, prvo ga prekini da biste #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "Prodavnice" @@ -51855,10 +51899,6 @@ msgstr "Podoperacije" msgid "Sub Procedure" msgstr "Podprocedura" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "Podzbroj" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "Nedostaju reference stavki podsklopa. Ponovno preuzmi podsklopove i sirovine." @@ -52075,7 +52115,7 @@ msgstr "Uslužni Artikal Podizvođačkog Naloga" msgid "Subcontracting Order" msgstr "Podizvođački Nalog" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52101,7 +52141,7 @@ msgstr "Servisni Artikal Podizvođačkog Naloga" msgid "Subcontracting Order Supplied Item" msgstr "Dostavljeni Artikal Podizvođačkog Naloga" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "Podizvođački Nalog {0} je kreiran." @@ -52190,7 +52230,7 @@ msgstr "Postavljanje Podugovaranja" msgid "Subdivision" msgstr "Pododjeljenje" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "Radnja Podnošenja Neuspješna" @@ -52365,7 +52405,7 @@ msgstr "Uspješno Usaglašeno" msgid "Successfully Set Supplier" msgstr "Uspješno Postavljen Dobavljač" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "Uspješno promijenjena Jedinica Zaliha, redefinirajte faktore konverzije za novu Jedinicu." @@ -52521,6 +52561,7 @@ msgstr "Dostavljena Količina" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52562,8 +52603,8 @@ msgstr "Dostavljena Količina" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52611,6 +52652,12 @@ msgstr "Adrese i Kontakti Dobavljača" msgid "Supplier Contact" msgstr "Kontakt Dobavljača" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "Zadane Vrijednosti Dobavljača" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52705,7 +52752,7 @@ msgstr "Datum Fakture Dobavljaća" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "Broj Fakture Dobavljača" @@ -52985,19 +53032,10 @@ msgstr "Dobavljač Proizvoda ili Usluga." msgid "Supplier {0} not found in {1}" msgstr "Dobavljač {0} nije pronađen u {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Dobavljač(i)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "Analiya Prodaje naspram Dobavljača" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53059,7 +53097,7 @@ msgstr "Tim Podrške" msgid "Support Tickets" msgstr "Slučajevi Podrške" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "Podržane Varijable:" @@ -53319,8 +53357,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "Skladište {0} mora biti isto kao i Skladište Dostave {1} u Internom Podizvođačkom Nalogu." #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "Skladište je obavezno za red {0}" @@ -53789,7 +53827,7 @@ msgstr "PDV se odbija samo za iznos koji premašuje kumulativni prag" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "Oporezivi Iznos" @@ -53950,7 +53988,7 @@ msgstr "Odbijeni PDV i Naknade" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "Odbijeni PDV i Naknade (Valuta Tvrtke)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "PDV red #{0}: {1} ne može biti manji od {2}" @@ -54140,7 +54178,6 @@ msgstr "Šablon Uslova" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54332,7 +54369,7 @@ msgstr "Pristup zahtjevu za ponudu sa portala je onemogućen. Da biste omogućil msgid "The BOM which will be replaced" msgstr "Sastavnica koja će biti zamijenjena" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "Šarža {0} ima negativnu količinu {1}. Da biste to riješili, idite na Postavke Šarže i kliknite na Ponovno izračunaj količinu Šarže. Ako problem i dalje postoji, kreiraj unutrašnji unos." @@ -54376,7 +54413,7 @@ msgstr "Uslov Plaćanja u redu {0} je možda duplikat." 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 "Lista Odabira koja ima Unose Rezervacije Zaliha ne može se ažurirati. Ako trebate unijeti promjene, preporučujemo da otkažete postojeće Unose Rezervacije Zaliha prije ažuriranja Liste Odabira." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "Količinski Gubitak Procesa je poništen prema Radnim Karticama Količinskog Gubitka Procesa" @@ -54392,7 +54429,7 @@ msgstr "Serijski Broj u redu #{0}: {1} nije dostupan u skladištu {2}." msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "Serijski Broj {0} je rezervisan naspram {1} {2} i ne može se koristiti za bilo koju drugu transakciju." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "Serijski i Šaržni Paket {0} ne važi za ovu transakciju. 'Tip transakcije' bi trebao biti 'Vani' umjesto 'Unutra' u Serijskom i Šaržnom Paketu {0}" @@ -54428,7 +54465,7 @@ msgstr "Bankovni račun je onemogućen. Molimo omogućite ga" msgid "The bank account is not a company account. Please select a company account" msgstr "Bankovni račun nije račun tvrtke. Molimo odaberite račun tvrtke" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "Šarža {0} je već rezervirana u {1} {2}. Stoga se ne može nastaviti s {3} {4}, koja je kreirana prema {5} {6}." @@ -54534,7 +54571,7 @@ msgstr "Sljedeće šarže su istekle, obnovi zalihe:
{0}" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "Sljedeći otkazani unosi ponovnog objavljivanja postoje za {0}:

{1}

Molimo vas da izbrišete ove unose prije nego što nastavite." -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "Sljedeći izbrisani atributi postoje u varijantama, ali ne i u šablonu. Možete ili izbrisati Varijante ili zadržati Atribut(e) u šablonu." @@ -54579,15 +54616,15 @@ msgstr "Praznik {0} nije između Od Datuma i Do Datuma" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "Faktura nije u potpunosti dodijeljena jer postoji razlika od {0}." -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "Stavka {item} nije označena kao {type_of} stavka. Možete ga omogućiti kao {type_of} stavku iz glavnog predmeta." -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "Artikli {0} i {1} se nalaze u sljedećem {2} :" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "Artikli {items} nisu označeni kao {type_of} artikli. Možete ih omogućiti kao {type_of} artikle u Postavkama Artikala." @@ -54743,7 +54780,7 @@ msgstr "Dionice ne postoje sa {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "Zaliha za artikal {0} u {1} skladištu je bila negativna na {2}. Trebali biste kreirati pozitivan unos {3} prije datuma {4} i vremena {5} da biste knjižili ispravnu Stopu Vrednovanja. Za više detalja, molimo pročitaj dokumentaciju." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "Zalihe su rezervirane za sljedeće artikle i skladišta, poništite ih za {0} Usglašavanje Zaliha:

{1}" @@ -54765,11 +54802,11 @@ msgstr "Sustav će pokušati automatski spojiti stranku s bankovnom transakcijom 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 "Sustav će kreirati Prodajnu Fakturu ili Fakturu Blagajne iz Blagajne na temelju ove postavke. Za transakcije velikog obujma preporučuje se korištenje Fakture Blagajne." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "Zadatak je stavljen u red kao pozadinski posao. U slučaju da postoji bilo kakav problem u obradi u pozadini, sustav će dodati komentar o grešci na ovom usaglašavanja zaliha i vratiti se u stanje nacrta" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "Zadatak je stavljen u red kao pozadinski posao. U slučaju da postoji bilo kakav problem sa obradom u pozadini, sustav će dodati komentar o grešci na ovom usklađivanju zaliha i vratiti se na fazu Poslano" @@ -54841,7 +54878,7 @@ msgstr "{0} ({1}) mora biti jednako {2} ({3})" msgid "The {0} contains Unit Price Items." msgstr "{0} sadrži stavke s jediničnom cijenom." -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "Prefiks {0} '{1}' već postoji. Molimo vas da promijenite serijski broj šarže, u suprotnom će biti grešku o dupliranom unosu." @@ -54894,7 +54931,7 @@ msgstr "U sustavu nema unosa kod kojih je datum odobravanja prije datuma knjiže msgid "There are no slots available on this date" msgstr "Za ovaj datum nema slobodnih termina" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "U sustavu nema transakcija za odabrani bankovni račun i datume koji odgovaraju filterima." @@ -54938,7 +54975,7 @@ msgstr "Nije pronađena Šarža naspram {0}: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "Postoji jedna neusklađena transakcija prije {0}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "U ovom Unosu Zaliha mora biti najmanje jedan gotov proizvod" @@ -54994,11 +55031,11 @@ msgstr "Artikal je Varijanta {0} (Šablon)." msgid "This Month's Summary" msgstr "Sažetak ovog Mjeseca" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "Ovaj Nalog Nabave je u potpunosti podugovoren." -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "Ovaj Prodajnii Nalog je u potpunosti podugovoren." @@ -55799,7 +55836,7 @@ msgstr "Za uključivanje troškova podsklopova i sekundarnih artikala u gotove p msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "Da biste uključili PDV u red {0} u cijenu artikla, PDV u redovima {1} također moraju biti uključeni" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "Za spajanje, sljedeća svojstva moraju biti ista za obje stavke" @@ -55834,7 +55871,7 @@ msgstr "Da biste koristili drugi Finansijski Registar, poništi 'Uključi Standa #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "Da biste koristili drugi Finansijski Registar, poništite oznaku 'Obuhvati standard Finansijski Registar unose'" @@ -55985,7 +56022,7 @@ msgstr "Ukupno Dodjeljeno" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Ukupan Iznos" @@ -56408,7 +56445,7 @@ msgstr "Ukupni iznos zahtjeva za plaćanje ne može biti veći od {0} iznosa" msgid "Total Payments" msgstr "Ukupno za Platiti" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "Ukupna Odabrana Količina {0} je veća od naručene količine {1}. Dozvolu za prekoračenje možete postaviti u Postavkama Zaliha." @@ -56440,7 +56477,7 @@ msgstr "Ukupni Trošak Nabave (preko Fakture Nabave)" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Ukupna Količina" @@ -56826,7 +56863,7 @@ msgstr "URL Praćenja" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56837,7 +56874,7 @@ msgstr "Transakcija" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "Valuta Transakcije" @@ -57509,11 +57546,11 @@ msgstr "Postavke PDV-a UAE" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57585,7 +57622,7 @@ msgstr "Faktor Konverzije Jedinice je obavezan u redu {0}" msgid "UOM Name" msgstr "Naziv Jedinice" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "Faktor Konverzije je obavezan za Jedinicu: {0} za Artikal: {1}" @@ -57661,7 +57698,7 @@ msgstr "Nije moguće pronaći rezultat koji počinje od {0}. Morate imati stalne msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "Nije moguće pronaći vremenski termin u narednih {0} dana za operaciju {1}. Molimo povećajte 'Planiranje Kapaciteta za (Dana)' u {2}." -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "Nije moguće pronaći varijablu:" @@ -57780,7 +57817,7 @@ msgstr "Jedinica Mjere" msgid "Unit of Measure (UOM)" msgstr "Jedinica Mjere" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "Jedinica mjere {0} je unesena više puta u Tablicu Faktora Konverzije" @@ -57900,10 +57937,9 @@ msgid "Unreconcile Transaction" msgstr "Otkaži Usaglašavanje Transakcije" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "Neusaglašeno" @@ -57926,10 +57962,6 @@ msgstr "Neusaglašeni Unosi" msgid "Unreconciled Transactions" msgstr "Neusklađene Transakcije" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "Usklađivanje uspješno poništeno" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57975,7 +58007,7 @@ msgstr "Neplanirano" msgid "Unsecured Loans" msgstr "Neosigurani Krediti" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "OtkažiI Usklađeni Zahtjev Plaćanje" @@ -58190,12 +58222,6 @@ msgstr "Ažuriraj Zalihe" msgid "Update Type" msgstr "Ažuriraj Tip" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "Ažuriraj Učestalost Projekta" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58236,7 +58262,7 @@ msgstr "Ažurirani {0} retci financijskog izvješća s novim nazivom kategorije" msgid "Updating Costing and Billing fields against this Project..." msgstr "Ažuriranje Troškova i Fakturisanje za Projekat..." -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "Ažuriranje Varijanti u toku..." @@ -58694,12 +58720,6 @@ msgstr "Potvrdi Primijenjeno Pravilo" msgid "Validate Components and Quantities Per BOM" msgstr "Potvrdi Komponente i Količine po Listi Materijala" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "Potvrdi Potrošenu Količinu (Prema Sastavnici)" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58723,6 +58743,12 @@ msgstr "Potvrdi Pravilo Cijena" msgid "Validate Stock on Save" msgstr "Potvrdi Zalihe na Spremi" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "Potvrdi Potrošenu Količinu (Prema Sastavnici)" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58829,11 +58855,11 @@ msgstr "Nedostaje Stopa Vrednovanja" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "Stopa Vrednovanja za artikal {0}, je obavezna za knjigovodstvene unose za {1} {2}." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "Procijenjano Vrijednovanje je obavezno ako se unese Početna Zaliha" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "Stopa Vrednovanja je obavezna za artikal {0} u redu {1}" @@ -58843,7 +58869,7 @@ msgstr "Stopa Vrednovanja je obavezna za artikal {0} u redu {1}" msgid "Valuation and Total" msgstr "Vrednovanje i Ukupno" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "Stopa Vrednovanja za Klijent Dostavljene Artikle postavljena je na nulu." @@ -58993,7 +59019,7 @@ msgstr "Odstupanje ({})" msgid "Variant" msgstr "Varijanta" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "Greška Atributa Varijante" @@ -59012,7 +59038,7 @@ msgstr "Varijanta Sastavnice" msgid "Variant Based On" msgstr "Varijanta zasnovana na" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "Varijanta zasnovana na nemože se promijeniti" @@ -59030,7 +59056,7 @@ msgstr "Polje Varijante" msgid "Variant Item" msgstr "Varijanta Artikla" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "Varijanta Artikli" @@ -59411,7 +59437,7 @@ msgstr "Naziv Verifikata" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59451,7 +59477,7 @@ msgstr "Količina" #. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "Podtip Verifikata" @@ -59483,7 +59509,7 @@ msgstr "Podtip Verifikata" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59718,7 +59744,7 @@ msgstr "Skladište {0} ne postoji" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "Skladište {0} nije dozvoljeno za Prodajni Nalog {1}, trebalo bi da bude {2}" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "Skladište {0} nije povezano ni sa jednim računom, navedi račun u zapisu skladišta ili postavi standard račun zaliha u tvrtki {1}." @@ -59765,7 +59791,7 @@ msgstr "Skladišta sa postojećom transakcijom ne mogu se pretvoriti u Registar. #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59821,6 +59847,12 @@ msgstr "Upozori pri novim Zahtjevima za Ponudu" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "Upozori ili zaustavi ako se cijena artikla promijeni u otpremnicama i prodajnim fakturama stvorenim iz prodajnog naloga." +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "Upozori ili zaustavi ako se cijena artikla promijeni na Fakturi Nabave ili Potvrdi Nabave iz Naloga Nabave." + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "Upozorenje - Red {0}: Sati naplate su više od stvarnih sati" @@ -60004,7 +60036,7 @@ msgstr "Specifikacija Web Stranice" msgid "Website:" msgstr "Web Stranica:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "Tjedan Godine" @@ -60378,7 +60410,7 @@ msgstr "Potrošeni Materijali Radnog Naloga" msgid "Work Order Item" msgstr "Artikal Radnog Naloga" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "Neusklađenost Radnog Naloga" @@ -60440,11 +60472,11 @@ msgstr "Radni Nalog nije kreiran" msgid "Work Order {0} created" msgstr "Radni nalog {0} izrađen" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "Radni nalog {0} nema proizvedene količine" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "Radni Nalog {0}: Radna Kartica nije pronađena za operaciju {1}" @@ -60760,11 +60792,11 @@ msgstr "Naziv Godine" msgid "Year Start Date" msgstr "Datum Početka Godine" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "Godina u 2 znamenke" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "Godina u 4 znamenke" @@ -60817,7 +60849,7 @@ msgstr "Takođe možete kopirati i zalijepiti ovu vezu u svoj pretraživač" msgid "You can also set default CWIP account in Company {}" msgstr "Također možete postaviti standard Račun Kapitalnog Posla u Toku u tvrtki {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "Također možete koristiti varijable u nazivu serije tako da ih stavite između točaka (.)" @@ -60971,6 +61003,10 @@ msgstr "Nemate dopuštenje za stvaranje adrese tvrtke. Kontaktiraj Upravitelja S msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "Nemate dopuštenje za ažuriranje podataka o tvrtki. Kontaktiraj Upravitelja Sustava." +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "Nemate dopuštenje za ažuriranje dokumenta Primljena količina za artikal {0}" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "Nemate dopuštenje za ažuriranje ovog dokumenta. Obratite se Upravitelju Sustava." @@ -60999,7 +61035,7 @@ msgstr "Omogućili ste {0} i {1} u {2}. To može dovesti do umetanja cijena iz z msgid "You have entered a duplicate Delivery Note on Row" msgstr "Unijeli ste duplikat Dostavnice u red" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "Niste dodali nijedan bankovni račun tvrtki." @@ -61007,7 +61043,7 @@ msgstr "Niste dodali nijedan bankovni račun tvrtki." msgid "You have not performed any reconciliations in this session yet." msgstr "U ovoj sesiji još niste izvršili nikakva usklađivanja." -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "Morate omogućiti automatsko ponovno naručivanje u Postavkama Zaliha kako biste održali nivoe ponovnog naručivanja." @@ -61078,8 +61114,11 @@ msgstr "Nulta Stopa" msgid "Zero quantity" msgstr "Nulta Količina" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "Artikli Nulte Količine" @@ -61191,7 +61230,7 @@ msgstr "exchangerate.host" msgid "fieldname" msgstr "naziv polja" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "naziv polja u dokumentu, npr." @@ -61409,6 +61448,10 @@ msgstr "odabrane transakcije" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "jedinstveni npr. SAVE20 Koristi se za popust" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "ažurirana dostavljena količina za artikal {0} na {1}" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "odstupanje" @@ -61467,7 +61510,8 @@ msgstr "{0} Korišteni kupon je {1}. Dozvoljena količina je iskorištena" msgid "{0} Digest" msgstr "{0} Sažetak" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "{0} Serija Imenovanja" @@ -61487,7 +61531,7 @@ msgstr "{0} Operacije: {1}" msgid "{0} Request for {1}" msgstr "{0} Zahtjev za {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} Zadržani Uzorak se zasniva na Šarži, provjeri Ima Broj Šarže da zadržite uzorak artikla" @@ -61600,7 +61644,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} uneseno dvaput u PDV Artikla" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "{0} uneseno dvaput {1} u PDV Artikla" @@ -61768,7 +61812,7 @@ msgstr "{0} parametar je nevažeći" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} unose plaćanja ne može filtrirati {1}" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "{0} količina artikla {1} se prima u Skladište {2} kapaciteta {3}." @@ -61781,7 +61825,7 @@ msgstr "{0} do {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "{0} transakcija bit će uvezeno u sustav. Molimo pregledajte dolje navedene podatke i kliknite gumb 'Uvezi' za nastavak." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "{0} jedinica je rezervisano za artikal {1} u Skladištu {2}, poništi rezervaciju iste za {3} Popis Zaliha." @@ -61983,7 +62027,7 @@ msgstr "{0} {1}: Račun {2} je neaktivan" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: Knjigovodstveni Unos za {2} može se izvršiti samo u valuti: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: Centar Troškova je obavezan za Artikal {2}" @@ -62069,23 +62113,23 @@ msgstr "{0}: {1} ne postoji" msgid "{0}: {1} is a group account." msgstr "{0}: {1} je grupni račun." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} mora biti manje od {2}" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "{count} Sredstva stvorena za {item_code}" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} je otkazan ili zatvoren." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "{item_name} Veličina Uzorka ({sample_size}) ne može biti veća od Prihvaćene Količina ({accepted_quantity})" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "{ref_doctype} {ref_name} je {status}." diff --git a/erpnext/locale/hu.po b/erpnext/locale/hu.po index f4a851a0c77..0fff032fd91 100644 --- a/erpnext/locale/hu.po +++ b/erpnext/locale/hu.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:20\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:20\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Hungarian\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr "" msgid " Summary" msgstr "" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "" @@ -302,7 +302,7 @@ msgstr "" msgid "'From Date' must be after 'To Date'" msgstr "" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "" @@ -338,7 +338,7 @@ msgstr "" msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "A '{0}' fiókot már használja {1}. Használjon másik fiókot." @@ -999,7 +999,7 @@ msgstr "" msgid "A logical Warehouse against which stock entries are made." msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1211,7 +1211,7 @@ msgstr "" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "A CEFACT/ICG/2010/IC013 vagy a CEFACT/ICG/2010/IC010 szerint" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1881,8 +1881,8 @@ msgstr "" msgid "Accounting Entry for Asset" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1890,7 +1890,7 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "" @@ -1903,16 +1903,16 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "" @@ -2210,12 +2210,6 @@ msgstr "" msgid "Action If Quality Inspection Is Rejected" msgstr "" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "" @@ -2274,6 +2268,12 @@ msgstr "" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2541,7 +2541,7 @@ msgstr "" msgid "Actual qty in stock" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "" @@ -2555,7 +2555,7 @@ msgstr "" msgid "Add / Edit Prices" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "" @@ -2709,7 +2709,7 @@ msgstr "" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -2954,7 +2954,7 @@ msgstr "" msgid "Additional Discount Amount (Company Currency)" msgstr "További kedvezmény összege (Vállalat pénznemében)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -3239,7 +3239,7 @@ msgstr "" msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3352,7 +3352,7 @@ msgstr "" msgid "Advance amount" msgstr "Előleg összege" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Előleg összege nem lehet nagyobb, mint {0} {1}" @@ -3421,7 +3421,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "" @@ -3539,7 +3539,7 @@ msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "" @@ -3563,7 +3563,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "" @@ -3844,7 +3844,7 @@ msgstr "" msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "" @@ -3852,7 +3852,7 @@ msgstr "" msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "" @@ -3901,7 +3901,7 @@ msgstr "" msgid "Allocate Advances Automatically (FIFO)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "" @@ -3911,7 +3911,7 @@ msgstr "" msgid "Allocate Payment Based On Payment Terms" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "" @@ -3941,7 +3941,7 @@ msgstr "" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4062,15 +4062,15 @@ msgstr "" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4099,12 +4099,6 @@ msgstr "" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4317,8 +4311,11 @@ msgstr "" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4410,7 +4407,7 @@ msgstr "" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4607,7 +4604,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4637,7 +4634,6 @@ msgstr "" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4807,10 +4803,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5430,7 +5422,7 @@ msgstr "" msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "" -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "" @@ -5580,7 +5572,7 @@ msgstr "" msgid "Asset Category Name" msgstr "" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "" @@ -5976,7 +5968,7 @@ msgstr "" msgid "Asset {0} must be submitted" msgstr "" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6014,11 +6006,11 @@ msgstr "" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "A (z) {item_code} domainhez nem létrehozott eszközök Az eszközt manuálisan kell létrehoznia." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "" @@ -6091,7 +6083,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "" @@ -6123,7 +6115,7 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "" @@ -6187,7 +6179,11 @@ msgstr "" msgid "Attribute Value" msgstr "" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "" @@ -6195,11 +6191,19 @@ msgstr "" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "" @@ -6259,24 +6263,12 @@ msgstr "" msgid "Auto Create Exchange Rate Revaluation" msgstr "" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6395,6 +6387,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6612,7 +6616,7 @@ msgstr "" msgid "Available for use date is required" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "" @@ -6711,7 +6715,7 @@ msgstr "" msgid "BIN Qty" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -6984,7 +6988,7 @@ msgstr "" msgid "BOM Website Operation" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7075,7 +7079,7 @@ msgstr "" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" +msgid "Backflush raw materials of subcontract based on" msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' @@ -7096,7 +7100,7 @@ msgstr "" msgid "Balance (Dr - Cr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "" @@ -7627,11 +7631,11 @@ msgstr "" msgid "Barcode Type" msgstr "" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "" @@ -7998,12 +8002,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -8076,7 +8080,7 @@ msgstr "" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" +msgid "Bill for rejected quantity in Purchase Invoice" msgstr "" #. Label of a Card Break in the Manufacturing Workspace @@ -8417,8 +8421,11 @@ msgstr "" msgid "Blanket Order Rate" msgstr "" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -8933,7 +8940,7 @@ msgstr "Beszerzés és Értékesítés" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "" @@ -9298,7 +9305,7 @@ msgstr "" msgid "Can only make payment against unbilled {0}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9354,9 +9361,9 @@ msgstr "" msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "" @@ -9384,7 +9391,7 @@ msgstr "" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "" @@ -9420,7 +9427,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9428,7 +9435,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "" -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "" @@ -9440,7 +9447,7 @@ msgstr "" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "" @@ -9468,11 +9475,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9498,7 +9505,7 @@ msgstr "" msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "Nem lehet törölni az árfolyamnyereség/veszteség sort" @@ -9535,7 +9542,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "Nem lehet a gyártott mennyiségnél többet szétszerelni." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9543,8 +9550,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "" @@ -9588,7 +9595,7 @@ msgstr "" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9606,8 +9613,8 @@ msgstr "" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9623,7 +9630,7 @@ msgstr "" msgid "Cannot set authorization on basis of Discount for {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "" @@ -10534,7 +10541,7 @@ msgstr "" msgid "Closing (Dr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "" @@ -10995,7 +11002,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11277,7 +11284,7 @@ msgstr "" msgid "Company Abbreviation" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11290,7 +11297,7 @@ msgstr "" msgid "Company Account" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "" @@ -11466,7 +11473,7 @@ msgstr "" msgid "Company is mandatory" msgstr "A cég kötelező" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "A cég kötelező a céges számla megadásához" @@ -11737,7 +11744,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11750,7 +11757,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11768,13 +11777,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "" @@ -11952,7 +11961,7 @@ msgstr "" msgid "Consumed" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "" @@ -11996,7 +12005,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12169,10 +12178,6 @@ msgstr "A kapcsolattartó személy nem tartozik ide: {0}" msgid "Contact:" msgstr "Kapcsolat:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Kapcsolat: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12350,7 +12355,7 @@ msgstr "Átváltási Tényező" msgid "Conversion Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "" @@ -12622,7 +12627,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12717,7 +12722,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "" @@ -13055,7 +13060,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "" @@ -13428,7 +13433,7 @@ msgstr "" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "" @@ -13569,15 +13574,15 @@ msgstr "" msgid "Credit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "" @@ -13772,7 +13777,7 @@ msgstr "" msgid "Creditors" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14070,7 +14075,7 @@ msgstr "" msgid "Current Serial No" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14271,7 +14276,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15044,7 +15049,7 @@ msgstr "" msgid "Day Of Week" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15160,11 +15165,11 @@ msgstr "" msgid "Debit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "" @@ -15174,7 +15179,7 @@ msgstr "" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "" @@ -15285,7 +15290,7 @@ msgstr "" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15427,7 +15432,7 @@ msgstr "" msgid "Default BOM" msgstr "" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "" @@ -15784,15 +15789,15 @@ msgstr "" msgid "Default Unit of Measure" msgstr "Alapértelmezett mértékegység" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "" -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "" @@ -16093,7 +16098,7 @@ msgstr "" msgid "Delivered" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "" @@ -16143,8 +16148,8 @@ msgstr "" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16155,11 +16160,11 @@ msgstr "" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16248,7 +16253,7 @@ msgstr "" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16773,7 +16778,7 @@ msgstr "" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "" @@ -16937,10 +16942,8 @@ msgstr "" msgid "Disable In Words" msgstr "" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' @@ -16982,6 +16985,12 @@ msgstr "" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17038,7 +17047,7 @@ msgstr "" msgid "Disassemble Order" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17563,6 +17572,12 @@ msgstr "" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17653,9 +17668,12 @@ msgstr "" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17673,6 +17691,10 @@ msgstr "" msgid "Document Type already used as a dimension" msgstr "" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -17977,7 +17999,7 @@ msgstr "" msgid "Duplicate Sales Invoices found" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18097,8 +18119,8 @@ msgstr "" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18321,7 +18343,7 @@ msgstr "" msgid "Email Sent to Supplier {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18511,7 +18533,7 @@ msgstr "" msgid "Employee cannot report to himself." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18519,7 +18541,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18532,7 +18554,7 @@ msgstr "" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18575,7 +18597,7 @@ msgstr "" msgid "Enable Auto Email" msgstr "" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "" @@ -19173,7 +19195,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "" @@ -19219,7 +19241,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "" @@ -19248,7 +19270,7 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19607,7 +19629,7 @@ msgstr "" msgid "Expense" msgstr "" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "" @@ -19655,7 +19677,7 @@ msgstr "" msgid "Expense Account" msgstr "" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "" @@ -20118,7 +20140,7 @@ msgstr "" msgid "Filter by Reference Date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20448,7 +20470,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20543,7 +20565,7 @@ msgstr "" msgid "Fiscal Year" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20607,7 +20629,7 @@ msgstr "" msgid "Fixed Asset Defaults" msgstr "" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "" @@ -20757,7 +20779,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20788,7 +20810,7 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "" @@ -20872,6 +20894,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20893,7 +20921,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -20902,7 +20930,7 @@ msgstr "" msgid "For reference" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" @@ -20926,7 +20954,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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -20935,7 +20963,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -21548,7 +21576,7 @@ msgstr "" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21560,7 +21588,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "" @@ -22075,7 +22103,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -22258,7 +22286,7 @@ msgstr "" msgid "Grant Commission" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "" @@ -22899,10 +22927,10 @@ msgstr "" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23057,7 +23085,7 @@ msgstr "" msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23239,7 +23267,7 @@ msgstr "" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23411,11 +23439,11 @@ msgstr "" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "" @@ -23531,7 +23559,7 @@ msgstr "" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23583,7 +23611,7 @@ msgstr "" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "" @@ -23626,7 +23654,7 @@ msgstr "" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23640,6 +23668,7 @@ msgid "Implementation Partner" msgstr "" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -23993,7 +24022,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24247,7 +24276,7 @@ msgstr "" msgid "Incorrect Batch Consumed" msgstr "" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" @@ -24255,7 +24284,7 @@ msgstr "" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "" @@ -24465,14 +24494,14 @@ msgstr "" msgid "Inspected By" msgstr "" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "" @@ -24489,7 +24518,7 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "" @@ -24571,8 +24600,8 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "" @@ -24792,7 +24821,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -24885,7 +24914,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -24915,7 +24944,7 @@ msgstr "" msgid "Invalid Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "" @@ -25001,12 +25030,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25043,7 +25072,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "" @@ -25172,7 +25201,6 @@ msgstr "" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "" @@ -25193,10 +25221,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25718,12 +25742,12 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' @@ -25996,7 +26020,7 @@ msgstr "" msgid "Issuing Date" msgstr "" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" @@ -26066,7 +26090,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26113,6 +26137,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26128,7 +26153,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26892,6 +26916,7 @@ msgstr "" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26902,7 +26927,6 @@ msgstr "" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27162,11 +27186,11 @@ msgstr "" msgid "Item Variant {0} already exists with same attributes" msgstr "" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "" @@ -27205,6 +27229,15 @@ msgstr "" msgid "Item Weight Details" msgstr "" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27234,7 +27267,7 @@ msgstr "" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27254,11 +27287,11 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "" @@ -27288,7 +27321,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27307,10 +27340,14 @@ msgstr "" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27324,7 +27361,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "" @@ -27332,7 +27369,7 @@ msgstr "" msgid "Item {0} does not exist in the system or has expired" msgstr "" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "Tétel: {0}, nem létezik." @@ -27348,15 +27385,15 @@ msgstr "" msgid "Item {0} has been disabled" msgstr "Tétel {0} ,le lett tiltva" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "" @@ -27368,19 +27405,23 @@ msgstr "" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "" @@ -27388,7 +27429,11 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -27404,7 +27449,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27420,7 +27465,7 @@ msgstr "" msgid "Item {0}: {1} qty produced. " msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "" @@ -27530,7 +27575,7 @@ msgstr "" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -28163,7 +28208,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28441,7 +28486,7 @@ msgstr "" msgid "Length (cm)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "" @@ -28582,7 +28627,7 @@ msgstr "" msgid "Linked Location" msgstr "" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "" @@ -28977,11 +29022,6 @@ msgstr "" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -28993,6 +29033,11 @@ msgstr "" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29189,7 +29234,7 @@ msgid "Major/Optional Subjects" msgstr "" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29358,8 +29403,8 @@ msgstr "" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29418,8 +29463,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29568,7 +29613,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "" @@ -29844,7 +29889,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -29915,6 +29960,7 @@ msgstr "" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30021,11 +30067,11 @@ msgstr "" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "" @@ -30140,7 +30186,7 @@ msgstr "" msgid "Material Transferred for Manufacturing" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30269,11 +30315,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -30717,11 +30763,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "" @@ -30759,7 +30805,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "" @@ -30767,11 +30813,11 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30815,10 +30861,6 @@ msgstr "" msgid "Mixed Conditions" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "Mobil: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31087,7 +31129,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:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31166,27 +31208,20 @@ msgstr "" msgid "Naming Series Prefix" msgstr "" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31234,16 +31269,16 @@ msgstr "" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "" @@ -31857,7 +31892,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "" @@ -31870,7 +31905,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "" @@ -31915,7 +31950,7 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "" @@ -31928,7 +31963,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "" @@ -31940,7 +31975,7 @@ msgstr "" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -31948,7 +31983,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32042,7 +32077,7 @@ msgstr "" msgid "No more children on Right" msgstr "" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32217,7 +32252,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32309,7 +32344,7 @@ msgstr "" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "" @@ -32413,7 +32448,7 @@ msgstr "" msgid "Not authorized to edit frozen Account {0}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32459,7 +32494,7 @@ msgstr "" msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "" -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -32936,7 +32971,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33087,7 +33122,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "" @@ -33246,16 +33281,16 @@ msgstr "" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33612,7 +33647,7 @@ msgstr "" msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33746,7 +33781,7 @@ msgstr "" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "" @@ -33954,7 +33989,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34012,7 +34047,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34030,7 +34065,7 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "" @@ -34273,7 +34308,6 @@ msgstr "" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "" @@ -34544,7 +34578,7 @@ msgstr "" msgid "Packed Items" msgstr "" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -34992,7 +35026,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35128,7 +35162,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35254,7 +35288,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35340,7 +35374,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35643,7 +35677,6 @@ msgstr "" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35901,7 +35934,7 @@ msgstr "" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -35980,10 +36013,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37003,7 +37032,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "" @@ -37035,11 +37064,11 @@ msgstr "" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "" @@ -37059,7 +37088,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -37166,7 +37195,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "" @@ -37235,11 +37264,11 @@ msgstr "" msgid "Please enter Approving Role or Approving User" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "" @@ -37251,7 +37280,7 @@ msgstr "" msgid "Please enter Employee Id of this sales person" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "" @@ -37296,7 +37325,7 @@ msgstr "" msgid "Please enter Root Type for account- {0}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "" @@ -37373,7 +37402,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37487,12 +37516,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "" @@ -37508,13 +37537,13 @@ msgstr "" msgid "Please select Category first" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "" @@ -37523,7 +37552,7 @@ msgstr "" msgid "Please select Company and Posting Date to getting entries" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "" @@ -37572,7 +37601,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "" @@ -37580,11 +37609,11 @@ msgstr "" msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "" @@ -37637,7 +37666,7 @@ msgstr "" msgid "Please select a Supplier" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "" @@ -37698,7 +37727,7 @@ msgstr "Kérjük, válasszon ki egy sort az újrakönyvelési bejegyzés létreh msgid "Please select a supplier for fetching payments." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37718,7 +37747,7 @@ msgstr "" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37825,7 +37854,7 @@ msgstr "" msgid "Please select weekly off day" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "" @@ -37965,7 +37994,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -38009,7 +38038,7 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" @@ -38128,7 +38157,7 @@ msgstr "" msgid "Please specify at least one attribute in the Attributes table" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "" @@ -38299,7 +38328,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38324,7 +38353,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38439,7 +38468,7 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "" @@ -38618,6 +38647,12 @@ msgstr "" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -38911,7 +38946,9 @@ msgstr "" msgid "Price per Unit (Stock UOM)" msgstr "" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40266,6 +40303,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40302,6 +40340,12 @@ msgstr "" msgid "Purchase Invoice Item" msgstr "" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40353,6 +40397,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40362,7 +40407,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40479,7 +40524,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "" @@ -40542,6 +40587,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40556,7 +40602,7 @@ msgstr "" msgid "Purchase Receipt" msgstr "" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40822,7 +40868,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41410,7 +41455,7 @@ msgstr "" msgid "Quality Review Objective" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41471,7 +41516,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41665,7 +41710,7 @@ msgstr "" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "" @@ -41720,7 +41765,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41883,7 +41928,6 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42293,8 +42337,8 @@ msgstr "" msgid "Raw SQL" msgstr "" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42702,11 +42746,10 @@ msgstr "" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43230,7 +43273,7 @@ msgstr "" msgid "Rejected Warehouse" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "" @@ -43280,7 +43323,7 @@ msgid "Remaining Balance" msgstr "" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43334,7 +43377,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43373,7 +43416,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "" @@ -43777,6 +43820,7 @@ msgstr "" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44050,7 +44094,7 @@ msgstr "" msgid "Reserved" msgstr "" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44663,7 +44707,7 @@ msgstr "" msgid "Reversal Of" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "" @@ -44812,10 +44856,7 @@ msgstr "" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "" @@ -44830,8 +44871,11 @@ msgstr "" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45032,8 +45076,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -45060,11 +45104,11 @@ msgstr "" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45090,7 +45134,7 @@ msgstr "" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "" @@ -45291,7 +45335,7 @@ msgstr "" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -45351,7 +45395,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45379,7 +45423,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "" @@ -45432,7 +45476,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "" @@ -45457,7 +45501,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "" @@ -45483,15 +45527,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45522,11 +45566,11 @@ msgstr "" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "" @@ -45569,7 +45613,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "" @@ -45617,11 +45661,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45674,11 +45718,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "" -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "" @@ -45706,7 +45750,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "" @@ -45742,23 +45786,23 @@ msgstr "" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "#{idx}sor: {field_label} nem lehet negatív a tételre: {item_code}." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45766,7 +45810,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45831,7 +45875,7 @@ msgstr "" msgid "Row #{}: {} {} does not exist." msgstr "" -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" @@ -45847,7 +45891,7 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -45879,7 +45923,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:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -45937,7 +45981,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "" @@ -45978,7 +46022,7 @@ msgstr "" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -46102,7 +46146,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "" @@ -46114,11 +46158,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:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -46142,7 +46186,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:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46195,7 +46239,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:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -46225,7 +46269,7 @@ msgstr "" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" @@ -46291,7 +46335,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46588,7 +46632,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46762,7 +46806,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46885,8 +46929,8 @@ msgstr "" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47297,7 +47341,7 @@ msgstr "" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "" @@ -47334,7 +47378,7 @@ msgstr "" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -47623,7 +47667,7 @@ msgstr "" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47768,7 +47812,7 @@ msgstr "" msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "" @@ -48463,7 +48507,7 @@ msgstr "" msgid "Serial No Reserved" msgstr "" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48524,7 +48568,7 @@ msgstr "" msgid "Serial No is mandatory for Item {0}" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "" @@ -48810,7 +48854,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48836,7 +48880,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49234,12 +49278,6 @@ msgstr "" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "" @@ -49345,6 +49383,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "" @@ -49843,7 +49887,7 @@ msgstr "" msgid "Show Barcode Field in Stock Transactions" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "" @@ -49851,7 +49895,7 @@ msgstr "" msgid "Show Completed" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -49934,7 +49978,7 @@ msgstr "" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "" @@ -49946,7 +49990,7 @@ msgstr "" msgid "Show Open" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "" @@ -49959,11 +50003,6 @@ msgstr "" msgid "Show Operations" msgstr "" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "" @@ -49979,7 +50018,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "" @@ -50046,6 +50085,11 @@ msgstr "" msgid "Show only the Immediate Upcoming Term" msgstr "" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "" @@ -50332,11 +50376,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50402,7 +50446,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "" @@ -50416,8 +50460,8 @@ msgid "Source of Funds (Liabilities)" msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "" @@ -50582,8 +50626,8 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "" @@ -50916,7 +50960,7 @@ msgstr "" msgid "Stock Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -51187,7 +51231,7 @@ msgstr "" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51199,7 +51243,7 @@ msgstr "" msgid "Stock Reconciliation Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "" @@ -51237,7 +51281,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51265,7 +51309,7 @@ msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "" @@ -51647,7 +51691,7 @@ msgstr "" #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "" @@ -51725,10 +51769,6 @@ msgstr "" msgid "Sub Procedure" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -51945,7 +51985,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -51971,7 +52011,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "" @@ -52060,7 +52100,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "" @@ -52235,7 +52275,7 @@ msgstr "" msgid "Successfully Set Supplier" msgstr "" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "" @@ -52391,6 +52431,7 @@ msgstr "" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52432,8 +52473,8 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52481,6 +52522,12 @@ msgstr "" msgid "Supplier Contact" msgstr "" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52575,7 +52622,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "" @@ -52855,19 +52902,10 @@ msgstr "" msgid "Supplier {0} not found in {1}" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -52929,7 +52967,7 @@ msgstr "" msgid "Support Tickets" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53188,8 +53226,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "" @@ -53657,7 +53695,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "" @@ -53818,7 +53856,7 @@ msgstr "" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "" @@ -54008,7 +54046,6 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54200,7 +54237,7 @@ msgstr "" msgid "The BOM which will be replaced" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54244,7 +54281,7 @@ msgstr "" msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54260,7 +54297,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "" @@ -54296,7 +54333,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54402,7 +54439,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "" @@ -54446,15 +54483,15 @@ msgstr "" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54610,7 +54647,7 @@ msgstr "" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "" @@ -54632,11 +54669,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -54708,7 +54745,7 @@ msgstr "" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54761,7 +54798,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54805,7 +54842,7 @@ msgstr "" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54861,11 +54898,11 @@ msgstr "" msgid "This Month's Summary" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55666,7 +55703,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "" @@ -55701,7 +55738,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "" @@ -55852,7 +55889,7 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "" @@ -56275,7 +56312,7 @@ msgstr "" msgid "Total Payments" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56307,7 +56344,7 @@ msgstr "" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "" @@ -56693,7 +56730,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56704,7 +56741,7 @@ msgstr "" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "" @@ -57376,11 +57413,11 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57452,7 +57489,7 @@ msgstr "" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57528,7 +57565,7 @@ msgstr "" msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "" @@ -57647,7 +57684,7 @@ msgstr "" msgid "Unit of Measure (UOM)" msgstr "" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "" @@ -57767,10 +57804,9 @@ msgid "Unreconcile Transaction" msgstr "" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "" @@ -57793,10 +57829,6 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57842,7 +57874,7 @@ msgstr "" msgid "Unsecured Loans" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58057,12 +58089,6 @@ msgstr "" msgid "Update Type" msgstr "" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58103,7 +58129,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "" @@ -58561,12 +58587,6 @@ msgstr "" msgid "Validate Components and Quantities Per BOM" msgstr "" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58590,6 +58610,12 @@ msgstr "" msgid "Validate Stock on Save" msgstr "" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58696,11 +58722,11 @@ msgstr "" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "" -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "" @@ -58710,7 +58736,7 @@ msgstr "" msgid "Valuation and Total" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "" @@ -58860,7 +58886,7 @@ msgstr "" msgid "Variant" msgstr "" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "" @@ -58879,7 +58905,7 @@ msgstr "" msgid "Variant Based On" msgstr "" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "" @@ -58897,7 +58923,7 @@ msgstr "" msgid "Variant Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "" @@ -59278,7 +59304,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59318,7 +59344,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "" @@ -59350,7 +59376,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59585,7 +59611,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "" @@ -59632,7 +59658,7 @@ msgstr "" #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59688,6 +59714,12 @@ msgstr "" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" @@ -59871,7 +59903,7 @@ msgstr "" msgid "Website:" msgstr "Weboldal:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60245,7 +60277,7 @@ msgstr "" msgid "Work Order Item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60307,11 +60339,11 @@ msgstr "" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "" @@ -60627,11 +60659,11 @@ msgstr "" msgid "Year Start Date" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60684,7 +60716,7 @@ msgstr "" msgid "You can also set default CWIP account in Company {}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60838,6 +60870,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60866,7 +60902,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60874,7 +60910,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "" @@ -60945,8 +60981,11 @@ msgstr "" msgid "Zero quantity" msgstr "" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61058,7 +61097,7 @@ msgstr "" msgid "fieldname" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61276,6 +61315,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "" @@ -61334,7 +61377,8 @@ msgstr "" msgid "{0} Digest" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61354,7 +61398,7 @@ msgstr "" msgid "{0} Request for {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "" @@ -61467,7 +61511,7 @@ msgid "{0} entered twice in Item Tax" msgstr "" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "" @@ -61635,7 +61679,7 @@ msgstr "" msgid "{0} payment entries can not be filtered by {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61648,7 +61692,7 @@ msgstr "{0}-tól {1}-ig" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" @@ -61850,7 +61894,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -61936,23 +61980,23 @@ msgstr "" msgid "{0}: {1} is a group account." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} törlik vagy zárva." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" diff --git a/erpnext/locale/id.po b/erpnext/locale/id.po index 1897789be46..6e236ccc991 100644 --- a/erpnext/locale/id.po +++ b/erpnext/locale/id.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:21\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:21\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Indonesian\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr " Sub Rakitan" msgid " Summary" msgstr " Ringkasan" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"Item Dari Pelanggan\" tidak boleh sekaligus menjadi Item yang Dibeli" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"Item Dari Pelanggan\" tidak boleh memiliki Tarif Valuasi" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "\"Aset Tetap\" tidak dapat dibatalkan centangnya, karena sudah ada catatan Aset untuk item ini" @@ -302,7 +302,7 @@ msgstr "'Tanggal Awal' wajib diisi" msgid "'From Date' must be after 'To Date'" msgstr "'Tanggal Awal harus sebelum 'Tanggal Akhir'" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "'Memiliki No. Seri' tidak bisa 'Ya' untuk barang non-stok" @@ -338,7 +338,7 @@ msgstr "'Perbarui Stok' tidak dapat dicentang karena barang tidak dikirim melalu msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "'Perbarui Stok' tidak dapat dicentang untuk penjualan aset tetap" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "Akun '{0}' sudah digunakan oleh {1}. Gunakan akun lain." @@ -1094,7 +1094,7 @@ msgstr "Pengemudi harus diatur untuk submit." msgid "A logical Warehouse against which stock entries are made." msgstr "Gudang logis tempat entri stok dicatat." -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1306,7 +1306,7 @@ msgstr "Kunci Akses diperlukan untuk Penyedia Layanan: {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "Menurut CEFACT/ICG/2010/IC013 atau CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "Menurut BOM {0}, Item '{1}' tidak ada dalam entri stok." @@ -1976,8 +1976,8 @@ msgstr "Entri Akuntansi" msgid "Accounting Entry for Asset" msgstr "Entri Akuntansi untuk Aset" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "Entri Akuntansi untuk LCV dalam Entri Stok {0}" @@ -1985,7 +1985,7 @@ msgstr "Entri Akuntansi untuk LCV dalam Entri Stok {0}" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "Entri Akuntansi untuk Voucher Biaya Pendaratan untuk SCR {0}" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Entri Akuntansi untuk Layanan" @@ -1998,16 +1998,16 @@ msgstr "Entri Akuntansi untuk Layanan" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Entri Akuntansi untuk Persediaan" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "Entri Akuntansi untuk {0}" @@ -2305,12 +2305,6 @@ msgstr "" msgid "Action If Quality Inspection Is Rejected" msgstr "" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "Tindakan Dimulai" @@ -2369,6 +2363,12 @@ msgstr "" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2636,7 +2636,7 @@ msgstr "" msgid "Actual qty in stock" msgstr "Kuantitas aktual di stok" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "Pajak tipe Aktual tidak dapat dimasukkan dalam tarif Item di baris {0}" @@ -2650,7 +2650,7 @@ msgstr "" msgid "Add / Edit Prices" msgstr "Tambah / Edit Harga" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "" @@ -2804,7 +2804,7 @@ msgstr "Tambah No Seri / Batch" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "Tambah No Seri / Batch (Jml Ditolak)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -3049,7 +3049,7 @@ msgstr "Jumlah Diskon Tambahan" msgid "Additional Discount Amount (Company Currency)" msgstr "Jumlah Diskon Tambahan (Mata Uang Perusahaan)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -3334,7 +3334,7 @@ msgstr "" msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3447,7 +3447,7 @@ msgstr "" msgid "Advance amount" msgstr "Jumlah uang muka" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Jumlah uang muka tidak boleh lebih besar dari {0} {1}" @@ -3516,7 +3516,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Akun Lawan" @@ -3634,7 +3634,7 @@ msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "Voucher Lawan" @@ -3658,7 +3658,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "Tipe Voucher Lawan" @@ -3939,7 +3939,7 @@ msgstr "Semua komunikasi termasuk dan di atas ini akan dipindahkan ke Isu baru" msgid "All items are already requested" msgstr "Semua barang sudah diminta" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "Semua item sudah Ditagih/Dikembalikan" @@ -3947,7 +3947,7 @@ msgstr "Semua item sudah Ditagih/Dikembalikan" msgid "All items have already been received" msgstr "Semua barang sudah diterima" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Semua item telah ditransfer untuk Perintah Kerja ini." @@ -3996,7 +3996,7 @@ msgstr "Alokasi" msgid "Allocate Advances Automatically (FIFO)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Alokasikan Jumlah Pembayaran" @@ -4006,7 +4006,7 @@ msgstr "Alokasikan Jumlah Pembayaran" msgid "Allocate Payment Based On Payment Terms" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "" @@ -4036,7 +4036,7 @@ msgstr "" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4157,15 +4157,15 @@ msgstr "" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4194,12 +4194,6 @@ msgstr "" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4412,8 +4406,11 @@ msgstr "" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4505,7 +4502,7 @@ msgstr "Diizinkan Untuk Bertransaksi Dengan" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4702,7 +4699,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4732,7 +4729,6 @@ msgstr "" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4902,10 +4898,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5525,7 +5517,7 @@ msgstr "Karena bidang {0} diaktifkan, bidang {1} wajib diisi." msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "Karena bidang {0} diaktifkan, nilai bidang {1} harus lebih dari 1." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "" @@ -5675,7 +5667,7 @@ msgstr "Akun Kategori Aset" msgid "Asset Category Name" msgstr "" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "Kategori Aset wajib diisi untuk item Aset Tetap" @@ -6071,7 +6063,7 @@ msgstr "" msgid "Asset {0} must be submitted" msgstr "Aset {0} harus disubmit" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6109,11 +6101,11 @@ msgstr "Aset" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "" -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "" @@ -6186,7 +6178,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "" @@ -6218,7 +6210,7 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "" @@ -6282,7 +6274,11 @@ msgstr "" msgid "Attribute Value" msgstr "" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "Tabel atribut wajib diisi" @@ -6290,11 +6286,19 @@ msgstr "Tabel atribut wajib diisi" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "Atribut {0} dipilih beberapa kali dalam Tabel Atribut" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Atribut" @@ -6354,24 +6358,12 @@ msgstr "" msgid "Auto Create Exchange Rate Revaluation" msgstr "" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6490,6 +6482,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6707,7 +6711,7 @@ msgstr "" msgid "Available for use date is required" msgstr "Tanggal siap digunakan wajib diisi" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "Jumlah tersedia adalah {0}, Anda memerlukan {1}" @@ -6806,7 +6810,7 @@ msgstr "" msgid "BIN Qty" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7079,7 +7083,7 @@ msgstr "Item Website BOM" msgid "BOM Website Operation" msgstr "Operasi Website BOM" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7170,7 +7174,7 @@ msgstr "" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" +msgid "Backflush raw materials of subcontract based on" msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' @@ -7191,7 +7195,7 @@ msgstr "Saldo" msgid "Balance (Dr - Cr)" msgstr "Saldo (Dr - Cr)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Saldo ({0})" @@ -7722,11 +7726,11 @@ msgstr "Perbankan" msgid "Barcode Type" msgstr "" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "Kode Batang {0} sudah digunakan pada Item {1}" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "Kode Batang {0} bukan kode {1} yang valid" @@ -8093,12 +8097,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "Batch {0} dari Barang {1} telah kedaluwarsa." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "Batch {0} dari Barang {1} dinonaktifkan." @@ -8171,7 +8175,7 @@ msgstr "No. Tagihan" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" +msgid "Bill for rejected quantity in Purchase Invoice" msgstr "" #. Label of a Card Break in the Manufacturing Workspace @@ -8512,8 +8516,11 @@ msgstr "" msgid "Blanket Order Rate" msgstr "" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -9028,7 +9035,7 @@ msgstr "" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "Pembelian harus dicentang, jika Berlaku Untuk dipilih sebagai {0}" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "" @@ -9393,7 +9400,7 @@ msgstr "Tidak dapat memfilter berdasarkan No. Voucher, jika dikelompokkan berdas msgid "Can only make payment against unbilled {0}" msgstr "Hanya dapat melakukan pembayaran terhadap {0} yang belum ditagih" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9449,9 +9456,9 @@ msgstr "" msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "" @@ -9479,7 +9486,7 @@ msgstr "" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "Tidak dapat menjadi item aset tetap karena Buku Besar Persediaan telah dibuat." @@ -9515,7 +9522,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9523,7 +9530,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "Tidak dapat membatalkan transaksi untuk Perintah Kerja yang Sudah Selesai." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "Tidak dapat mengubah Atribut setelah transaksi stok. Buat Item baru dan transfer stok ke Item baru." @@ -9535,7 +9542,7 @@ msgstr "" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "Tidak dapat mengubah Tanggal Berhenti Layanan untuk item di baris {0}." -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "Tidak dapat mengubah properti Varian setelah transaksi stok. Anda harus membuat Item baru untuk melakukan ini." @@ -9563,11 +9570,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "Tidak dapat mengkonversi ke Grup karena Tipe Akun dipilih." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9593,7 +9600,7 @@ msgstr "Tidak dapat mendeklarasikan sebagai hilang, karena Quotation telah dibua msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "Tidak bisa mengurangi ketika kategori adalah untuk 'Penilaian' atau 'Penilaian dan Total'" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -9630,7 +9637,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9638,8 +9645,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "Tidak dapat memastikan pengiriman dengan Serial No karena Item {0} ditambahkan dengan dan tanpa Pastikan Pengiriman dengan Serial No." @@ -9683,7 +9690,7 @@ msgstr "" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9701,8 +9708,8 @@ msgstr "" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9718,7 +9725,7 @@ msgstr "Tidak dapat ditetapkan sebagai Hilang sebagai Sales Order dibuat." msgid "Cannot set authorization on basis of Discount for {0}" msgstr "Tidak dapat mengatur otorisasi atas dasar Diskon untuk {0}" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "Tidak dapat menetapkan beberapa Default Item untuk sebuah perusahaan." @@ -10629,7 +10636,7 @@ msgstr "Penutupan (Kr)" msgid "Closing (Dr)" msgstr "Penutupan (Db)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "Penutupan (Pembukaan + Total)" @@ -11090,7 +11097,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11372,7 +11379,7 @@ msgstr "Perusahaan" msgid "Company Abbreviation" msgstr "Singkatan Perusahaan" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11385,7 +11392,7 @@ msgstr "Singkatan Perusahaan tidak boleh lebih dari 5 karakter" msgid "Company Account" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "" @@ -11561,7 +11568,7 @@ msgstr "" msgid "Company is mandatory" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "" @@ -11832,7 +11839,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11845,7 +11852,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11863,13 +11872,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "Konfigurasikan Daftar Harga default saat membuat transaksi Pembelian baru. Harga item akan diambil dari Daftar Harga ini." @@ -12047,7 +12056,7 @@ msgstr "" msgid "Consumed" msgstr "Dikonsumsi" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "Dikonsumsi Jumlah" @@ -12091,7 +12100,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12264,10 +12273,6 @@ msgstr "" msgid "Contact:" msgstr "Kontak:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "" - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12445,7 +12450,7 @@ msgstr "Faktor konversi" msgid "Conversion Rate" msgstr "Tingkat konversi" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "Faktor konversi untuk Unit default Ukur harus 1 berturut-turut {0}" @@ -12717,7 +12722,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12812,7 +12817,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "Pusat Biaya diperlukan pada baris {0} di tabel Pajak untuk tipe {1}" @@ -13150,7 +13155,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "Buat Entri Jurnal Antar Perusahaan" @@ -13523,7 +13528,7 @@ msgstr "" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "" @@ -13664,15 +13669,15 @@ msgstr "" msgid "Credit" msgstr "Kredit" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "Kredit ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "Akun Kredit" @@ -13867,7 +13872,7 @@ msgstr "" msgid "Creditors" msgstr "Kreditur" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14165,7 +14170,7 @@ msgstr "" msgid "Current Serial No" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14366,7 +14371,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15139,7 +15144,7 @@ msgstr "" msgid "Day Of Week" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15255,11 +15260,11 @@ msgstr "" msgid "Debit" msgstr "Debet" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "" @@ -15269,7 +15274,7 @@ msgstr "" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "Akun Debit" @@ -15380,7 +15385,7 @@ msgstr "" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15522,7 +15527,7 @@ msgstr "" msgid "Default BOM" msgstr "" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "BOM Default ({0}) harus aktif untuk item ini atau templatenya" @@ -15879,15 +15884,15 @@ msgstr "" msgid "Default Unit of Measure" msgstr "" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "Satuan Ukur Default untuk Barang {0} tidak dapat diubah secara langsung karena Anda telah melakukan transaksi dengan UOM lain. Anda perlu membuat Barang baru untuk menggunakan UOM Default yang berbeda." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "Satuan Ukur Default untuk Varian '{0}' harus sama seperti di Template '{1}'." @@ -16188,7 +16193,7 @@ msgstr "" msgid "Delivered" msgstr "Dikirim" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Jumlah Telah Terikirim" @@ -16238,8 +16243,8 @@ msgstr "Produk Terkirim untuk Ditagih" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16250,11 +16255,11 @@ msgstr "Qty Terkirim" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16343,7 +16348,7 @@ msgstr "" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16868,7 +16873,7 @@ msgstr "" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "Akun Selisih harus merupakan akun jenis Aset/Kewajiban, karena Rekonsiliasi Stok ini adalah Entri Pembuka" @@ -17032,10 +17037,8 @@ msgstr "" msgid "Disable In Words" msgstr "" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' @@ -17077,6 +17080,12 @@ msgstr "" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17133,7 +17142,7 @@ msgstr "" msgid "Disassemble Order" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17658,6 +17667,12 @@ msgstr "" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17748,9 +17763,12 @@ msgstr "Pencarian Dokumen" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17768,6 +17786,10 @@ msgstr "" msgid "Document Type already used as a dimension" msgstr "" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "Dokumentasi" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18072,7 +18094,7 @@ msgstr "Duplikat Proyek dengan Tugas" msgid "Duplicate Sales Invoices found" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18192,8 +18214,8 @@ msgstr "" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18416,7 +18438,7 @@ msgstr "" msgid "Email Sent to Supplier {0}" msgstr "Email Dikirim ke Pemasok {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18606,7 +18628,7 @@ msgstr "" msgid "Employee cannot report to himself." msgstr "Karyawan tidak dapat melapor ke dirinya sendiri." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18614,7 +18636,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "Karyawan wajib diisi saat menerbitkan Aset {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18627,7 +18649,7 @@ msgstr "" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18670,7 +18692,7 @@ msgstr "" msgid "Enable Auto Email" msgstr "" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "Aktifkan Pemesanan Ulang Otomatis" @@ -19268,7 +19290,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "Kesalahan: {0} adalah bidang wajib" @@ -19314,7 +19336,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "" @@ -19343,7 +19365,7 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19702,7 +19724,7 @@ msgstr "" msgid "Expense" msgstr "Biaya" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "Beban akun / Difference ({0}) harus akun 'Laba atau Rugi'" @@ -19750,7 +19772,7 @@ msgstr "Beban akun / Difference ({0}) harus akun 'Laba atau Rugi'" msgid "Expense Account" msgstr "Beban Akun" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "Akun Beban Hilang" @@ -20213,7 +20235,7 @@ msgstr "" msgid "Filter by Reference Date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20543,7 +20565,7 @@ msgstr "Gudang Barang Jadi" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20638,7 +20660,7 @@ msgstr "Rezim Fiskal adalah wajib, silakan mengatur rezim fiskal di perusahaan { msgid "Fiscal Year" msgstr "Tahun fiskal" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20702,7 +20724,7 @@ msgstr "" msgid "Fixed Asset Defaults" msgstr "" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "Fixed Asset Item harus barang non-persediaan." @@ -20852,7 +20874,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20883,7 +20905,7 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "Untuk Quantity (Diproduksi Qty) adalah wajib" @@ -20967,6 +20989,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20988,7 +21016,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -20997,7 +21025,7 @@ msgstr "" msgid "For reference" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "Untuk baris {0} di {1}. Untuk menyertakan {2} di tingkat Item, baris {3} juga harus disertakan" @@ -21021,7 +21049,7 @@ msgstr "Untuk ketentuan 'Terapkan Aturan Pada Lainnya', bidang {0} wajib 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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -21030,7 +21058,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -21643,7 +21671,7 @@ msgstr "" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21655,7 +21683,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "GL Entri" @@ -22170,7 +22198,7 @@ msgstr "Barang dalam Transit" msgid "Goods Transferred" msgstr "Barang Ditransfer" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "Barang sudah diterima dengan entri keluar {0}" @@ -22353,7 +22381,7 @@ msgstr "" msgid "Grant Commission" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "Lebih Besar Dari Jumlah" @@ -22994,10 +23022,10 @@ msgstr "" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23152,7 +23180,7 @@ msgstr "" msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23334,7 +23362,7 @@ msgstr "" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23506,11 +23534,11 @@ msgstr "" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "Jika opsi ini dikonfigurasi 'Ya', ERPNext akan mencegah Anda membuat Faktur Pembelian tanpa membuat Tanda Terima Pembelian terlebih dahulu. Konfigurasi ini dapat diganti untuk pemasok tertentu dengan mengaktifkan kotak centang 'Izinkan Pembuatan Faktur Pembelian Tanpa Tanda Terima Pembelian' di master Pemasok." @@ -23626,7 +23654,7 @@ msgstr "" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23678,7 +23706,7 @@ msgstr "" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "" @@ -23721,7 +23749,7 @@ msgstr "" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23735,6 +23763,7 @@ msgid "Implementation Partner" msgstr "" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24088,7 +24117,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24342,7 +24371,7 @@ msgstr "" msgid "Incorrect Batch Consumed" msgstr "" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" @@ -24350,7 +24379,7 @@ msgstr "" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "" @@ -24560,14 +24589,14 @@ msgstr "Diprakarsai" msgid "Inspected By" msgstr "Diperiksa Oleh" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "Inspeksi Diperlukan" @@ -24584,7 +24613,7 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "" @@ -24666,8 +24695,8 @@ msgstr "Izin Tidak Cukup" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "Persediaan tidak cukup" @@ -24887,7 +24916,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -24980,7 +25009,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -25010,7 +25039,7 @@ msgstr "" msgid "Invalid Item" msgstr "Item Tidak Valid" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "" @@ -25096,12 +25125,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "Harga Jual Tidak Valid" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25138,7 +25167,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "Alasan hilang yang tidak valid {0}, harap buat alasan hilang yang baru" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Seri penamaan tidak valid (. Hilang) untuk {0}" @@ -25267,7 +25296,6 @@ msgstr "" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "" @@ -25288,10 +25316,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "Faktur Jumlah Total" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25813,12 +25837,12 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' @@ -26091,7 +26115,7 @@ msgstr "Isu" msgid "Issuing Date" msgstr "" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" @@ -26161,7 +26185,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26208,6 +26232,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26223,7 +26248,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26987,6 +27011,7 @@ msgstr "Item Produsen" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26997,7 +27022,6 @@ msgstr "Item Produsen" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27257,11 +27281,11 @@ msgstr "Pengaturan Variasi Item" msgid "Item Variant {0} already exists with same attributes" msgstr "Item Varian {0} sudah ada dengan atribut yang sama" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "Varian Item diperbarui" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "" @@ -27300,6 +27324,15 @@ msgstr "Item Situs Spesifikasi" msgid "Item Weight Details" msgstr "" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27329,7 +27362,7 @@ msgstr "" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27349,11 +27382,11 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "Item untuk baris {0} tidak cocok dengan Permintaan Material" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "Item memiliki varian." @@ -27383,7 +27416,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27402,10 +27435,14 @@ msgstr "" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "Item varian {0} ada dengan atribut yang sama" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27419,7 +27456,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "Item {0} tidak ada" @@ -27427,7 +27464,7 @@ msgstr "Item {0} tidak ada" msgid "Item {0} does not exist in the system or has expired" msgstr "Item {0} tidak ada dalam sistem atau telah berakhir" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "" @@ -27443,15 +27480,15 @@ msgstr "Item {0} telah dikembalikan" msgid "Item {0} has been disabled" msgstr "Item {0} telah dinonaktifkan" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "Item {0} telah mencapai akhir hidupnya pada {1}" @@ -27463,19 +27500,23 @@ msgstr "Barang {0} diabaikan karena bukan barang persediaan" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "Item {0} dibatalkan" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "Item {0} dinonaktifkan" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "Item {0} bukan merupakan Stok Barang serial" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "Barang {0} bukan merupakan Barang persediaan" @@ -27483,7 +27524,11 @@ msgstr "Barang {0} bukan merupakan Barang persediaan" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "Item {0} tidak aktif atau akhir hidup telah tercapai" @@ -27499,7 +27544,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "Barang {0} harus barang non-persediaan" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27515,7 +27560,7 @@ msgstr "Item {0}: qty Memerintahkan {1} tidak bisa kurang dari qty minimum order msgid "Item {0}: {1} qty produced. " msgstr "Item {0}: {1} jumlah diproduksi." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "" @@ -27625,7 +27670,7 @@ msgstr "Item untuk Permintaan Bahan Baku" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -28258,7 +28303,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "Transaksi Stok Terakhir untuk item {0} dalam gudang {1} adalah pada {2}." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28536,7 +28581,7 @@ msgstr "" msgid "Length (cm)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "Jumlah Kurang Dari" @@ -28677,7 +28722,7 @@ msgstr "" msgid "Linked Location" msgstr "Lokasi Terhubung" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "" @@ -29072,11 +29117,6 @@ msgstr "" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29088,6 +29128,11 @@ msgstr "" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29284,7 +29329,7 @@ msgid "Major/Optional Subjects" msgstr "" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29453,8 +29498,8 @@ msgstr "" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29513,8 +29558,8 @@ msgstr "Entri manual tidak dapat dibuat! Nonaktifkan entri otomatis untuk akunta #: 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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29663,7 +29708,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "Manajer Manufaktur" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "Qty Manufaktur wajib diisi" @@ -29939,7 +29984,7 @@ msgstr "Bahan konsumsi" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -30010,6 +30055,7 @@ msgstr "Nota Penerimaan Barang" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30116,11 +30162,11 @@ msgstr "Item Rencana Permintaan Material" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "Permintaan Bahan tidak dibuat, karena kuantitas untuk Bahan Baku sudah tersedia." @@ -30235,7 +30281,7 @@ msgstr "" msgid "Material Transferred for Manufacturing" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30364,11 +30410,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "Sampel Maksimum - {0} dapat disimpan untuk Batch {1} dan Item {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "Sampel Maksimum - {0} telah disimpan untuk Batch {1} dan Item {2} di Batch {3}." @@ -30812,11 +30858,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "Beban lain-lain" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "" @@ -30854,7 +30900,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "" @@ -30862,11 +30908,11 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30910,10 +30956,6 @@ msgstr "" msgid "Mixed Conditions" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "" - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31182,7 +31224,7 @@ msgstr "" msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "Beberapa tahun fiskal ada untuk tanggal {0}. Silakan set perusahaan di Tahun Anggaran" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31261,27 +31303,20 @@ msgstr "" msgid "Naming Series Prefix" msgstr "" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31329,16 +31364,16 @@ msgstr "Butuh analisa" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "Jumlah negatif tidak diperbolehkan" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "Tingkat Penilaian Negatif tidak diperbolehkan" @@ -31952,7 +31987,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "Tidak ada izin" @@ -31965,7 +32000,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "" @@ -32010,7 +32045,7 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "Tidak ada entri akuntansi untuk gudang berikut" @@ -32023,7 +32058,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "Tidak ada BOM aktif yang ditemukan untuk item {0}. Pengiriman dengan Serial No tidak dapat dipastikan" @@ -32035,7 +32070,7 @@ msgstr "" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -32043,7 +32078,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32137,7 +32172,7 @@ msgstr "" msgid "No more children on Right" msgstr "" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32312,7 +32347,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32404,7 +32439,7 @@ msgstr "" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "Tak satu pun dari item memiliki perubahan kuantitas atau nilai." @@ -32508,7 +32543,7 @@ msgstr "" msgid "Not authorized to edit frozen Account {0}" msgstr "Tidak berwenang untuk mengedit Akun frozen {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32554,7 +32589,7 @@ msgstr "Catatan: Entry Pembayaran tidak akan dibuat karena 'Cash atau Rekening B msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "Catatan: Biaya Pusat ini adalah Group. Tidak bisa membuat entri akuntansi terhadap kelompok-kelompok." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -33031,7 +33066,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33182,7 +33217,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "Pembukaan" @@ -33341,16 +33376,16 @@ msgstr "" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Persediaan pembukaan" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33707,7 +33742,7 @@ msgstr "Opsional. Pengaturan ini akan digunakan untuk menyaring dalam berbagai t msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33841,7 +33876,7 @@ msgstr "Qty Terpesan/Terorder" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "Order" @@ -34049,7 +34084,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34107,7 +34142,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34125,7 +34160,7 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "" @@ -34368,7 +34403,6 @@ msgstr "Bidang POS" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "Faktur POS" @@ -34639,7 +34673,7 @@ msgstr "Stok Barang Kemasan" msgid "Packed Items" msgstr "" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -35087,7 +35121,7 @@ msgstr "Diterima sebagian" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35223,7 +35257,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35349,7 +35383,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35435,7 +35469,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35738,7 +35772,6 @@ msgstr "Entries pembayaran {0} adalah un-linked" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35996,7 +36029,7 @@ msgstr "" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36075,10 +36108,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37098,7 +37127,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "Harap Setel Grup Pemasok di Setelan Beli." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "" @@ -37130,11 +37159,11 @@ msgstr "Harap tambahkan akun Pembukaan Sementara di Bagan Akun" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "" @@ -37154,7 +37183,7 @@ msgstr "Harap tambahkan akun ke Perusahaan tingkat akar - {}" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -37261,7 +37290,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "Harap buat tanda terima pembelian atau beli faktur untuk item {0}" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "" @@ -37330,11 +37359,11 @@ msgstr "Silahkan masukkan account untuk Perubahan Jumlah" msgid "Please enter Approving Role or Approving User" msgstr "Entrikan Menyetujui Peran atau Menyetujui Pengguna" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "Harap Masukan Jenis Biaya Pusat" @@ -37346,7 +37375,7 @@ msgstr "Harap masukkan Tanggal Pengiriman" msgid "Please enter Employee Id of this sales person" msgstr "Cukup masukkan Id Karyawan Sales Person ini" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "Masukan Entrikan Beban Akun" @@ -37391,7 +37420,7 @@ msgstr "Harap masukkan tanggal Referensi" msgid "Please enter Root Type for account- {0}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "" @@ -37468,7 +37497,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "Harap masukkan nomor telepon terlebih dahulu" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37582,12 +37611,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "Silakan pilih Jenis Templat untuk mengunduh templat" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "Silakan pilih Terapkan Diskon Pada" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "Silahkan pilih BOM terhadap item {0}" @@ -37603,13 +37632,13 @@ msgstr "" msgid "Please select Category first" msgstr "Silahkan pilih Kategori terlebih dahulu" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "Silakan pilih Mengisi Tipe terlebih dahulu" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "Silakan pilih Perusahaan" @@ -37618,7 +37647,7 @@ msgstr "Silakan pilih Perusahaan" msgid "Please select Company and Posting Date to getting entries" msgstr "Silakan pilih Perusahaan dan Tanggal Posting untuk mendapatkan entri" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "Silakan pilih Perusahaan terlebih dahulu" @@ -37667,7 +37696,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "Silakan pilih Posting Tanggal sebelum memilih Partai" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "Silakan pilih Posting Tanggal terlebih dahulu" @@ -37675,11 +37704,11 @@ msgstr "Silakan pilih Posting Tanggal terlebih dahulu" msgid "Please select Price List" msgstr "Silakan pilih Daftar Harga" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "Silakan pilih Qty terhadap item {0}" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "Silahkan pilih Sampel Retention Warehouse di Stock Settings terlebih dahulu" @@ -37732,7 +37761,7 @@ msgstr "" msgid "Please select a Supplier" msgstr "Silakan pilih a Pemasok" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "" @@ -37793,7 +37822,7 @@ msgstr "Harap pilih satu baris untuk membuat Entri Reposting" msgid "Please select a supplier for fetching payments." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37813,7 +37842,7 @@ msgstr "" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37920,7 +37949,7 @@ msgstr "" msgid "Please select weekly off day" msgstr "Silakan pilih dari hari mingguan" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "Silahkan pilih {0} terlebih dahulu" @@ -38060,7 +38089,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -38104,7 +38133,7 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "Silakan atur UOM default dalam Pengaturan Stok" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" @@ -38223,7 +38252,7 @@ msgstr "" msgid "Please specify at least one attribute in the Attributes table" msgstr "Silakan tentukan setidaknya satu atribut dalam tabel Atribut" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "Silakan tentukan baik Quantity atau Tingkat Penilaian atau keduanya" @@ -38394,7 +38423,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38419,7 +38448,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38534,7 +38563,7 @@ msgstr "" msgid "Posting Time" msgstr "Posting Waktu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "Tanggal posting dan posting waktu adalah wajib" @@ -38713,6 +38742,12 @@ msgstr "" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39006,7 +39041,9 @@ msgstr "Diperlukan harga atau potongan diskon produk" msgid "Price per Unit (Stock UOM)" msgstr "Harga per Unit (Stock UOM)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40361,6 +40398,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40397,6 +40435,12 @@ msgstr "Uang Muka Faktur Pembelian" msgid "Purchase Invoice Item" msgstr "Stok Barang Faktur Pembelian" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40448,6 +40492,7 @@ msgstr "Faktur Pembelian" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40457,7 +40502,7 @@ msgstr "Faktur Pembelian" #: 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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40574,7 +40619,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "Order Pembelian {0} tidak terkirim" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "Order pembelian" @@ -40637,6 +40682,7 @@ msgstr "Pembelian Daftar Harga" #: 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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40651,7 +40697,7 @@ msgstr "Pembelian Daftar Harga" msgid "Purchase Receipt" msgstr "Nota Penerimaan" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40917,7 +40963,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41505,7 +41550,7 @@ msgstr "Ulasan Kualitas" msgid "Quality Review Objective" msgstr "Tujuan Tinjauan Kualitas" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41566,7 +41611,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41760,7 +41805,7 @@ msgstr "" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "Jurnal Entry Cepat" @@ -41815,7 +41860,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41978,7 +42023,6 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42388,8 +42432,8 @@ msgstr "" msgid "Raw SQL" msgstr "" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42797,11 +42841,10 @@ msgstr "" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43325,7 +43368,7 @@ msgstr "" msgid "Rejected Warehouse" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "" @@ -43375,7 +43418,7 @@ msgid "Remaining Balance" msgstr "Saldo yang tersisa" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43429,7 +43472,7 @@ msgstr "Komentar" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43468,7 +43511,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "Item dihapus dengan tidak ada perubahan dalam jumlah atau nilai." @@ -43872,6 +43915,7 @@ msgstr "" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44145,7 +44189,7 @@ msgstr "" msgid "Reserved" msgstr "" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44758,7 +44802,7 @@ msgstr "" msgid "Reversal Of" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "Masuk Balik Jurnal" @@ -44907,10 +44951,7 @@ msgstr "" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "" @@ -44925,8 +44966,11 @@ msgstr "" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45127,8 +45171,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -45155,11 +45199,11 @@ msgstr "" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "Baris # {0}: Tidak dapat mengembalikan lebih dari {1} untuk Barang {2}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45185,7 +45229,7 @@ msgstr "Baris # {0} (Tabel Pembayaran): Jumlah harus negatif" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "Baris # {0} (Tabel Pembayaran): Jumlah harus positif" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "" @@ -45386,7 +45430,7 @@ msgstr "Baris # {0}: Entri duplikat di Referensi {1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "Baris # {0}: Tanggal Pengiriman yang diharapkan tidak boleh sebelum Tanggal Pemesanan Pembelian" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -45446,7 +45490,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "Baris # {0}: Item ditambahkan" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45474,7 +45518,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "Baris # {0}: Item {1} bukan Item Serialized / Batched. Itu tidak dapat memiliki Serial No / Batch No terhadapnya." @@ -45527,7 +45571,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "Baris # {0}: Operasi {1} tidak selesai untuk {2} jumlah barang jadi dalam Perintah Kerja {3}. Harap perbarui status operasi melalui Kartu Pekerjaan {4}." @@ -45552,7 +45596,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Baris #{0}: Silakan pilih Gudang Sub Perakitan" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "Row # {0}: Silakan mengatur kuantitas menyusun ulang" @@ -45578,15 +45622,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45617,11 +45661,11 @@ msgstr "" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "Row # {0}: Dokumen Referensi Type harus menjadi salah satu Purchase Order, Faktur Pembelian atau Journal Entri" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "Baris # {0}: Jenis Dokumen Referensi harus salah satu dari Pesanan Penjualan, Faktur Penjualan, Entri Jurnal atau Dunning" @@ -45664,7 +45708,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "Baris # {0}: Nomor Seri {1} bukan milik Kelompok {2}" @@ -45712,11 +45756,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45769,11 +45813,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "Baris # {0}: Kelompok {1} telah kedaluwarsa." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "" @@ -45801,7 +45845,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "" @@ -45837,23 +45881,23 @@ msgstr "" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45861,7 +45905,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45926,7 +45970,7 @@ msgstr "Baris # {}: {}" msgid "Row #{}: {} {} does not exist." msgstr "Baris # {}: {} {} tidak ada." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" @@ -45942,7 +45986,7 @@ msgstr "Baris {0}: Operasi diperlukan terhadap item bahan baku {1}" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -45974,7 +46018,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:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -46032,7 +46076,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "Row {0}: Kurs adalah wajib" @@ -46073,7 +46117,7 @@ msgstr "Row {0}: Dari Waktu dan To Waktu adalah wajib." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "Row {0}: Dari Waktu dan Untuk Waktu {1} adalah tumpang tindih dengan {2}" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -46197,7 +46241,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "Baris {0}: Jumlah tidak tersedia untuk {4} di gudang {1} pada saat posting entri ({2} {3})" @@ -46209,11 +46253,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:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "Baris {0}: Item Subkontrak wajib untuk bahan mentah {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -46237,7 +46281,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:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46290,7 +46334,7 @@ msgstr "" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "Baris {1}: Kuantitas ({0}) tidak boleh pecahan. Untuk mengizinkan ini, nonaktifkan '{2}' di UOM {3}." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -46320,7 +46364,7 @@ msgstr "" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "Baris dengan tanggal jatuh tempo ganda di baris lain ditemukan: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" @@ -46386,7 +46430,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46683,7 +46727,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46857,7 +46901,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46980,8 +47024,8 @@ msgstr "Sales Order yang diperlukan untuk Item {0}" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47392,7 +47436,7 @@ msgstr "" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "" @@ -47429,7 +47473,7 @@ msgstr "" msgid "Sample Size" msgstr "Ukuran Sampel" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "Kuantitas sampel {0} tidak boleh lebih dari jumlah yang diterima {1}" @@ -47718,7 +47762,7 @@ msgstr "" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47863,7 +47907,7 @@ msgstr "Pilih Merek ..." msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "Pilih Perusahaan" @@ -48558,7 +48602,7 @@ msgstr "" msgid "Serial No Reserved" msgstr "" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48619,7 +48663,7 @@ msgstr "" msgid "Serial No is mandatory for Item {0}" msgstr "Serial ada adalah wajib untuk Item {0}" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "" @@ -48905,7 +48949,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48931,7 +48975,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49329,12 +49373,6 @@ msgstr "" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "" @@ -49440,6 +49478,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "" @@ -49938,7 +49982,7 @@ msgstr "" msgid "Show Barcode Field in Stock Transactions" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "Tunjukkan Entri yang Dibatalkan" @@ -49946,7 +49990,7 @@ msgstr "Tunjukkan Entri yang Dibatalkan" msgid "Show Completed" msgstr "Tampilkan Selesai" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -50029,7 +50073,7 @@ msgstr "Tampilkan Catatan Pengiriman Tertaut" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "" @@ -50041,7 +50085,7 @@ msgstr "" msgid "Show Open" msgstr "Tampilkan Terbuka" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "Tampilkan Entri Pembukaan" @@ -50054,11 +50098,6 @@ msgstr "" msgid "Show Operations" msgstr "" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "Tampilkan Rincian Pembayaran" @@ -50074,7 +50113,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "" @@ -50141,6 +50180,11 @@ msgstr "Hanya tampilkan POS" msgid "Show only the Immediate Upcoming Term" msgstr "" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "" @@ -50427,11 +50471,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50497,7 +50541,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "Lokasi Sumber dan Target tidak boleh sama" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "Sumber dan target gudang tidak bisa sama untuk baris {0}" @@ -50511,8 +50555,8 @@ msgid "Source of Funds (Liabilities)" msgstr "Sumber Dana (Kewajiban)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "Sumber gudang adalah wajib untuk baris {0}" @@ -50677,8 +50721,8 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "Standard Jual" @@ -51011,7 +51055,7 @@ msgstr "" msgid "Stock Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -51282,7 +51326,7 @@ msgstr "Persediaan Diterima Tapi Tidak Ditagih" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51294,7 +51338,7 @@ msgstr "Rekonsiliasi Persediaan" msgid "Stock Reconciliation Item" msgstr "Barang Rekonsiliasi Persediaan" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "Rekonsiliasi Stok" @@ -51332,7 +51376,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51360,7 +51404,7 @@ msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "" @@ -51742,7 +51786,7 @@ msgstr "Pesanan Kerja yang Berhenti tidak dapat dibatalkan, Hapus terlebih dahul #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "Toko" @@ -51820,10 +51864,6 @@ msgstr "" msgid "Sub Procedure" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -52040,7 +52080,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52066,7 +52106,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "" @@ -52155,7 +52195,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "" @@ -52330,7 +52370,7 @@ msgstr "Berhasil direkonsiliasi" msgid "Successfully Set Supplier" msgstr "Berhasil Set Supplier" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "" @@ -52486,6 +52526,7 @@ msgstr "Qty Disupply" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52527,8 +52568,8 @@ msgstr "Qty Disupply" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52576,6 +52617,12 @@ msgstr "Supplier Alamat dan Kontak" msgid "Supplier Contact" msgstr "" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52670,7 +52717,7 @@ msgstr "Tanggal Faktur Supplier" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "Nomor Faktur Supplier" @@ -52950,19 +52997,10 @@ msgstr "" msgid "Supplier {0} not found in {1}" msgstr "Pemasok {0} tidak ditemukan di {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Supplier (s)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "Sales Analitikal berdasarkan Supplier" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53024,7 +53062,7 @@ msgstr "Tim Support" msgid "Support Tickets" msgstr "Tiket Dukungan" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53283,8 +53321,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "Target gudang adalah wajib untuk baris {0}" @@ -53752,7 +53790,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "Jumlah kena pajak" @@ -53913,7 +53951,7 @@ msgstr "" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "" @@ -54103,7 +54141,6 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54295,7 +54332,7 @@ msgstr "Akses ke Permintaan Penawaran Dari Portal Dinonaktifkan. Untuk Mengizink msgid "The BOM which will be replaced" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54339,7 +54376,7 @@ msgstr "Syarat Pembayaran di baris {0} mungkin merupakan duplikat." 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:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54355,7 +54392,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "" @@ -54391,7 +54428,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54497,7 +54534,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "Atribut yang dihapus berikut ini ada di Varian tetapi tidak ada di Template. Anda dapat menghapus Varian atau mempertahankan atribut di template." @@ -54541,15 +54578,15 @@ msgstr "Liburan di {0} bukan antara Dari Tanggal dan To Date" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54705,7 +54742,7 @@ msgstr "Saham tidak ada dengan {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "" @@ -54727,11 +54764,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "Tugas telah ditetapkan sebagai pekerjaan latar belakang. Jika ada masalah pada pemrosesan di latar belakang, sistem akan menambahkan komentar tentang kesalahan Rekonsiliasi Saham ini dan kembali ke tahap Konsep" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -54803,7 +54840,7 @@ msgstr "{0} ({1}) harus sama dengan {2} ({3})" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54856,7 +54893,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54900,7 +54937,7 @@ msgstr "Tidak ada kelompok yang ditemukan terhadap {0}: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54956,11 +54993,11 @@ msgstr "Item ini adalah Variant dari {0} (Template)." msgid "This Month's Summary" msgstr "Ringkasan ini Bulan ini" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55761,7 +55798,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "Untuk mencakup pajak berturut-turut {0} di tingkat Stok Barang, pajak dalam baris {1} juga harus disertakan" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "Untuk bergabung, sifat berikut harus sama untuk kedua item" @@ -55796,7 +55833,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "" @@ -55947,7 +55984,7 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Nilai Total" @@ -56370,7 +56407,7 @@ msgstr "Jumlah total Permintaan Pembayaran tidak boleh lebih dari jumlah {0}" msgid "Total Payments" msgstr "Total Pembayaran" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56402,7 +56439,7 @@ msgstr "" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Jumlah Qty" @@ -56788,7 +56825,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56799,7 +56836,7 @@ msgstr "Transaksi" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "" @@ -57471,11 +57508,11 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57547,7 +57584,7 @@ msgstr "Faktor UOM Konversi diperlukan berturut-turut {0}" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57623,7 +57660,7 @@ msgstr "Tidak dapat menemukan skor mulai dari {0}. Anda harus memiliki nilai ber msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "" @@ -57742,7 +57779,7 @@ msgstr "Satuan Ukur" msgid "Unit of Measure (UOM)" msgstr "" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel" @@ -57862,10 +57899,9 @@ msgid "Unreconcile Transaction" msgstr "" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "Tidak direkonsiliasi" @@ -57888,10 +57924,6 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57937,7 +57969,7 @@ msgstr "" msgid "Unsecured Loans" msgstr "Pinjaman Tanpa Jaminan" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58152,12 +58184,6 @@ msgstr "" msgid "Update Type" msgstr "" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58198,7 +58224,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "Memperbarui Varian ..." @@ -58656,12 +58682,6 @@ msgstr "" msgid "Validate Components and Quantities Per BOM" msgstr "" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58685,6 +58705,12 @@ msgstr "" msgid "Validate Stock on Save" msgstr "" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58791,11 +58817,11 @@ msgstr "Tingkat Penilaian Tidak Ada" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "Nilai Penilaian untuk Item {0}, diperlukan untuk melakukan entri akuntansi untuk {1} {2}." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "Tingkat Valuasi adalah wajib jika menggunakan Persediaan Pembukaan" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "Diperlukan Tingkat Penilaian untuk Item {0} di baris {1}" @@ -58805,7 +58831,7 @@ msgstr "Diperlukan Tingkat Penilaian untuk Item {0} di baris {1}" msgid "Valuation and Total" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "" @@ -58955,7 +58981,7 @@ msgstr "Varians ({})" msgid "Variant" msgstr "Varian" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "Kesalahan Atribut Varian" @@ -58974,7 +59000,7 @@ msgstr "Varian BOM" msgid "Variant Based On" msgstr "" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "Varian Berdasarkan Pada tidak dapat diubah" @@ -58992,7 +59018,7 @@ msgstr "Bidang Varian" msgid "Variant Item" msgstr "Item Varian" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "Item Varian" @@ -59373,7 +59399,7 @@ msgstr "Nama Voucher" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59413,7 +59439,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "" @@ -59445,7 +59471,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59680,7 +59706,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "" @@ -59727,7 +59753,7 @@ msgstr "Gudang dengan transaksi yang ada tidak dapat dikonversi ke buku besar." #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59783,6 +59809,12 @@ msgstr "" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" @@ -59966,7 +59998,7 @@ msgstr "" msgid "Website:" msgstr "Situs Web:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60340,7 +60372,7 @@ msgstr "" msgid "Work Order Item" msgstr "Item Pesanan Kerja" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60402,11 +60434,11 @@ msgstr "Perintah Kerja tidak dibuat" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "Perintah Kerja {0}: Kartu Kerja tidak ditemukan untuk operasi {1}" @@ -60722,11 +60754,11 @@ msgstr "" msgid "Year Start Date" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60779,7 +60811,7 @@ msgstr "Anda juga dapat copy-paste link ini di browser Anda" msgid "You can also set default CWIP account in Company {}" msgstr "Anda juga dapat menyetel akun CWIP default di Perusahaan {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60933,6 +60965,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60961,7 +60997,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60969,7 +61005,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "Anda harus mengaktifkan pemesanan ulang otomatis di Pengaturan Saham untuk mempertahankan tingkat pemesanan ulang." @@ -61040,8 +61076,11 @@ msgstr "" msgid "Zero quantity" msgstr "" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61153,7 +61192,7 @@ msgstr "exchangerate.host" msgid "fieldname" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61371,6 +61410,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "" @@ -61429,7 +61472,8 @@ msgstr "{0} Kupon yang digunakan adalah {1}. Kuantitas yang diizinkan habis" msgid "{0} Digest" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61449,7 +61493,7 @@ msgstr "{0} Operasi: {1}" msgid "{0} Request for {1}" msgstr "{0} Permintaan {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} Mempertahankan Sampel berdasarkan kelompok, harap centang Memiliki Nomor Kelompok untuk menyimpan sampel item" @@ -61562,7 +61606,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} dimasukan dua kali dalam Pajak Barang" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "" @@ -61730,7 +61774,7 @@ msgstr "{0} parameter tidak valid" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} entri pembayaran tidak dapat disaring oleh {1}" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61743,7 +61787,7 @@ msgstr "{0} sampai {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" @@ -61945,7 +61989,7 @@ msgstr "{0} {1}: Akun {2} tidak aktif" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: Entri Akuntansi untuk {2} hanya dapat dilakukan dalam bentuk mata uang: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: \"Pusat Biaya\" adalah wajib untuk Item {2}" @@ -62031,23 +62075,23 @@ msgstr "{0}: {1} tidak ada" msgid "{0}: {1} is a group account." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} harus kurang dari {2}" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "" -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" diff --git a/erpnext/locale/it.po b/erpnext/locale/it.po index 4cda884c951..30fcce3890d 100644 --- a/erpnext/locale/it.po +++ b/erpnext/locale/it.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:20\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:20\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Italian\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr " Sottogruppo" msgid " Summary" msgstr " Riepilogo" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "L'\"Articolo fornito dal cliente\" non può essere anche Articolo d'acquisto" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "" @@ -302,7 +302,7 @@ msgstr "" msgid "'From Date' must be after 'To Date'" msgstr "" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "" @@ -338,7 +338,7 @@ msgstr "" msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "'{0}' il conto è già stato usato da {1}. Usa un altro conto." @@ -1004,7 +1004,7 @@ msgstr "" msgid "A logical Warehouse against which stock entries are made." msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "Si è verificato un conflitto nella sequenza durante la creazione dei numeri di serie. Modificare la sequenza per l'articolo {0}." @@ -1216,7 +1216,7 @@ msgstr "La chiave di accesso è richiesta per il fornitore di servizi: {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1886,8 +1886,8 @@ msgstr "Registrazioni Contabili" msgid "Accounting Entry for Asset" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1895,7 +1895,7 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "" @@ -1908,16 +1908,16 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "" @@ -2215,12 +2215,6 @@ msgstr "Azione nel caso in cui il Controllo Qualità risulti mancante" msgid "Action If Quality Inspection Is Rejected" msgstr "Azione nel caso in cui l'esito del Controllo Qualità sia negativo" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "" @@ -2279,6 +2273,12 @@ msgstr "" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2546,7 +2546,7 @@ msgstr "" msgid "Actual qty in stock" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "" @@ -2560,7 +2560,7 @@ msgstr "Qtà ad hoc" msgid "Add / Edit Prices" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "" @@ -2714,7 +2714,7 @@ msgstr "" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -2959,7 +2959,7 @@ msgstr "Importo Sconto Aggiuntivo" msgid "Additional Discount Amount (Company Currency)" msgstr "Importo sconto aggiuntivo (valuta aziendale)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "L'importo dello sconto aggiuntivo ({discount_amount}) non può superare il totale prima di tale sconto ({total_before_discount})" @@ -3248,7 +3248,7 @@ msgstr "Regola Qtà" msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3361,7 +3361,7 @@ msgstr "" msgid "Advance amount" msgstr "Importo anticipato" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "L'importo anticipato non può essere maggiore di {0} {1}" @@ -3430,7 +3430,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "" @@ -3548,7 +3548,7 @@ msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "" @@ -3572,7 +3572,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "" @@ -3853,7 +3853,7 @@ msgstr "" msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "" @@ -3861,7 +3861,7 @@ msgstr "" msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "" @@ -3910,7 +3910,7 @@ msgstr "" msgid "Allocate Advances Automatically (FIFO)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "" @@ -3920,7 +3920,7 @@ msgstr "" msgid "Allocate Payment Based On Payment Terms" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "" @@ -3950,7 +3950,7 @@ msgstr "" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4071,15 +4071,15 @@ msgstr "" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4108,12 +4108,6 @@ msgstr "Consenti scorte negative" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4326,8 +4320,11 @@ msgstr "" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4419,7 +4416,7 @@ msgstr "" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4616,7 +4613,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4646,7 +4643,6 @@ msgstr "" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4816,10 +4812,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5439,7 +5431,7 @@ msgstr "" msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "" -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "Poiché sono presenti transazioni inviate per l'elemento {0}, non è possibile modificare il valore di {1}." @@ -5589,7 +5581,7 @@ msgstr "" msgid "Asset Category Name" msgstr "" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "" @@ -5985,7 +5977,7 @@ msgstr "" msgid "Asset {0} must be submitted" msgstr "" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6023,11 +6015,11 @@ msgstr "Risorse" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "" -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "" @@ -6100,7 +6092,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "È richiesta almeno una riga per il modello di bilancio" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "" @@ -6132,7 +6124,7 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "" @@ -6196,7 +6188,11 @@ msgstr "" msgid "Attribute Value" msgstr "" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "" @@ -6204,11 +6200,19 @@ msgstr "" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "" @@ -6268,24 +6272,12 @@ msgstr "" msgid "Auto Create Exchange Rate Revaluation" msgstr "" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6404,6 +6396,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6621,7 +6625,7 @@ msgstr "" msgid "Available for use date is required" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "" @@ -6720,7 +6724,7 @@ msgstr "BFS" msgid "BIN Qty" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -6993,7 +6997,7 @@ msgstr "" msgid "BOM Website Operation" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "La distinta base e la quantità di prodotti finiti sono obbligatorie per il disassemblaggio" @@ -7084,7 +7088,7 @@ msgstr "" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" +msgid "Backflush raw materials of subcontract based on" msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' @@ -7105,7 +7109,7 @@ msgstr "" msgid "Balance (Dr - Cr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "" @@ -7636,11 +7640,11 @@ msgstr "" msgid "Barcode Type" msgstr "" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "" @@ -8007,12 +8011,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -8085,7 +8089,7 @@ msgstr "" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" +msgid "Bill for rejected quantity in Purchase Invoice" msgstr "" #. Label of a Card Break in the Manufacturing Workspace @@ -8426,8 +8430,11 @@ msgstr "" msgid "Blanket Order Rate" msgstr "" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -8942,7 +8949,7 @@ msgstr "" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "" @@ -9307,7 +9314,7 @@ msgstr "" msgid "Can only make payment against unbilled {0}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9363,9 +9370,9 @@ msgstr "Impossibile modificare le impostazioni dell'account inventario" msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "" @@ -9393,7 +9400,7 @@ msgstr "" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "" @@ -9429,7 +9436,7 @@ msgstr "Non è possibile annullare questa registrazione di magazzino di produzio msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "Impossibile annullare questo documento in quanto è collegato con l'Aggiustamento del Valore dell'Asset {0}presentato. Si prega di annullare l'aggiustamento del valore delle attività per continuare." -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9437,7 +9444,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "" -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "" @@ -9449,7 +9456,7 @@ msgstr "" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "" @@ -9477,11 +9484,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9507,7 +9514,7 @@ msgstr "" msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -9544,7 +9551,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9552,8 +9559,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "" @@ -9597,7 +9604,7 @@ msgstr "" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9615,8 +9622,8 @@ msgstr "" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9632,7 +9639,7 @@ msgstr "" msgid "Cannot set authorization on basis of Discount for {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "" @@ -10543,7 +10550,7 @@ msgstr "" msgid "Closing (Dr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "" @@ -11004,7 +11011,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11286,7 +11293,7 @@ msgstr "Azienda" msgid "Company Abbreviation" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11299,7 +11306,7 @@ msgstr "" msgid "Company Account" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "" @@ -11475,7 +11482,7 @@ msgstr "Il filtro aziendale non è impostato!" msgid "Company is mandatory" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "" @@ -11746,7 +11753,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11759,7 +11766,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11777,13 +11786,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "" @@ -11961,7 +11970,7 @@ msgstr "" msgid "Consumed" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "" @@ -12005,7 +12014,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12178,10 +12187,6 @@ msgstr "" msgid "Contact:" msgstr "Contatto:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "" - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12359,7 +12364,7 @@ msgstr "" msgid "Conversion Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "" @@ -12631,7 +12636,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12726,7 +12731,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "" @@ -13064,7 +13069,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "" @@ -13437,7 +13442,7 @@ msgstr "" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "" @@ -13578,15 +13583,15 @@ msgstr "" msgid "Credit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "" @@ -13781,7 +13786,7 @@ msgstr "" msgid "Creditors" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14079,7 +14084,7 @@ msgstr "" msgid "Current Serial No" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14280,7 +14285,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15053,7 +15058,7 @@ msgstr "" msgid "Day Of Week" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15169,11 +15174,11 @@ msgstr "" msgid "Debit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "" @@ -15183,7 +15188,7 @@ msgstr "" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "" @@ -15294,7 +15299,7 @@ msgstr "" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15436,7 +15441,7 @@ msgstr "" msgid "Default BOM" msgstr "" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "" @@ -15793,15 +15798,15 @@ msgstr "" msgid "Default Unit of Measure" msgstr "Unità di misura predefinita" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "" -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "" @@ -16102,7 +16107,7 @@ msgstr "" msgid "Delivered" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "" @@ -16152,8 +16157,8 @@ msgstr "" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16164,11 +16169,11 @@ msgstr "" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16257,7 +16262,7 @@ msgstr "" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16782,7 +16787,7 @@ msgstr "" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "" @@ -16946,10 +16951,8 @@ msgstr "" msgid "Disable In Words" msgstr "" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' @@ -16991,6 +16994,12 @@ msgstr "" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17047,7 +17056,7 @@ msgstr "" msgid "Disassemble Order" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "La quantità di smontaggio non può essere inferiore o uguale a 0." @@ -17572,6 +17581,12 @@ msgstr "" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17662,9 +17677,12 @@ msgstr "" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17682,6 +17700,10 @@ msgstr "" msgid "Document Type already used as a dimension" msgstr "" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -17986,7 +18008,7 @@ msgstr "" msgid "Duplicate Sales Invoices found" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18106,8 +18128,8 @@ msgstr "" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18330,7 +18352,7 @@ msgstr "" msgid "Email Sent to Supplier {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18520,7 +18542,7 @@ msgstr "" msgid "Employee cannot report to himself." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18528,7 +18550,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18541,7 +18563,7 @@ msgstr "" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18584,7 +18606,7 @@ msgstr "" msgid "Enable Auto Email" msgstr "" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "" @@ -19182,7 +19204,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "" @@ -19228,7 +19250,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "" @@ -19257,7 +19279,7 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19616,7 +19638,7 @@ msgstr "" msgid "Expense" msgstr "" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "" @@ -19664,7 +19686,7 @@ msgstr "" msgid "Expense Account" msgstr "" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "" @@ -20127,7 +20149,7 @@ msgstr "" msgid "Filter by Reference Date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20457,7 +20479,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20552,7 +20574,7 @@ msgstr "" msgid "Fiscal Year" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20616,7 +20638,7 @@ msgstr "" msgid "Fixed Asset Defaults" msgstr "" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "" @@ -20766,7 +20788,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20797,7 +20819,7 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "" @@ -20881,6 +20903,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20902,7 +20930,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -20911,7 +20939,7 @@ msgstr "" msgid "For reference" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" @@ -20935,7 +20963,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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -20944,7 +20972,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -21557,7 +21585,7 @@ msgstr "G - D" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21569,7 +21597,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "" @@ -22084,7 +22112,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -22267,7 +22295,7 @@ msgstr "" msgid "Grant Commission" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "" @@ -22908,10 +22936,10 @@ msgstr "" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23066,7 +23094,7 @@ msgstr "" msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23248,7 +23276,7 @@ msgstr "" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23420,11 +23448,11 @@ msgstr "" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "Se l'articolo ha delle varianti, non può essere selezionato negli ordini di vendita o in altri documenti" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "" @@ -23540,7 +23568,7 @@ msgstr "" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23592,7 +23620,7 @@ msgstr "" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "" @@ -23635,7 +23663,7 @@ msgstr "Ignora sovrapposizione oraria postazione di lavoro" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23649,6 +23677,7 @@ msgid "Implementation Partner" msgstr "" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24002,7 +24031,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24256,7 +24285,7 @@ msgstr "" msgid "Incorrect Batch Consumed" msgstr "" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" @@ -24264,7 +24293,7 @@ msgstr "" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "" @@ -24474,14 +24503,14 @@ msgstr "" msgid "Inspected By" msgstr "" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "" @@ -24498,7 +24527,7 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "" @@ -24580,8 +24609,8 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "" @@ -24801,7 +24830,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -24894,7 +24923,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -24924,7 +24953,7 @@ msgstr "" msgid "Invalid Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "" @@ -25010,12 +25039,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25052,7 +25081,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "" @@ -25181,7 +25210,6 @@ msgstr "" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "" @@ -25202,10 +25230,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25727,12 +25751,12 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' @@ -26005,7 +26029,7 @@ msgstr "" msgid "Issuing Date" msgstr "" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" @@ -26075,7 +26099,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26122,6 +26146,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26137,7 +26162,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26901,6 +26925,7 @@ msgstr "" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26911,7 +26936,6 @@ msgstr "" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27171,11 +27195,11 @@ msgstr "" msgid "Item Variant {0} already exists with same attributes" msgstr "" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "" @@ -27214,6 +27238,15 @@ msgstr "" msgid "Item Weight Details" msgstr "" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27243,7 +27276,7 @@ msgstr "" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27263,11 +27296,11 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "" @@ -27297,7 +27330,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27316,10 +27349,14 @@ msgstr "" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27333,7 +27370,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "" @@ -27341,7 +27378,7 @@ msgstr "" msgid "Item {0} does not exist in the system or has expired" msgstr "" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "" @@ -27357,15 +27394,15 @@ msgstr "" msgid "Item {0} has been disabled" msgstr "L'elemento {0} è stato disabilitato" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "" @@ -27377,19 +27414,23 @@ msgstr "" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "" @@ -27397,7 +27438,11 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -27413,7 +27458,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27429,7 +27474,7 @@ msgstr "" msgid "Item {0}: {1} qty produced. " msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "" @@ -27539,7 +27584,7 @@ msgstr "" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -28172,7 +28217,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28450,7 +28495,7 @@ msgstr "Legenda" msgid "Length (cm)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "" @@ -28591,7 +28636,7 @@ msgstr "" msgid "Linked Location" msgstr "" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "" @@ -28986,11 +29031,6 @@ msgstr "" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29002,6 +29042,11 @@ msgstr "" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29198,7 +29243,7 @@ msgid "Major/Optional Subjects" msgstr "" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29367,8 +29412,8 @@ msgstr "" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29427,8 +29472,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29577,7 +29622,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "Responsabile Produzione" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "" @@ -29853,7 +29898,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -29924,6 +29969,7 @@ msgstr "" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30030,11 +30076,11 @@ msgstr "" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "" @@ -30149,7 +30195,7 @@ msgstr "" msgid "Material Transferred for Manufacturing" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30278,11 +30324,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -30726,11 +30772,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "Mancante" @@ -30768,7 +30814,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "" @@ -30776,11 +30822,11 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30824,10 +30870,6 @@ msgstr "" msgid "Mixed Conditions" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "" - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31096,7 +31138,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:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31175,27 +31217,20 @@ msgstr "" msgid "Naming Series Prefix" msgstr "" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31243,16 +31278,16 @@ msgstr "" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "" @@ -31866,7 +31901,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "" @@ -31879,7 +31914,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "" @@ -31924,7 +31959,7 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "" @@ -31937,7 +31972,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "" @@ -31949,7 +31984,7 @@ msgstr "" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -31957,7 +31992,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32051,7 +32086,7 @@ msgstr "" msgid "No more children on Right" msgstr "" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32226,7 +32261,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32318,7 +32353,7 @@ msgstr "" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "" @@ -32422,7 +32457,7 @@ msgstr "" msgid "Not authorized to edit frozen Account {0}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32468,7 +32503,7 @@ msgstr "" msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "" -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -32945,7 +32980,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33096,7 +33131,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "" @@ -33255,16 +33290,16 @@ msgstr "" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Scorte iniziali" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33621,7 +33656,7 @@ msgstr "" msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33755,7 +33790,7 @@ msgstr "" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "" @@ -33963,7 +33998,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34021,7 +34056,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34039,7 +34074,7 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "" @@ -34282,7 +34317,6 @@ msgstr "" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "Fattura POS" @@ -34553,7 +34587,7 @@ msgstr "" msgid "Packed Items" msgstr "" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -35001,7 +35035,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35137,7 +35171,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35263,7 +35297,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35349,7 +35383,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35652,7 +35686,6 @@ msgstr "" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35910,7 +35943,7 @@ msgstr "" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -35989,10 +36022,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37012,7 +37041,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "" @@ -37044,11 +37073,11 @@ msgstr "" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "" @@ -37068,7 +37097,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -37175,7 +37204,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "" @@ -37244,11 +37273,11 @@ msgstr "" msgid "Please enter Approving Role or Approving User" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "" @@ -37260,7 +37289,7 @@ msgstr "" msgid "Please enter Employee Id of this sales person" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "" @@ -37305,7 +37334,7 @@ msgstr "" msgid "Please enter Root Type for account- {0}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "" @@ -37382,7 +37411,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37496,12 +37525,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "" @@ -37517,13 +37546,13 @@ msgstr "" msgid "Please select Category first" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "" @@ -37532,7 +37561,7 @@ msgstr "" msgid "Please select Company and Posting Date to getting entries" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "" @@ -37581,7 +37610,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "" @@ -37589,11 +37618,11 @@ msgstr "" msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "" @@ -37646,7 +37675,7 @@ msgstr "" msgid "Please select a Supplier" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "" @@ -37707,7 +37736,7 @@ msgstr "Seleziona una riga per creare una voce di ripubblicazione" msgid "Please select a supplier for fetching payments." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37727,7 +37756,7 @@ msgstr "" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37834,7 +37863,7 @@ msgstr "" msgid "Please select weekly off day" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "" @@ -37974,7 +38003,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -38018,7 +38047,7 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" @@ -38137,7 +38166,7 @@ msgstr "" msgid "Please specify at least one attribute in the Attributes table" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "" @@ -38308,7 +38337,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38333,7 +38362,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38448,7 +38477,7 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "" @@ -38627,6 +38656,12 @@ msgstr "" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -38920,7 +38955,9 @@ msgstr "" msgid "Price per Unit (Stock UOM)" msgstr "" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40275,6 +40312,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40311,6 +40349,12 @@ msgstr "" msgid "Purchase Invoice Item" msgstr "" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40362,6 +40406,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40371,7 +40416,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40488,7 +40533,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "" @@ -40551,6 +40596,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40565,7 +40611,7 @@ msgstr "" msgid "Purchase Receipt" msgstr "Ricevuta di Acquisto" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40831,7 +40877,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41419,7 +41464,7 @@ msgstr "" msgid "Quality Review Objective" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41480,7 +41525,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41674,7 +41719,7 @@ msgstr "" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "" @@ -41729,7 +41774,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41892,7 +41937,6 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42302,8 +42346,8 @@ msgstr "" msgid "Raw SQL" msgstr "" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42711,11 +42755,10 @@ msgstr "" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43239,7 +43282,7 @@ msgstr "" msgid "Rejected Warehouse" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "" @@ -43289,7 +43332,7 @@ msgid "Remaining Balance" msgstr "" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43343,7 +43386,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43382,7 +43425,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "" @@ -43786,6 +43829,7 @@ msgstr "" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44059,7 +44103,7 @@ msgstr "" msgid "Reserved" msgstr "" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44672,7 +44716,7 @@ msgstr "" msgid "Reversal Of" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "" @@ -44821,10 +44865,7 @@ msgstr "" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "" @@ -44839,8 +44880,11 @@ msgstr "" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45041,8 +45085,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -45069,11 +45113,11 @@ msgstr "" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45099,7 +45143,7 @@ msgstr "" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "" @@ -45300,7 +45344,7 @@ msgstr "" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -45360,7 +45404,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45388,7 +45432,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "" @@ -45441,7 +45485,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "" @@ -45466,7 +45510,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Riga #{0}: Selezionare il magazzino dei sottoassiemi" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "" @@ -45492,15 +45536,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45531,11 +45575,11 @@ msgstr "" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "" @@ -45578,7 +45622,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "" @@ -45626,11 +45670,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45683,11 +45727,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "" -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "" @@ -45715,7 +45759,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "" @@ -45751,23 +45795,23 @@ msgstr "" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45775,7 +45819,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45840,7 +45884,7 @@ msgstr "" msgid "Row #{}: {} {} does not exist." msgstr "" -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" @@ -45856,7 +45900,7 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -45888,7 +45932,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:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -45946,7 +45990,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "" @@ -45987,7 +46031,7 @@ msgstr "" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -46111,7 +46155,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "" @@ -46123,11 +46167,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:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -46151,7 +46195,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:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46204,7 +46248,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:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -46234,7 +46278,7 @@ msgstr "" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" @@ -46300,7 +46344,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46597,7 +46641,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46771,7 +46815,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46894,8 +46938,8 @@ msgstr "" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47306,7 +47350,7 @@ msgstr "" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "" @@ -47343,7 +47387,7 @@ msgstr "" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -47632,7 +47676,7 @@ msgstr "" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47777,7 +47821,7 @@ msgstr "" msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "" @@ -48472,7 +48516,7 @@ msgstr "" msgid "Serial No Reserved" msgstr "" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48533,7 +48577,7 @@ msgstr "" msgid "Serial No is mandatory for Item {0}" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "" @@ -48819,7 +48863,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48845,7 +48889,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49243,12 +49287,6 @@ msgstr "" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "" @@ -49354,6 +49392,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "" @@ -49852,7 +49896,7 @@ msgstr "" msgid "Show Barcode Field in Stock Transactions" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "" @@ -49860,7 +49904,7 @@ msgstr "" msgid "Show Completed" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -49943,7 +49987,7 @@ msgstr "" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "" @@ -49955,7 +49999,7 @@ msgstr "" msgid "Show Open" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "" @@ -49968,11 +50012,6 @@ msgstr "" msgid "Show Operations" msgstr "" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "" @@ -49988,7 +50027,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "" @@ -50055,6 +50094,11 @@ msgstr "" msgid "Show only the Immediate Upcoming Term" msgstr "" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "" @@ -50341,11 +50385,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50411,7 +50455,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "" @@ -50425,8 +50469,8 @@ msgid "Source of Funds (Liabilities)" msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "" @@ -50591,8 +50635,8 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "" @@ -50925,7 +50969,7 @@ msgstr "" msgid "Stock Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -51196,7 +51240,7 @@ msgstr "" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51208,7 +51252,7 @@ msgstr "" msgid "Stock Reconciliation Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "" @@ -51246,7 +51290,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51274,7 +51318,7 @@ msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "" @@ -51656,7 +51700,7 @@ msgstr "" #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "" @@ -51734,10 +51778,6 @@ msgstr "" msgid "Sub Procedure" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -51954,7 +51994,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -51980,7 +52020,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "" @@ -52069,7 +52109,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "" @@ -52244,7 +52284,7 @@ msgstr "" msgid "Successfully Set Supplier" msgstr "" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "" @@ -52400,6 +52440,7 @@ msgstr "" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52441,8 +52482,8 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52490,6 +52531,12 @@ msgstr "" msgid "Supplier Contact" msgstr "" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52584,7 +52631,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "" @@ -52864,19 +52911,10 @@ msgstr "" msgid "Supplier {0} not found in {1}" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -52938,7 +52976,7 @@ msgstr "Team Supporto" msgid "Support Tickets" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53197,8 +53235,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "" @@ -53666,7 +53704,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "" @@ -53827,7 +53865,7 @@ msgstr "" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "" @@ -54017,7 +54055,6 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54209,7 +54246,7 @@ msgstr "" msgid "The BOM which will be replaced" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54253,7 +54290,7 @@ msgstr "" msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54269,7 +54306,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "" @@ -54305,7 +54342,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54411,7 +54448,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "" @@ -54455,15 +54492,15 @@ msgstr "" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54619,7 +54656,7 @@ msgstr "" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "" @@ -54641,11 +54678,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -54717,7 +54754,7 @@ msgstr "" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54770,7 +54807,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54814,7 +54851,7 @@ msgstr "" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54870,11 +54907,11 @@ msgstr "" msgid "This Month's Summary" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55675,7 +55712,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "" @@ -55710,7 +55747,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "" @@ -55861,7 +55898,7 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "" @@ -56284,7 +56321,7 @@ msgstr "" msgid "Total Payments" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56316,7 +56353,7 @@ msgstr "" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "" @@ -56702,7 +56739,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56713,7 +56750,7 @@ msgstr "" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "" @@ -57385,11 +57422,11 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57461,7 +57498,7 @@ msgstr "" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57537,7 +57574,7 @@ msgstr "" msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "" @@ -57656,7 +57693,7 @@ msgstr "" msgid "Unit of Measure (UOM)" msgstr "" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "" @@ -57776,10 +57813,9 @@ msgid "Unreconcile Transaction" msgstr "" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "" @@ -57802,10 +57838,6 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57851,7 +57883,7 @@ msgstr "" msgid "Unsecured Loans" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58066,12 +58098,6 @@ msgstr "" msgid "Update Type" msgstr "" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58112,7 +58138,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "" @@ -58570,12 +58596,6 @@ msgstr "" msgid "Validate Components and Quantities Per BOM" msgstr "" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58599,6 +58619,12 @@ msgstr "" msgid "Validate Stock on Save" msgstr "" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58705,11 +58731,11 @@ msgstr "" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "" -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "" @@ -58719,7 +58745,7 @@ msgstr "" msgid "Valuation and Total" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "" @@ -58869,7 +58895,7 @@ msgstr "" msgid "Variant" msgstr "" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "" @@ -58888,7 +58914,7 @@ msgstr "" msgid "Variant Based On" msgstr "" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "" @@ -58906,7 +58932,7 @@ msgstr "" msgid "Variant Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "" @@ -59287,7 +59313,7 @@ msgstr "Nome del Voucher" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59327,7 +59353,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "" @@ -59359,7 +59385,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59594,7 +59620,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "" @@ -59641,7 +59667,7 @@ msgstr "" #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59697,6 +59723,12 @@ msgstr "" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" @@ -59880,7 +59912,7 @@ msgstr "" msgid "Website:" msgstr "Sito web:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60254,7 +60286,7 @@ msgstr "" msgid "Work Order Item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60316,11 +60348,11 @@ msgstr "" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "" @@ -60636,11 +60668,11 @@ msgstr "" msgid "Year Start Date" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60693,7 +60725,7 @@ msgstr "" msgid "You can also set default CWIP account in Company {}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60847,6 +60879,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60875,7 +60911,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60883,7 +60919,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "" @@ -60954,8 +60990,11 @@ msgstr "" msgid "Zero quantity" msgstr "" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61067,7 +61106,7 @@ msgstr "" msgid "fieldname" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61285,6 +61324,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "" @@ -61343,7 +61386,8 @@ msgstr "" msgid "{0} Digest" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61363,7 +61407,7 @@ msgstr "" msgid "{0} Request for {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "" @@ -61476,7 +61520,7 @@ msgid "{0} entered twice in Item Tax" msgstr "" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "" @@ -61644,7 +61688,7 @@ msgstr "" msgid "{0} payment entries can not be filtered by {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61657,7 +61701,7 @@ msgstr "{0} a {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" @@ -61859,7 +61903,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -61945,23 +61989,23 @@ msgstr "" msgid "{0}: {1} is a group account." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "" -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" diff --git a/erpnext/locale/my.po b/erpnext/locale/my.po index 2e6b3da953a..384c3b62bab 100644 --- a/erpnext/locale/my.po +++ b/erpnext/locale/my.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:21\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:21\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Burmese\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr "" msgid " Summary" msgstr "" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "" @@ -302,7 +302,7 @@ msgstr "'နေ့စွဲမှ' ကို ထည့်သွင်းရန msgid "'From Date' must be after 'To Date'" msgstr "" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "ကုန်ပစ္စည်းမဟုတ်သည့် အရာများတွင် 'Has Serial No' သည် 'Yes' မဖြစ်ရပါ။" @@ -338,7 +338,7 @@ msgstr "" msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "ပုံသေပိုင်ဆိုင်မှုရောင်းချမှုအတွက် 'Update Stock' ကို အမှန်ခြစ်ရန်မလိုပါ။" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "'{0}' အကောင့်ကို {1}မှ အသုံးပြုပြီးဖြစ်သည်။ အခြားအကောင့်ကို အသုံးပြုပါ။" @@ -997,7 +997,7 @@ msgstr "" msgid "A logical Warehouse against which stock entries are made." msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1209,7 +1209,7 @@ msgstr "" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1879,8 +1879,8 @@ msgstr "" msgid "Accounting Entry for Asset" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1888,7 +1888,7 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "" @@ -1901,16 +1901,16 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "" @@ -2208,12 +2208,6 @@ msgstr "" msgid "Action If Quality Inspection Is Rejected" msgstr "" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "" @@ -2272,6 +2266,12 @@ msgstr "" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2539,7 +2539,7 @@ msgstr "နာရီအတွင်း အမှန်တကယ်အချိ msgid "Actual qty in stock" msgstr "ကုန်သိုလှောင်ရုံရှိ အမှန်တကယ်လက်ကျန်" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "" @@ -2553,7 +2553,7 @@ msgstr "" msgid "Add / Edit Prices" msgstr "စျေးနှုန်းများ ထည့်ရန် သို့ ပြင်ရန်" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "" @@ -2707,7 +2707,7 @@ msgstr "" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -2952,7 +2952,7 @@ msgstr "ထပ်လျှော့ပေးငွေ ပမာဏ" msgid "Additional Discount Amount (Company Currency)" msgstr "ထပ်လျှော့ပေးငွေ ပမာဏ (လုပ်ငန်း၏ငွေကြေးယူနစ်)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -3237,7 +3237,7 @@ msgstr "" msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3350,7 +3350,7 @@ msgstr "" msgid "Advance amount" msgstr "ကြိုတင်ငွေပမာဏ" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "ကြိုတင်ငွေပမာဏ {0} {1}ထက် မကြီးနိုင်ပါ" @@ -3419,7 +3419,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "" @@ -3537,7 +3537,7 @@ msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "" @@ -3561,7 +3561,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "" @@ -3842,7 +3842,7 @@ msgstr "" msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "" @@ -3850,7 +3850,7 @@ msgstr "" msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "" @@ -3899,7 +3899,7 @@ msgstr "" msgid "Allocate Advances Automatically (FIFO)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "" @@ -3909,7 +3909,7 @@ msgstr "" msgid "Allocate Payment Based On Payment Terms" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "" @@ -3939,7 +3939,7 @@ msgstr "" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4060,15 +4060,15 @@ msgstr "" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4097,12 +4097,6 @@ msgstr "" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4315,8 +4309,11 @@ msgstr "" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4408,7 +4405,7 @@ msgstr "" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4605,7 +4602,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4635,7 +4632,6 @@ msgstr "" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4805,10 +4801,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "ပမာဏကို အကောင့် ငွေကြေးယူနစ်ဖြင့်ပြခြင်း" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5428,7 +5420,7 @@ msgstr "" msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "" -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "" @@ -5578,7 +5570,7 @@ msgstr "" msgid "Asset Category Name" msgstr "" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "" @@ -5974,7 +5966,7 @@ msgstr "" msgid "Asset {0} must be submitted" msgstr "" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6012,11 +6004,11 @@ msgstr "" msgid "Assets Setup" msgstr "ပိုင်ဆိုင်မှုများ သတ်မှတ်ခြင်း" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "" -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "" @@ -6089,7 +6081,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "" @@ -6121,7 +6113,7 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "" @@ -6185,7 +6177,11 @@ msgstr "" msgid "Attribute Value" msgstr "" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "" @@ -6193,11 +6189,19 @@ msgstr "" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "" @@ -6257,24 +6261,12 @@ msgstr "" msgid "Auto Create Exchange Rate Revaluation" msgstr "" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6393,6 +6385,18 @@ msgstr "အသုံးပြုသူကို ထည့်သွင်းရ msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6610,7 +6614,7 @@ msgstr "" msgid "Available for use date is required" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "" @@ -6709,7 +6713,7 @@ msgstr "" msgid "BIN Qty" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -6982,7 +6986,7 @@ msgstr "" msgid "BOM Website Operation" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7073,7 +7077,7 @@ msgstr "" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" +msgid "Backflush raw materials of subcontract based on" msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' @@ -7094,7 +7098,7 @@ msgstr "" msgid "Balance (Dr - Cr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "" @@ -7625,11 +7629,11 @@ msgstr "" msgid "Barcode Type" msgstr "" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "" @@ -7996,12 +8000,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -8074,7 +8078,7 @@ msgstr "" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" +msgid "Bill for rejected quantity in Purchase Invoice" msgstr "" #. Label of a Card Break in the Manufacturing Workspace @@ -8415,8 +8419,11 @@ msgstr "" msgid "Blanket Order Rate" msgstr "" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -8931,7 +8938,7 @@ msgstr "ဝယ်ယူခြင်းနှင့်ရောင်းချခ msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "" @@ -9296,7 +9303,7 @@ msgstr "" msgid "Can only make payment against unbilled {0}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9352,9 +9359,9 @@ msgstr "" msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "" @@ -9382,7 +9389,7 @@ msgstr "" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "" @@ -9418,7 +9425,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9426,7 +9433,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "" -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "" @@ -9438,7 +9445,7 @@ msgstr "" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "" @@ -9466,11 +9473,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9496,7 +9503,7 @@ msgstr "" msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -9533,7 +9540,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9541,8 +9548,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "" @@ -9586,7 +9593,7 @@ msgstr "" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9604,8 +9611,8 @@ msgstr "" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9621,7 +9628,7 @@ msgstr "" msgid "Cannot set authorization on basis of Discount for {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "" @@ -10532,7 +10539,7 @@ msgstr "" msgid "Closing (Dr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "" @@ -10993,7 +11000,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11275,7 +11282,7 @@ msgstr "လုပ်ငန်း" msgid "Company Abbreviation" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11288,7 +11295,7 @@ msgstr "" msgid "Company Account" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "" @@ -11464,7 +11471,7 @@ msgstr "ကုမ္ပဏီ စစ်ထုတ်မှု မသတ်မှ msgid "Company is mandatory" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "" @@ -11735,7 +11742,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11748,7 +11755,9 @@ msgstr "စာရင်းခေါင်းစဉ်များကို ပ msgid "Configure Product Assembly" msgstr "" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11766,13 +11775,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "" @@ -11950,7 +11959,7 @@ msgstr "" msgid "Consumed" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "" @@ -11994,7 +12003,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12167,10 +12176,6 @@ msgstr "" msgid "Contact:" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "" - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12348,7 +12353,7 @@ msgstr "" msgid "Conversion Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "" @@ -12620,7 +12625,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12715,7 +12720,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "" @@ -13053,7 +13058,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "" @@ -13426,7 +13431,7 @@ msgstr "" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "" @@ -13567,15 +13572,15 @@ msgstr "" msgid "Credit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "" @@ -13770,7 +13775,7 @@ msgstr "" msgid "Creditors" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14068,7 +14073,7 @@ msgstr "" msgid "Current Serial No" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14269,7 +14274,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15042,7 +15047,7 @@ msgstr "" msgid "Day Of Week" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15158,11 +15163,11 @@ msgstr "" msgid "Debit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "" @@ -15172,7 +15177,7 @@ msgstr "" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "" @@ -15283,7 +15288,7 @@ msgstr "" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15425,7 +15430,7 @@ msgstr "" msgid "Default BOM" msgstr "" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "" @@ -15782,15 +15787,15 @@ msgstr "" msgid "Default Unit of Measure" msgstr "" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "" -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "" @@ -16091,7 +16096,7 @@ msgstr "" msgid "Delivered" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "" @@ -16141,8 +16146,8 @@ msgstr "" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16153,11 +16158,11 @@ msgstr "" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16246,7 +16251,7 @@ msgstr "" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16771,7 +16776,7 @@ msgstr "" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "" @@ -16935,10 +16940,8 @@ msgstr "" msgid "Disable In Words" msgstr "" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' @@ -16980,6 +16983,12 @@ msgstr "" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17036,7 +17045,7 @@ msgstr "" msgid "Disassemble Order" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17561,6 +17570,12 @@ msgstr "" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17651,9 +17666,12 @@ msgstr "" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17671,6 +17689,10 @@ msgstr "" msgid "Document Type already used as a dimension" msgstr "" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -17975,7 +17997,7 @@ msgstr "" msgid "Duplicate Sales Invoices found" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18095,8 +18117,8 @@ msgstr "" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18319,7 +18341,7 @@ msgstr "" msgid "Email Sent to Supplier {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "အသုံးပြုသူ ထည့်သွင်းရန်အတွက် email လိုအပ်ပါသည်။" @@ -18509,7 +18531,7 @@ msgstr "" msgid "Employee cannot report to himself." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18517,7 +18539,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18530,7 +18552,7 @@ msgstr "" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18573,7 +18595,7 @@ msgstr "" msgid "Enable Auto Email" msgstr "" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "" @@ -19171,7 +19193,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "" @@ -19217,7 +19239,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "" @@ -19246,7 +19268,7 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19605,7 +19627,7 @@ msgstr "" msgid "Expense" msgstr "စရိတ်" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "ကုန်ကျစရိတ် / ကွာခြားချက် အကောင့် ({0}) သည် 'အမြတ် သို့မဟုတ် ဆုံးရှုံးမှု' အကောင့် ဖြစ်ရမည်" @@ -19653,7 +19675,7 @@ msgstr "ကုန်ကျစရိတ် / ကွာခြားချက် msgid "Expense Account" msgstr "စရိတ်ခေါင်းစဉ်များ" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "" @@ -20116,7 +20138,7 @@ msgstr "" msgid "Filter by Reference Date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20446,7 +20468,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20541,7 +20563,7 @@ msgstr "" msgid "Fiscal Year" msgstr "ဘဏ္ဍာရေးနှစ်" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20605,7 +20627,7 @@ msgstr "" msgid "Fixed Asset Defaults" msgstr "" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "" @@ -20755,7 +20777,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20786,7 +20808,7 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "" @@ -20870,6 +20892,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20891,7 +20919,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -20900,7 +20928,7 @@ msgstr "" msgid "For reference" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" @@ -20924,7 +20952,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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -20933,7 +20961,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -21546,7 +21574,7 @@ msgstr "" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21558,7 +21586,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "" @@ -22073,7 +22101,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -22256,7 +22284,7 @@ msgstr "" msgid "Grant Commission" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "" @@ -22897,10 +22925,10 @@ msgstr "" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23055,7 +23083,7 @@ msgstr "" msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23237,7 +23265,7 @@ msgstr "" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23409,11 +23437,11 @@ msgstr "" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "" @@ -23529,7 +23557,7 @@ msgstr "" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23581,7 +23609,7 @@ msgstr "" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "" @@ -23624,7 +23652,7 @@ msgstr "" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23638,6 +23666,7 @@ msgid "Implementation Partner" msgstr "" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -23991,7 +24020,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24245,7 +24274,7 @@ msgstr "" msgid "Incorrect Batch Consumed" msgstr "" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" @@ -24253,7 +24282,7 @@ msgstr "" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "" @@ -24463,14 +24492,14 @@ msgstr "" msgid "Inspected By" msgstr "" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "" @@ -24487,7 +24516,7 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "" @@ -24569,8 +24598,8 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "" @@ -24790,7 +24819,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -24883,7 +24912,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -24913,7 +24942,7 @@ msgstr "" msgid "Invalid Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "" @@ -24999,12 +25028,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25041,7 +25070,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "" @@ -25170,7 +25199,6 @@ msgstr "" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "" @@ -25191,10 +25219,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25716,12 +25740,12 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' @@ -25994,7 +26018,7 @@ msgstr "" msgid "Issuing Date" msgstr "" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" @@ -26064,7 +26088,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26111,6 +26135,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26126,7 +26151,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26890,6 +26914,7 @@ msgstr "" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26900,7 +26925,6 @@ msgstr "" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27160,11 +27184,11 @@ msgstr "" msgid "Item Variant {0} already exists with same attributes" msgstr "" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "" @@ -27203,6 +27227,15 @@ msgstr "" msgid "Item Weight Details" msgstr "" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27232,7 +27265,7 @@ msgstr "" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27252,11 +27285,11 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "" @@ -27286,7 +27319,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27305,10 +27338,14 @@ msgstr "" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27322,7 +27359,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "" @@ -27330,7 +27367,7 @@ msgstr "" msgid "Item {0} does not exist in the system or has expired" msgstr "" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "" @@ -27346,15 +27383,15 @@ msgstr "" msgid "Item {0} has been disabled" msgstr "ပစ္စည်း {0} ကို ပိတ်ထားသည်" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "" @@ -27366,19 +27403,23 @@ msgstr "" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "" @@ -27386,7 +27427,11 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -27402,7 +27447,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27418,7 +27463,7 @@ msgstr "" msgid "Item {0}: {1} qty produced. " msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "" @@ -27528,7 +27573,7 @@ msgstr "" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -28161,7 +28206,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28439,7 +28484,7 @@ msgstr "" msgid "Length (cm)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "" @@ -28580,7 +28625,7 @@ msgstr "" msgid "Linked Location" msgstr "" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "" @@ -28975,11 +29020,6 @@ msgstr "" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -28991,6 +29031,11 @@ msgstr "" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29187,7 +29232,7 @@ msgid "Major/Optional Subjects" msgstr "" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29356,8 +29401,8 @@ msgstr "" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29416,8 +29461,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29566,7 +29611,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "" @@ -29842,7 +29887,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -29913,6 +29958,7 @@ msgstr "" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30019,11 +30065,11 @@ msgstr "" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "" @@ -30138,7 +30184,7 @@ msgstr "" msgid "Material Transferred for Manufacturing" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30267,11 +30313,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -30715,11 +30761,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "" @@ -30757,7 +30803,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "" @@ -30765,11 +30811,11 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30813,10 +30859,6 @@ msgstr "" msgid "Mixed Conditions" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "" - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31085,7 +31127,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:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31164,27 +31206,20 @@ msgstr "" msgid "Naming Series Prefix" msgstr "" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31232,16 +31267,16 @@ msgstr "" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "" @@ -31855,7 +31890,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "" @@ -31868,7 +31903,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "" @@ -31913,7 +31948,7 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "" @@ -31926,7 +31961,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "" @@ -31938,7 +31973,7 @@ msgstr "" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -31946,7 +31981,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32040,7 +32075,7 @@ msgstr "" msgid "No more children on Right" msgstr "" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32215,7 +32250,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32307,7 +32342,7 @@ msgstr "" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "" @@ -32411,7 +32446,7 @@ msgstr "" msgid "Not authorized to edit frozen Account {0}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32457,7 +32492,7 @@ msgstr "" msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "" -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -32934,7 +32969,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33085,7 +33120,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "" @@ -33244,16 +33279,16 @@ msgstr "" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33610,7 +33645,7 @@ msgstr "" msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33744,7 +33779,7 @@ msgstr "" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "" @@ -33952,7 +33987,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34010,7 +34045,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34028,7 +34063,7 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "" @@ -34271,7 +34306,6 @@ msgstr "" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "" @@ -34542,7 +34576,7 @@ msgstr "" msgid "Packed Items" msgstr "" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -34990,7 +35024,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35126,7 +35160,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35252,7 +35286,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35338,7 +35372,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35641,7 +35675,6 @@ msgstr "" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35899,7 +35932,7 @@ msgstr "" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -35978,10 +36011,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37001,7 +37030,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "" @@ -37033,11 +37062,11 @@ msgstr "" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "" @@ -37057,7 +37086,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -37164,7 +37193,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "" @@ -37233,11 +37262,11 @@ msgstr "" msgid "Please enter Approving Role or Approving User" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "" @@ -37249,7 +37278,7 @@ msgstr "" msgid "Please enter Employee Id of this sales person" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "" @@ -37294,7 +37323,7 @@ msgstr "" msgid "Please enter Root Type for account- {0}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "" @@ -37371,7 +37400,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37485,12 +37514,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "" @@ -37506,13 +37535,13 @@ msgstr "" msgid "Please select Category first" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "" @@ -37521,7 +37550,7 @@ msgstr "" msgid "Please select Company and Posting Date to getting entries" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "" @@ -37570,7 +37599,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "" @@ -37578,11 +37607,11 @@ msgstr "" msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "" @@ -37635,7 +37664,7 @@ msgstr "" msgid "Please select a Supplier" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "" @@ -37696,7 +37725,7 @@ msgstr "ပြန်လည်တင်ခြင်း မှတ်တမ်း msgid "Please select a supplier for fetching payments." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37716,7 +37745,7 @@ msgstr "" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37823,7 +37852,7 @@ msgstr "" msgid "Please select weekly off day" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "" @@ -37963,7 +37992,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -38007,7 +38036,7 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" @@ -38126,7 +38155,7 @@ msgstr "" msgid "Please specify at least one attribute in the Attributes table" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "" @@ -38297,7 +38326,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38322,7 +38351,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38437,7 +38466,7 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "" @@ -38616,6 +38645,12 @@ msgstr "" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -38909,7 +38944,9 @@ msgstr "" msgid "Price per Unit (Stock UOM)" msgstr "" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40264,6 +40301,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40300,6 +40338,12 @@ msgstr "" msgid "Purchase Invoice Item" msgstr "" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40351,6 +40395,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40360,7 +40405,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40477,7 +40522,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "" @@ -40540,6 +40585,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40554,7 +40600,7 @@ msgstr "" msgid "Purchase Receipt" msgstr "" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40820,7 +40866,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41408,7 +41453,7 @@ msgstr "" msgid "Quality Review Objective" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41469,7 +41514,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41663,7 +41708,7 @@ msgstr "" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "" @@ -41718,7 +41763,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41881,7 +41926,6 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42291,8 +42335,8 @@ msgstr "" msgid "Raw SQL" msgstr "" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42700,11 +42744,10 @@ msgstr "" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43228,7 +43271,7 @@ msgstr "" msgid "Rejected Warehouse" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "" @@ -43278,7 +43321,7 @@ msgid "Remaining Balance" msgstr "" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43332,7 +43375,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43371,7 +43414,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "" @@ -43775,6 +43818,7 @@ msgstr "" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44048,7 +44092,7 @@ msgstr "" msgid "Reserved" msgstr "" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44661,7 +44705,7 @@ msgstr "" msgid "Reversal Of" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "" @@ -44810,10 +44854,7 @@ msgstr "" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "" @@ -44828,8 +44869,11 @@ msgstr "" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45030,8 +45074,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -45058,11 +45102,11 @@ msgstr "" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45088,7 +45132,7 @@ msgstr "" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "" @@ -45289,7 +45333,7 @@ msgstr "" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -45349,7 +45393,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45377,7 +45421,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "" @@ -45430,7 +45474,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "" @@ -45455,7 +45499,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "တန်း #{0}: Sub Assembly Warehouse ကို ရွေးချယ်ပါ။" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "" @@ -45481,15 +45525,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45520,11 +45564,11 @@ msgstr "" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "" @@ -45567,7 +45611,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "" @@ -45615,11 +45659,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45672,11 +45716,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "" -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "" @@ -45704,7 +45748,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "" @@ -45740,23 +45784,23 @@ msgstr "" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45764,7 +45808,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45829,7 +45873,7 @@ msgstr "" msgid "Row #{}: {} {} does not exist." msgstr "" -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" @@ -45845,7 +45889,7 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -45877,7 +45921,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:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -45935,7 +45979,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "" @@ -45976,7 +46020,7 @@ msgstr "" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -46100,7 +46144,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "" @@ -46112,11 +46156,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:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -46140,7 +46184,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:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46193,7 +46237,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:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -46223,7 +46267,7 @@ msgstr "" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" @@ -46289,7 +46333,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46586,7 +46630,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46760,7 +46804,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46883,8 +46927,8 @@ msgstr "" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47295,7 +47339,7 @@ msgstr "" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "" @@ -47332,7 +47376,7 @@ msgstr "" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -47621,7 +47665,7 @@ msgstr "" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47766,7 +47810,7 @@ msgstr "" msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "" @@ -48461,7 +48505,7 @@ msgstr "" msgid "Serial No Reserved" msgstr "" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48522,7 +48566,7 @@ msgstr "" msgid "Serial No is mandatory for Item {0}" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "" @@ -48808,7 +48852,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48834,7 +48878,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49232,12 +49276,6 @@ msgstr "" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "" @@ -49343,6 +49381,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "" @@ -49841,7 +49885,7 @@ msgstr "" msgid "Show Barcode Field in Stock Transactions" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "" @@ -49849,7 +49893,7 @@ msgstr "" msgid "Show Completed" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -49932,7 +49976,7 @@ msgstr "" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "" @@ -49944,7 +49988,7 @@ msgstr "" msgid "Show Open" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "" @@ -49957,11 +50001,6 @@ msgstr "" msgid "Show Operations" msgstr "" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "" @@ -49977,7 +50016,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "" @@ -50044,6 +50083,11 @@ msgstr "" msgid "Show only the Immediate Upcoming Term" msgstr "" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "" @@ -50330,11 +50374,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50400,7 +50444,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "" @@ -50414,8 +50458,8 @@ msgid "Source of Funds (Liabilities)" msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "" @@ -50580,8 +50624,8 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "" @@ -50914,7 +50958,7 @@ msgstr "" msgid "Stock Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -51185,7 +51229,7 @@ msgstr "" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51197,7 +51241,7 @@ msgstr "" msgid "Stock Reconciliation Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "" @@ -51235,7 +51279,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51263,7 +51307,7 @@ msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "" @@ -51645,7 +51689,7 @@ msgstr "" #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "" @@ -51723,10 +51767,6 @@ msgstr "" msgid "Sub Procedure" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -51943,7 +51983,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -51969,7 +52009,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "" @@ -52058,7 +52098,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "" @@ -52233,7 +52273,7 @@ msgstr "" msgid "Successfully Set Supplier" msgstr "" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "" @@ -52389,6 +52429,7 @@ msgstr "" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52430,8 +52471,8 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52479,6 +52520,12 @@ msgstr "" msgid "Supplier Contact" msgstr "" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52573,7 +52620,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "" @@ -52853,19 +52900,10 @@ msgstr "" msgid "Supplier {0} not found in {1}" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -52927,7 +52965,7 @@ msgstr "" msgid "Support Tickets" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53186,8 +53224,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "" @@ -53655,7 +53693,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "" @@ -53816,7 +53854,7 @@ msgstr "" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "" @@ -54006,7 +54044,6 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54198,7 +54235,7 @@ msgstr "" msgid "The BOM which will be replaced" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54242,7 +54279,7 @@ msgstr "" msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54258,7 +54295,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "" @@ -54294,7 +54331,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54400,7 +54437,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "" @@ -54444,15 +54481,15 @@ msgstr "" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54608,7 +54645,7 @@ msgstr "" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "" @@ -54630,11 +54667,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -54706,7 +54743,7 @@ msgstr "" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54759,7 +54796,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54803,7 +54840,7 @@ msgstr "" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54859,11 +54896,11 @@ msgstr "" msgid "This Month's Summary" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55664,7 +55701,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "" @@ -55699,7 +55736,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "" @@ -55850,7 +55887,7 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "" @@ -56273,7 +56310,7 @@ msgstr "" msgid "Total Payments" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56305,7 +56342,7 @@ msgstr "" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "" @@ -56691,7 +56728,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56702,7 +56739,7 @@ msgstr "" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "" @@ -57374,11 +57411,11 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57450,7 +57487,7 @@ msgstr "" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57526,7 +57563,7 @@ msgstr "" msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "" @@ -57645,7 +57682,7 @@ msgstr "" msgid "Unit of Measure (UOM)" msgstr "" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "" @@ -57765,10 +57802,9 @@ msgid "Unreconcile Transaction" msgstr "" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "" @@ -57791,10 +57827,6 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57840,7 +57872,7 @@ msgstr "" msgid "Unsecured Loans" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58055,12 +58087,6 @@ msgstr "" msgid "Update Type" msgstr "" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58101,7 +58127,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "" @@ -58559,12 +58585,6 @@ msgstr "" msgid "Validate Components and Quantities Per BOM" msgstr "" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58588,6 +58608,12 @@ msgstr "" msgid "Validate Stock on Save" msgstr "မသိမ်းမီ ကုန်လက်ကျန်ကို စစ်ဆေးပါ။" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58694,11 +58720,11 @@ msgstr "" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "" -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "" @@ -58708,7 +58734,7 @@ msgstr "" msgid "Valuation and Total" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "" @@ -58858,7 +58884,7 @@ msgstr "" msgid "Variant" msgstr "" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "" @@ -58877,7 +58903,7 @@ msgstr "" msgid "Variant Based On" msgstr "" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "" @@ -58895,7 +58921,7 @@ msgstr "" msgid "Variant Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "" @@ -59276,7 +59302,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59316,7 +59342,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "" @@ -59348,7 +59374,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59583,7 +59609,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "" @@ -59630,7 +59656,7 @@ msgstr "" #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59686,6 +59712,12 @@ msgstr "" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" @@ -59869,7 +59901,7 @@ msgstr "" msgid "Website:" msgstr "website:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60243,7 +60275,7 @@ msgstr "" msgid "Work Order Item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60305,11 +60337,11 @@ msgstr "" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "" @@ -60625,11 +60657,11 @@ msgstr "" msgid "Year Start Date" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60682,7 +60714,7 @@ msgstr "" msgid "You can also set default CWIP account in Company {}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60836,6 +60868,10 @@ msgstr "ကုမ္ပဏီလိပ်စာအသစ်ဖန်တီးခ msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60864,7 +60900,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60872,7 +60908,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "" @@ -60943,8 +60979,11 @@ msgstr "" msgid "Zero quantity" msgstr "" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61056,7 +61095,7 @@ msgstr "" msgid "fieldname" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61274,6 +61313,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "" @@ -61332,7 +61375,8 @@ msgstr "" msgid "{0} Digest" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61352,7 +61396,7 @@ msgstr "" msgid "{0} Request for {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "" @@ -61465,7 +61509,7 @@ msgid "{0} entered twice in Item Tax" msgstr "" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "" @@ -61633,7 +61677,7 @@ msgstr "" msgid "{0} payment entries can not be filtered by {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61646,7 +61690,7 @@ msgstr "{0} မှ {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" @@ -61848,7 +61892,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -61934,23 +61978,23 @@ msgstr "" msgid "{0}: {1} is a group account." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "" -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" diff --git a/erpnext/locale/nb.po b/erpnext/locale/nb.po index 51d3538b459..c4ba3400375 100644 --- a/erpnext/locale/nb.po +++ b/erpnext/locale/nb.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:22\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:22\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Norwegian Bokmal\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr "Delsammenstilling" msgid " Summary" msgstr "Sammendrag" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "Artikkel levert fra kunde kan ikke også være innkjøpsartikkel" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "Artikkel levert fra kunde kan ikke ha verdisats" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "\"Er anleggsmiddel\" kan ikke fjernes, siden det finnes en anleggsmiddelpost for artikkelen" @@ -302,7 +302,7 @@ msgstr "\"Fra dato\" er påkrevd" msgid "'From Date' must be after 'To Date'" msgstr "'Fra Dato' må være etter 'Til Date'" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "\"Har serienummer\" kan ikke være \"Ja\" for artikler som ikke er på lager" @@ -338,7 +338,7 @@ msgstr "\"Oppdater lager\" kan ikke sjekkes fordi artiklene ikke leveres via {0} msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "\"Oppdater lagerbeholdning\" kan ikke kontrolleres for salg av anleggsmidler" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "'{0}' kontoen er allerede brukt av {1}. Bruk en annen konto." @@ -1099,7 +1099,7 @@ msgstr "En sjåfør må angis for å kunne registrere." msgid "A logical Warehouse against which stock entries are made." msgstr "Et logisk lager som lageroppføringer gjøres mot." -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1311,7 +1311,7 @@ msgstr "" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "I henhold til stykklisten (BOM) {0} mangler artikkelen '{1}' i lageroppføringen." @@ -1981,8 +1981,8 @@ msgstr "Regnskapsposteringer" msgid "Accounting Entry for Asset" msgstr "Regnskapspostering for eiendeler" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "Regnskapspostering for LCV i lagerpostering {0}" @@ -1990,7 +1990,7 @@ msgstr "Regnskapspostering for LCV i lagerpostering {0}" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "Regnskapspostering for innkjøpsbilag for SCR {0}" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Regnskapspostering for tjeneste" @@ -2003,16 +2003,16 @@ msgstr "Regnskapspostering for tjeneste" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Regnskapspostering for lagerbeholdning" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "Regnskapspostering for {0}" @@ -2310,12 +2310,6 @@ msgstr "" msgid "Action If Quality Inspection Is Rejected" msgstr "" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "Handling hvis samme frekvens ikke er opprettholdt" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "" @@ -2374,6 +2368,12 @@ msgstr "" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2641,7 +2641,7 @@ msgstr "" msgid "Actual qty in stock" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "Faktisk avgiftstype kan ikke inkluderes i artikkelprisen i rad {0}" @@ -2655,7 +2655,7 @@ msgstr "" msgid "Add / Edit Prices" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "" @@ -2809,7 +2809,7 @@ msgstr "" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -3054,7 +3054,7 @@ msgstr "Ekstra rabattbeløp" msgid "Additional Discount Amount (Company Currency)" msgstr "Ekstra rabattbeløp (selskapets valuta)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -3339,7 +3339,7 @@ msgstr "" msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3452,7 +3452,7 @@ msgstr "" msgid "Advance amount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "" @@ -3521,7 +3521,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "" @@ -3639,7 +3639,7 @@ msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "" @@ -3663,7 +3663,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "" @@ -3944,7 +3944,7 @@ msgstr "" msgid "All items are already requested" msgstr "Alle artikler er allerede etterspurt" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "Alle artikler er allerede fakturert/returnert" @@ -3952,7 +3952,7 @@ msgstr "Alle artikler er allerede fakturert/returnert" msgid "All items have already been received" msgstr "Alle artikler er allerede mottatt" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Alle artikler er allerede overført for denne arbeidsordren." @@ -4001,7 +4001,7 @@ msgstr "Fordele" msgid "Allocate Advances Automatically (FIFO)" msgstr "Fordel forskudd automatisk (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Fordel innbetalingsbeløp" @@ -4011,7 +4011,7 @@ msgstr "Fordel innbetalingsbeløp" msgid "Allocate Payment Based On Payment Terms" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "" @@ -4041,7 +4041,7 @@ msgstr "Fordelt" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4162,15 +4162,15 @@ msgstr "" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4199,12 +4199,6 @@ msgstr "" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4417,8 +4411,11 @@ msgstr "" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4510,7 +4507,7 @@ msgstr "" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4707,7 +4704,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4737,7 +4734,6 @@ msgstr "" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4907,10 +4903,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5530,7 +5522,7 @@ msgstr "" msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "" -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "" @@ -5680,7 +5672,7 @@ msgstr "" msgid "Asset Category Name" msgstr "" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "" @@ -6076,7 +6068,7 @@ msgstr "" msgid "Asset {0} must be submitted" msgstr "" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6114,11 +6106,11 @@ msgstr "Eiendeler" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "" -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "" @@ -6191,7 +6183,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "" @@ -6223,7 +6215,7 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "På rad {0}: Serie-/partinummer-kombinasjon {1} er allerede opprettet. Fjern verdiene fra feltene for serienummer eller batchnummer." @@ -6287,7 +6279,11 @@ msgstr "" msgid "Attribute Value" msgstr "" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "" @@ -6295,11 +6291,19 @@ msgstr "" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "" @@ -6359,24 +6363,12 @@ msgstr "" msgid "Auto Create Exchange Rate Revaluation" msgstr "" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "Automatisk oppretting av serie-/partinummer-kombinasjon for utgående" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6495,6 +6487,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6712,7 +6716,7 @@ msgstr "" msgid "Available for use date is required" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "" @@ -6811,7 +6815,7 @@ msgstr "" msgid "BIN Qty" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7084,7 +7088,7 @@ msgstr "" msgid "BOM Website Operation" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7175,7 +7179,7 @@ msgstr "" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" +msgid "Backflush raw materials of subcontract based on" msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' @@ -7196,7 +7200,7 @@ msgstr "" msgid "Balance (Dr - Cr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "" @@ -7727,11 +7731,11 @@ msgstr "" msgid "Barcode Type" msgstr "" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "" @@ -8098,12 +8102,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -8176,7 +8180,7 @@ msgstr "" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" +msgid "Bill for rejected quantity in Purchase Invoice" msgstr "" #. Label of a Card Break in the Manufacturing Workspace @@ -8517,8 +8521,11 @@ msgstr "" msgid "Blanket Order Rate" msgstr "" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -9033,7 +9040,7 @@ msgstr "Innkjøp og salg" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "Kjøp må være krysset av hvis Gjelder for er valgt som {0}" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "Som standard er leverandørnavnet angitt i henhold til leverandørnavnet som er angitt. Hvis du vil at leverandører skal navngis med en navneserie, velg alternativet «Navneserie»." @@ -9398,7 +9405,7 @@ msgstr "" msgid "Can only make payment against unbilled {0}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9454,9 +9461,9 @@ msgstr "" msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "" @@ -9484,7 +9491,7 @@ msgstr "" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "" @@ -9520,7 +9527,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "Kan ikke avbryte dette dokumentet da det er linket med innsendt eiendel {asset_link}. Avbryt eiendel for å fortsette." @@ -9528,7 +9535,7 @@ msgstr "Kan ikke avbryte dette dokumentet da det er linket med innsendt eiendel msgid "Cannot cancel transaction for Completed Work Order." msgstr "" -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "" @@ -9540,7 +9547,7 @@ msgstr "Kan ikke endre referanse-dokumenttype (DocType)." msgid "Cannot change Service Stop Date for item in row {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "" @@ -9568,11 +9575,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9598,7 +9605,7 @@ msgstr "" msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -9635,7 +9642,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9643,8 +9650,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "" @@ -9688,7 +9695,7 @@ msgstr "" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9706,8 +9713,8 @@ msgstr "Kan ikke hente lenketoken. Sjekk feilloggen for mer informasjon." msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9723,7 +9730,7 @@ msgstr "" msgid "Cannot set authorization on basis of Discount for {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "" @@ -10634,7 +10641,7 @@ msgstr "" msgid "Closing (Dr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "" @@ -11095,7 +11102,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11377,7 +11384,7 @@ msgstr "Selskap" msgid "Company Abbreviation" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11390,7 +11397,7 @@ msgstr "" msgid "Company Account" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "" @@ -11566,7 +11573,7 @@ msgstr "" msgid "Company is mandatory" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "" @@ -11837,7 +11844,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11850,7 +11857,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11868,13 +11877,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "" @@ -12052,7 +12061,7 @@ msgstr "" msgid "Consumed" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "" @@ -12096,7 +12105,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12269,10 +12278,6 @@ msgstr "" msgid "Contact:" msgstr "Kontakt:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "" - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12450,7 +12455,7 @@ msgstr "" msgid "Conversion Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "" @@ -12722,7 +12727,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12817,7 +12822,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "" @@ -13155,7 +13160,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "" @@ -13528,7 +13533,7 @@ msgstr "" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "" @@ -13669,15 +13674,15 @@ msgstr "" msgid "Credit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "" @@ -13872,7 +13877,7 @@ msgstr "" msgid "Creditors" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14170,7 +14175,7 @@ msgstr "Gjeldende serie-/partinummer-kombinasjon" msgid "Current Serial No" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14371,7 +14376,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15144,7 +15149,7 @@ msgstr "" msgid "Day Of Week" msgstr "Ukedag" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15260,11 +15265,11 @@ msgstr "" msgid "Debit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "" @@ -15274,7 +15279,7 @@ msgstr "" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "" @@ -15385,7 +15390,7 @@ msgstr "" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15527,7 +15532,7 @@ msgstr "" msgid "Default BOM" msgstr "" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "" @@ -15884,15 +15889,15 @@ msgstr "" msgid "Default Unit of Measure" msgstr "" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "" -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "" @@ -16193,7 +16198,7 @@ msgstr "" msgid "Delivered" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "" @@ -16243,8 +16248,8 @@ msgstr "Leverte varer som skal faktureres" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16255,11 +16260,11 @@ msgstr "" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16348,7 +16353,7 @@ msgstr "Leveranseansvarlig" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16873,7 +16878,7 @@ msgstr "" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "" @@ -17037,10 +17042,8 @@ msgstr "" msgid "Disable In Words" msgstr "" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' @@ -17082,6 +17085,12 @@ msgstr "" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17138,7 +17147,7 @@ msgstr "" msgid "Disassemble Order" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17663,6 +17672,12 @@ msgstr "" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17753,9 +17768,12 @@ msgstr "" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17773,6 +17791,10 @@ msgstr "Dokumenttype (DocType)" msgid "Document Type already used as a dimension" msgstr "Dokumenttype (DocType) brukes allerede som en dimensjon" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18077,7 +18099,7 @@ msgstr "" msgid "Duplicate Sales Invoices found" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18197,8 +18219,8 @@ msgstr "" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18421,7 +18443,7 @@ msgstr "" msgid "Email Sent to Supplier {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18611,7 +18633,7 @@ msgstr "" msgid "Employee cannot report to himself." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18619,7 +18641,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18632,7 +18654,7 @@ msgstr "" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18675,7 +18697,7 @@ msgstr "" msgid "Enable Auto Email" msgstr "" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "" @@ -19273,7 +19295,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "" @@ -19319,7 +19341,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "" @@ -19348,7 +19370,7 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19707,7 +19729,7 @@ msgstr "" msgid "Expense" msgstr "" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "" @@ -19755,7 +19777,7 @@ msgstr "" msgid "Expense Account" msgstr "" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "" @@ -20218,7 +20240,7 @@ msgstr "" msgid "Filter by Reference Date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20548,7 +20570,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20643,7 +20665,7 @@ msgstr "" msgid "Fiscal Year" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20707,7 +20729,7 @@ msgstr "" msgid "Fixed Asset Defaults" msgstr "" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "" @@ -20857,7 +20879,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20888,7 +20910,7 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "" @@ -20972,6 +20994,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20993,7 +21021,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -21002,7 +21030,7 @@ msgstr "" msgid "For reference" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" @@ -21026,7 +21054,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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -21035,7 +21063,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -21648,7 +21676,7 @@ msgstr "" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21660,7 +21688,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "" @@ -22175,7 +22203,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -22358,7 +22386,7 @@ msgstr "" msgid "Grant Commission" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "" @@ -22999,10 +23027,10 @@ msgstr "" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23157,7 +23185,7 @@ msgstr "" msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23339,7 +23367,7 @@ msgstr "" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23511,11 +23539,11 @@ msgstr "" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "" @@ -23631,7 +23659,7 @@ msgstr "" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23683,7 +23711,7 @@ msgstr "" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "" @@ -23726,7 +23754,7 @@ msgstr "" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23740,6 +23768,7 @@ msgid "Implementation Partner" msgstr "" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24093,7 +24122,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24347,7 +24376,7 @@ msgstr "" msgid "Incorrect Batch Consumed" msgstr "" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" @@ -24355,7 +24384,7 @@ msgstr "" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "" @@ -24565,14 +24594,14 @@ msgstr "" msgid "Inspected By" msgstr "" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "" @@ -24589,7 +24618,7 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "" @@ -24671,8 +24700,8 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "" @@ -24892,7 +24921,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -24985,7 +25014,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -25015,7 +25044,7 @@ msgstr "" msgid "Invalid Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "" @@ -25101,12 +25130,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "Ugyldig serie-/partinummer-kombinasjon" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25143,7 +25172,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Ugyldig nummerserie (punktum mangler) for {0}" @@ -25272,7 +25301,6 @@ msgstr "" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "" @@ -25293,10 +25321,6 @@ msgstr "Feil ved valg av faktura (DocType)" msgid "Invoice Grand Total" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25818,12 +25842,12 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' @@ -26096,7 +26120,7 @@ msgstr "" msgid "Issuing Date" msgstr "Utstedelsesdato" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" @@ -26166,7 +26190,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26213,6 +26237,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26228,7 +26253,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26992,6 +27016,7 @@ msgstr "" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -27002,7 +27027,6 @@ msgstr "" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27262,11 +27286,11 @@ msgstr "" msgid "Item Variant {0} already exists with same attributes" msgstr "" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "" @@ -27305,6 +27329,15 @@ msgstr "" msgid "Item Weight Details" msgstr "" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27334,7 +27367,7 @@ msgstr "" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27354,11 +27387,11 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "" @@ -27388,7 +27421,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27407,10 +27440,14 @@ msgstr "" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27424,7 +27461,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "" @@ -27432,7 +27469,7 @@ msgstr "" msgid "Item {0} does not exist in the system or has expired" msgstr "" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "" @@ -27448,15 +27485,15 @@ msgstr "" msgid "Item {0} has been disabled" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "" @@ -27468,19 +27505,23 @@ msgstr "" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "" @@ -27488,7 +27529,11 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -27504,7 +27549,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27520,7 +27565,7 @@ msgstr "" msgid "Item {0}: {1} qty produced. " msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "" @@ -27630,7 +27675,7 @@ msgstr "" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -28263,7 +28308,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28542,7 +28587,7 @@ msgstr "" msgid "Length (cm)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "" @@ -28683,7 +28728,7 @@ msgstr "" msgid "Linked Location" msgstr "Koblet plassering" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "" @@ -29078,11 +29123,6 @@ msgstr "" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29094,6 +29134,11 @@ msgstr "" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29290,7 +29335,7 @@ msgid "Major/Optional Subjects" msgstr "" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29459,8 +29504,8 @@ msgstr "" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29519,8 +29564,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29669,7 +29714,7 @@ msgstr "Produksjonsdato" msgid "Manufacturing Manager" msgstr "Produksjonsleder" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "Produksjonsmengde er påkrevet" @@ -29945,7 +29990,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -30016,6 +30061,7 @@ msgstr "" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30122,11 +30168,11 @@ msgstr "" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "" @@ -30241,7 +30287,7 @@ msgstr "" msgid "Material Transferred for Manufacturing" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30370,11 +30416,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -30818,11 +30864,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "" @@ -30860,7 +30906,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "" @@ -30868,11 +30914,11 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30916,10 +30962,6 @@ msgstr "" msgid "Mixed Conditions" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "" - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31188,7 +31230,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:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31267,27 +31309,20 @@ msgstr "" msgid "Naming Series Prefix" msgstr "Prefiks for nummerserie" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "Nummerserier og prisstandarder" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "Nummerserie er påkrevet" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31335,16 +31370,16 @@ msgstr "" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "" @@ -31958,7 +31993,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "" @@ -31971,7 +32006,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "" @@ -32016,7 +32051,7 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "" @@ -32029,7 +32064,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "" @@ -32041,7 +32076,7 @@ msgstr "" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -32049,7 +32084,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32143,7 +32178,7 @@ msgstr "" msgid "No more children on Right" msgstr "" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32318,7 +32353,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32410,7 +32445,7 @@ msgstr "" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "" @@ -32514,7 +32549,7 @@ msgstr "" msgid "Not authorized to edit frozen Account {0}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32560,7 +32595,7 @@ msgstr "" msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "" -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -33037,7 +33072,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33188,7 +33223,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "" @@ -33347,16 +33382,16 @@ msgstr "" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33713,7 +33748,7 @@ msgstr "" msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33847,7 +33882,7 @@ msgstr "" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "" @@ -34055,7 +34090,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34113,7 +34148,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34131,7 +34166,7 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "" @@ -34374,7 +34409,6 @@ msgstr "" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "POS-faktura" @@ -34645,7 +34679,7 @@ msgstr "" msgid "Packed Items" msgstr "" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -35093,7 +35127,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35229,7 +35263,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35355,7 +35389,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35441,7 +35475,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35744,7 +35778,6 @@ msgstr "" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -36002,7 +36035,7 @@ msgstr "" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36081,10 +36114,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37104,7 +37133,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "" @@ -37136,11 +37165,11 @@ msgstr "" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "" @@ -37160,7 +37189,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -37267,7 +37296,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "Slett buntartikkelen {0}før du slår sammen {1} med {2}" @@ -37336,11 +37365,11 @@ msgstr "" msgid "Please enter Approving Role or Approving User" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "" @@ -37352,7 +37381,7 @@ msgstr "" msgid "Please enter Employee Id of this sales person" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "" @@ -37397,7 +37426,7 @@ msgstr "" msgid "Please enter Root Type for account- {0}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "" @@ -37474,7 +37503,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37588,12 +37617,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "" @@ -37609,13 +37638,13 @@ msgstr "" msgid "Please select Category first" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "" @@ -37624,7 +37653,7 @@ msgstr "" msgid "Please select Company and Posting Date to getting entries" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "" @@ -37673,7 +37702,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "" @@ -37681,11 +37710,11 @@ msgstr "" msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "" @@ -37738,7 +37767,7 @@ msgstr "" msgid "Please select a Supplier" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "" @@ -37799,7 +37828,7 @@ msgstr "" msgid "Please select a supplier for fetching payments." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37819,7 +37848,7 @@ msgstr "" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37926,7 +37955,7 @@ msgstr "Vennligst velg gyldig dokumenttype (DocType)." msgid "Please select weekly off day" msgstr "Vennligst velg ukentlig fridag" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "" @@ -38066,7 +38095,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -38110,7 +38139,7 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" @@ -38229,7 +38258,7 @@ msgstr "" msgid "Please specify at least one attribute in the Attributes table" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "" @@ -38400,7 +38429,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38425,7 +38454,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38540,7 +38569,7 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "" @@ -38719,6 +38748,12 @@ msgstr "" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39012,7 +39047,9 @@ msgstr "" msgid "Price per Unit (Stock UOM)" msgstr "" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40367,6 +40404,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40403,6 +40441,12 @@ msgstr "" msgid "Purchase Invoice Item" msgstr "" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40454,6 +40498,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40463,7 +40508,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40580,7 +40625,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "" @@ -40643,6 +40688,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40657,7 +40703,7 @@ msgstr "" msgid "Purchase Receipt" msgstr "" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40923,7 +40969,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41511,7 +41556,7 @@ msgstr "" msgid "Quality Review Objective" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41572,7 +41617,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41766,7 +41811,7 @@ msgstr "" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "" @@ -41821,7 +41866,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41984,7 +42029,6 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42394,8 +42438,8 @@ msgstr "" msgid "Raw SQL" msgstr "" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42803,11 +42847,10 @@ msgstr "" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43331,7 +43374,7 @@ msgstr "Avvist serie-/partinummer-kombinasjon" msgid "Rejected Warehouse" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "" @@ -43381,7 +43424,7 @@ msgid "Remaining Balance" msgstr "" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43435,7 +43478,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43474,7 +43517,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "" @@ -43878,6 +43921,7 @@ msgstr "" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44151,7 +44195,7 @@ msgstr "" msgid "Reserved" msgstr "" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44764,7 +44808,7 @@ msgstr "" msgid "Reversal Of" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "" @@ -44913,10 +44957,7 @@ msgstr "" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "" @@ -44931,8 +44972,11 @@ msgstr "" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45133,8 +45177,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -45161,11 +45205,11 @@ msgstr "" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "Rad # {0}: Vennligst legg til serie-/partinummer-kombinasjon for vare {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45191,7 +45235,7 @@ msgstr "" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "" @@ -45392,7 +45436,7 @@ msgstr "" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -45452,7 +45496,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45480,7 +45524,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "" @@ -45533,7 +45577,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "" @@ -45558,7 +45602,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "" @@ -45584,15 +45628,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45623,11 +45667,11 @@ msgstr "" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "Rad #{0}: Dokumenttypen (DocType) referanse må være en av innkjøpsordre, Innkjøpsfaktura eller Journal Entry" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "Rad #{0}: Dokumenttypen (DocType) referanse må være en av Salgsordre, Salgsfaktura, Journalregistrering eller Purring" @@ -45670,7 +45714,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "" @@ -45718,11 +45762,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45775,11 +45819,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "" -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "" @@ -45807,7 +45851,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "" @@ -45843,23 +45887,23 @@ msgstr "" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "Rad #{idx}: Angi plassering for eiendelsartikkel {item_code}." -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45867,7 +45911,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45932,7 +45976,7 @@ msgstr "" msgid "Row #{}: {} {} does not exist." msgstr "" -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" @@ -45948,7 +45992,7 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -45980,7 +46024,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:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -46038,7 +46082,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "" @@ -46079,7 +46123,7 @@ msgstr "" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -46203,7 +46247,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "" @@ -46215,11 +46259,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:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -46243,7 +46287,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:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46296,7 +46340,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:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "Rad {idx}: Nummerserie for eiendeler er påkrevet for automatisk oppretting av eiendeler for artikkel {item_code}." @@ -46326,7 +46370,7 @@ msgstr "" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" @@ -46392,7 +46436,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46689,7 +46733,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46863,7 +46907,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46986,8 +47030,8 @@ msgstr "" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47398,7 +47442,7 @@ msgstr "" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "" @@ -47435,7 +47479,7 @@ msgstr "" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -47724,7 +47768,7 @@ msgstr "" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47869,7 +47913,7 @@ msgstr "" msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "" @@ -48564,7 +48608,7 @@ msgstr "" msgid "Serial No Reserved" msgstr "" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48625,7 +48669,7 @@ msgstr "" msgid "Serial No is mandatory for Item {0}" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "" @@ -48911,7 +48955,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48937,7 +48981,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49335,12 +49379,6 @@ msgstr "" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "" @@ -49446,6 +49484,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "" @@ -49944,7 +49988,7 @@ msgstr "" msgid "Show Barcode Field in Stock Transactions" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "" @@ -49952,7 +49996,7 @@ msgstr "" msgid "Show Completed" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -50035,7 +50079,7 @@ msgstr "" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "" @@ -50047,7 +50091,7 @@ msgstr "" msgid "Show Open" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "" @@ -50060,11 +50104,6 @@ msgstr "" msgid "Show Operations" msgstr "" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "" @@ -50080,7 +50119,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "" @@ -50147,6 +50186,11 @@ msgstr "" msgid "Show only the Immediate Upcoming Term" msgstr "" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "" @@ -50433,11 +50477,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50503,7 +50547,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "Kilde- og måplassering kan ikke være den samme" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "" @@ -50517,8 +50561,8 @@ msgid "Source of Funds (Liabilities)" msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "" @@ -50683,8 +50727,8 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "" @@ -51017,7 +51061,7 @@ msgstr "" msgid "Stock Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -51288,7 +51332,7 @@ msgstr "" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51300,7 +51344,7 @@ msgstr "Lageravstemming" msgid "Stock Reconciliation Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "" @@ -51338,7 +51382,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51366,7 +51410,7 @@ msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "" @@ -51748,7 +51792,7 @@ msgstr "" #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "" @@ -51826,10 +51870,6 @@ msgstr "" msgid "Sub Procedure" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -52046,7 +52086,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52072,7 +52112,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "" @@ -52161,7 +52201,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "" @@ -52336,7 +52376,7 @@ msgstr "" msgid "Successfully Set Supplier" msgstr "" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "" @@ -52492,6 +52532,7 @@ msgstr "" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52533,8 +52574,8 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52582,6 +52623,12 @@ msgstr "" msgid "Supplier Contact" msgstr "" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52676,7 +52723,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "" @@ -52956,19 +53003,10 @@ msgstr "" msgid "Supplier {0} not found in {1}" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53030,7 +53068,7 @@ msgstr "" msgid "Support Tickets" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53289,8 +53327,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "" @@ -53758,7 +53796,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "" @@ -53919,7 +53957,7 @@ msgstr "" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "" @@ -54109,7 +54147,6 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54301,7 +54338,7 @@ msgstr "" msgid "The BOM which will be replaced" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54345,7 +54382,7 @@ msgstr "" msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54361,7 +54398,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "Serie-/partinummer-kombinasjonen {0} er ikke gyldig for denne transaksjonen. 'Transaksjonstype' skal være 'Utgående' i stedet for 'Inngående' i serie-/partinummer-kombinasjonen {0}" @@ -54397,7 +54434,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54503,7 +54540,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "" @@ -54547,15 +54584,15 @@ msgstr "" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54711,7 +54748,7 @@ msgstr "" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "" @@ -54733,11 +54770,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -54809,7 +54846,7 @@ msgstr "" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54862,7 +54899,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54906,7 +54943,7 @@ msgstr "" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54962,11 +54999,11 @@ msgstr "" msgid "This Month's Summary" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55767,7 +55804,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "" @@ -55802,7 +55839,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "" @@ -55953,7 +55990,7 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "" @@ -56376,7 +56413,7 @@ msgstr "" msgid "Total Payments" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56408,7 +56445,7 @@ msgstr "" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "" @@ -56794,7 +56831,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56805,7 +56842,7 @@ msgstr "" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "" @@ -57477,11 +57514,11 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57553,7 +57590,7 @@ msgstr "" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57629,7 +57666,7 @@ msgstr "" msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "" @@ -57748,7 +57785,7 @@ msgstr "" msgid "Unit of Measure (UOM)" msgstr "Måleenhet (UOM)" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "" @@ -57868,10 +57905,9 @@ msgid "Unreconcile Transaction" msgstr "" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "" @@ -57894,10 +57930,6 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57943,7 +57975,7 @@ msgstr "" msgid "Unsecured Loans" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58158,12 +58190,6 @@ msgstr "" msgid "Update Type" msgstr "" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58204,7 +58230,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "" @@ -58662,12 +58688,6 @@ msgstr "" msgid "Validate Components and Quantities Per BOM" msgstr "" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58691,6 +58711,12 @@ msgstr "" msgid "Validate Stock on Save" msgstr "" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58797,11 +58823,11 @@ msgstr "" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "" -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "" @@ -58811,7 +58837,7 @@ msgstr "" msgid "Valuation and Total" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "Verdisatsen for objekt levert fra kunde er satt til null." @@ -58961,7 +58987,7 @@ msgstr "" msgid "Variant" msgstr "" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "" @@ -58980,7 +59006,7 @@ msgstr "" msgid "Variant Based On" msgstr "" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "" @@ -58998,7 +59024,7 @@ msgstr "" msgid "Variant Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "" @@ -59379,7 +59405,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59419,7 +59445,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "" @@ -59451,7 +59477,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59686,7 +59712,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "" @@ -59733,7 +59759,7 @@ msgstr "" #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59789,6 +59815,12 @@ msgstr "" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" @@ -59972,7 +60004,7 @@ msgstr "Spesifikasjoner for nettsted" msgid "Website:" msgstr "Nettsted:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60346,7 +60378,7 @@ msgstr "" msgid "Work Order Item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60408,11 +60440,11 @@ msgstr "" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "" @@ -60728,11 +60760,11 @@ msgstr "" msgid "Year Start Date" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60785,7 +60817,7 @@ msgstr "" msgid "You can also set default CWIP account in Company {}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60939,6 +60971,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60967,7 +61003,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60975,7 +61011,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "" @@ -61046,8 +61082,11 @@ msgstr "" msgid "Zero quantity" msgstr "" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61159,7 +61198,7 @@ msgstr "" msgid "fieldname" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61377,6 +61416,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "" @@ -61435,7 +61478,8 @@ msgstr "" msgid "{0} Digest" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61455,7 +61499,7 @@ msgstr "" msgid "{0} Request for {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "" @@ -61568,7 +61612,7 @@ msgid "{0} entered twice in Item Tax" msgstr "" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "" @@ -61736,7 +61780,7 @@ msgstr "" msgid "{0} payment entries can not be filtered by {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61749,7 +61793,7 @@ msgstr "{0} til {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" @@ -61951,7 +61995,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -62037,23 +62081,23 @@ msgstr "" msgid "{0}: {1} is a group account." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} er kansellert eller stengt." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "{ref_doctype} {ref_name} er {status}." diff --git a/erpnext/locale/nl.po b/erpnext/locale/nl.po index 782ac29ceff..f234f54e548 100644 --- a/erpnext/locale/nl.po +++ b/erpnext/locale/nl.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:20\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:20\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Dutch\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr " Uitbesteed werk" msgid " Summary" msgstr " Samenvatting" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"Door klant geleverd artikel\" kan niet ook Aankoop artikel zijn" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"Door klant geleverd artikel\" kan geen waarderingstarief hebben" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "“Is Vast Activa” kan niet uitgevinkt worden, omdat er een activa-record bestaat voor het artikel." @@ -302,7 +302,7 @@ msgstr "\"Vanaf datum\" is vereist" msgid "'From Date' must be after 'To Date'" msgstr "'Vanaf Datum' moet na 'Tot Datum' zijn" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "'Heeft serienummer' kan niet 'ja' zijn voor niet-voorraadartikel" @@ -338,7 +338,7 @@ msgstr "'Bijwerken voorraad' kan niet worden aangevinkt omdat items niet worden msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "'Voorraad bijwerken' kan niet worden aangevinkt voor verkoop van vaste activa" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "'{0}' grootboek wordt al gebruikt door {1}. Gebruik een ander grootboek." @@ -1099,7 +1099,7 @@ msgstr "Een chauffeur moet klaarstaan om in te dienen." msgid "A logical Warehouse against which stock entries are made." msgstr "Een logisch magazijn waartegen voorraadgegevens worden geregistreerd." -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "Er is een naamgevingsconflict opgetreden tijdens het aanmaken van serienummers. Wijzig de naamgevingsreeks voor het item {0}." @@ -1311,7 +1311,7 @@ msgstr "Toegangssleutel vereist voor serviceprovider: {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "Volgens CEFACT/ICG/2010/IC013 of CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "Volgens de stuklijst {0}ontbreekt het artikel '{1}' in de voorraadadministratie." @@ -1981,8 +1981,8 @@ msgstr "Boekhoudkundige boekingen" msgid "Accounting Entry for Asset" msgstr "Boekhoudingsinvoer voor activa" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "Boekhoudkundige journaalpost voor LCV in voorraadboeking {0}" @@ -1990,7 +1990,7 @@ msgstr "Boekhoudkundige journaalpost voor LCV in voorraadboeking {0}" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "Boekhoudkundige journaalpost voor landingskostenbon voor SCR {0}" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Boekhoudkundige invoer voor service" @@ -2003,16 +2003,16 @@ msgstr "Boekhoudkundige invoer voor service" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Boekingen voor Voorraad" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "Boekhoudkundige journaalpost voor {0}" @@ -2310,12 +2310,6 @@ msgstr "Actie ondernemen indien de kwaliteitsinspectie niet wordt ingediend" msgid "Action If Quality Inspection Is Rejected" msgstr "Actie ondernemen indien de kwaliteitscontrole wordt afgekeurd" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "Actie ondernemen indien het tarief niet gelijk blijft" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "Actie geïnitialiseerd" @@ -2374,6 +2368,12 @@ msgstr "Actie ondernemen indien het jaarlijkse budget voor de cumulatieve uitgav msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "Actie ondernemen indien niet gedurende de gehele interne transactie hetzelfde tarief wordt aangehouden." +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2641,7 +2641,7 @@ msgstr "Werkelijke tijd in uren (via urenregistratie)" msgid "Actual qty in stock" msgstr "Werkelijke hoeveelheid op voorraad" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "Werkelijke soort belasting kan niet worden opgenomen in post tarief in rij {0}" @@ -2655,7 +2655,7 @@ msgstr "Ad-hoc hoeveelheid" msgid "Add / Edit Prices" msgstr "Toevoegen / bewerken Prijzen" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "Kolommen toevoegen in transactievaluta" @@ -2809,7 +2809,7 @@ msgstr "Voeg serie-/batchnummer toe" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "Voeg serie-/batchnummer toe (afgekeurde hoeveelheid)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -3054,7 +3054,7 @@ msgstr "Extra kortingsbedrag" msgid "Additional Discount Amount (Company Currency)" msgstr "Extra kortingsbedrag (valuta van het bedrijf)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "Het extra kortingsbedrag ({discount_amount}) mag het totaalbedrag vóór die korting ({total_before_discount} ) niet overschrijden." @@ -3343,7 +3343,7 @@ msgstr "Aantal aanpassen" msgid "Adjustment Against" msgstr "Aanpassing ten opzichte van" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "Aanpassing op basis van het tarief op de inkoopfactuur" @@ -3456,7 +3456,7 @@ msgstr "Voorschotvouchertype" msgid "Advance amount" msgstr "Voorschotbedrag" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Advance bedrag kan niet groter zijn dan {0} {1}" @@ -3525,7 +3525,7 @@ msgstr "Tegen" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Tegen Rekening" @@ -3643,7 +3643,7 @@ msgstr "Tegen leveranciersfactuur {0}" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "Tegen voucher" @@ -3667,7 +3667,7 @@ msgstr "Tegen vouchernummer" #: 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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "Tegen Voucher Type" @@ -3948,7 +3948,7 @@ msgstr "Alle communicatie, inclusief en daarboven, wordt verplaatst naar de nieu msgid "All items are already requested" msgstr "Alle artikelen zijn reeds aangevraagd." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "Alle items zijn al gefactureerd / geretourneerd" @@ -3956,7 +3956,7 @@ msgstr "Alle items zijn al gefactureerd / geretourneerd" msgid "All items have already been received" msgstr "Alle artikelen zijn reeds ontvangen." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Alle items zijn al overgedragen voor deze werkbon." @@ -4005,7 +4005,7 @@ msgstr "Toewijzen" msgid "Allocate Advances Automatically (FIFO)" msgstr "Voorschotten automatisch toewijzen (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Toewijzen Betaling Bedrag" @@ -4015,7 +4015,7 @@ msgstr "Toewijzen Betaling Bedrag" msgid "Allocate Payment Based On Payment Terms" msgstr "Betaling toewijzen op basis van betalingsvoorwaarden" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "Betalingsverzoek toewijzen" @@ -4045,7 +4045,7 @@ msgstr "Toegewezen" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4166,15 +4166,15 @@ msgstr "Toestaan bij retournering" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "Sta interne transfers toe tegen marktconforme prijzen." -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "Meerdere artikelen kunnen nu eenmaal in een transactie worden toegevoegd." - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "Meerdere artikelen kunnen nu eenmaal aan een transactie worden toegevoegd." +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4203,12 +4203,6 @@ msgstr "Negatieve voorraad toestaan" msgid "Allow Negative Stock for Batch" msgstr "Negatieve voorraad toestaan voor de batch" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "Negatieve tarieven toestaan voor artikelen" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4421,8 +4415,11 @@ msgstr "Sta facturen in meerdere valuta toe op rekening van één partij. " msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4514,7 +4511,7 @@ msgstr "Toegestaan om mee te handelen" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "De toegestane primaire rollen zijn 'Klant' en 'Leverancier'. Selecteer slechts één van deze rollen." -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4711,7 +4708,7 @@ msgstr "Vraag het altijd" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4741,7 +4738,6 @@ msgstr "Vraag het altijd" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4911,10 +4907,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "Bedrag in rekeningvaluta" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "Bedrag in woorden" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5534,7 +5526,7 @@ msgstr "Aangezien het veld {0} is ingeschakeld, is het veld {1} verplicht." msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "Aangezien het veld {0} is ingeschakeld, moet de waarde van het veld {1} groter zijn dan 1." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "Omdat er al transacties zijn ingediend voor item {0}, kunt u de waarde van {1} niet wijzigen." @@ -5684,7 +5676,7 @@ msgstr "Asset Categorie Account" msgid "Asset Category Name" msgstr "Naam van de activacategorie" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "Asset Categorie is verplicht voor post der vaste activa" @@ -6080,7 +6072,7 @@ msgstr "Asset {0} is niet ingediend. Dien de asset in voordat u verdergaat." msgid "Asset {0} must be submitted" msgstr "Asset {0} moet worden ingediend" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "Asset {assets_link} gemaakt voor {item_code}" @@ -6118,11 +6110,11 @@ msgstr "Middelen" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "Assets zijn niet aangemaakt voor {item_code}. U moet de asset handmatig aanmaken." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "Activa {assets_link} gemaakt voor {item_code}" @@ -6195,7 +6187,7 @@ msgstr "Er moet ten minste één grondstofartikel aanwezig zijn in de voorraadpo msgid "At least one row is required for a financial report template" msgstr "Een sjabloon voor een financieel rapport moet minimaal één rij bevatten." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "Minimaal één magazijn is verplicht." @@ -6227,7 +6219,7 @@ msgstr "Bij rij {0}: Aantal is verplicht voor de batch {1}" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "Op rij {0}: Serienummer is verplicht voor item {1}" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "Op rij {0}: Serienummer- en batchbundel {1} is al aangemaakt. Verwijder de waarden uit de velden serienummer of batchnummer." @@ -6291,7 +6283,11 @@ msgstr "Attribuutnaam" msgid "Attribute Value" msgstr "Attribuutwaarde" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "Attributentabel is verplicht" @@ -6299,11 +6295,19 @@ msgstr "Attributentabel is verplicht" msgid "Attribute value: {0} must appear only once" msgstr "Attribuutwaarde: {0} mag slechts één keer voorkomen" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Attributen" @@ -6363,24 +6367,12 @@ msgstr "Geautoriseerde waarde" msgid "Auto Create Exchange Rate Revaluation" msgstr "Automatische herwaardering van de wisselkoers" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "Automatisch aankoopbewijs aanmaken" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "Automatisch serienummers en batchbundels aanmaken voor uitgaande verzending" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "Automatisch een onderaannemingsopdracht aanmaken" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6499,6 +6491,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "De vacature is automatisch gesloten. Er is na het bovengenoemde aantal dagen gereageerd." +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6716,7 +6720,7 @@ msgstr "Beschikbaar vanaf datum" msgid "Available for use date is required" msgstr "Beschikbaar voor gebruik datum is vereist" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "Beschikbare hoeveelheid is {0}, u heeft {1} nodig" @@ -6815,7 +6819,7 @@ msgstr "BFS" msgid "BIN Qty" msgstr "BIN Aantal" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7088,7 +7092,7 @@ msgstr "BOM-website-item" msgid "BOM Website Operation" msgstr "BOM-websitewerking" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "De stuklijst (BOM) en de hoeveelheid eindproduct zijn verplicht voor demontage." @@ -7179,8 +7183,8 @@ msgstr "Grondstoffen terugspoelen vanuit het magazijn voor halffabricaten" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "Terugspoelen van grondstoffen van onderaanneming op basis van" +msgid "Backflush raw materials of subcontract based on" +msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7200,7 +7204,7 @@ msgstr "Balans" msgid "Balance (Dr - Cr)" msgstr "Evenwicht (Dr - Cr)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Saldo ({0})" @@ -7731,11 +7735,11 @@ msgstr "Bankieren" msgid "Barcode Type" msgstr "Barcodetype" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "Barcode {0} is al gebruikt in het Item {1}" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "Barcode {0} is geen geldige {1} code" @@ -8102,12 +8106,12 @@ msgstr "Batch {0} en magazijn" msgid "Batch {0} is not available in warehouse {1}" msgstr "Batch {0} is niet beschikbaar in magazijn {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "Batch {0} van item {1} is verlopen." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "Batch {0} van item {1} is uitgeschakeld." @@ -8180,8 +8184,8 @@ msgstr "Factuur nr" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "Factuur voor afgekeurde hoeveelheid in de inkoopfactuur" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8521,8 +8525,11 @@ msgstr "Deken bestellingsitem" msgid "Blanket Order Rate" msgstr "Raamovereenkomsttarief" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -9037,7 +9044,7 @@ msgstr "Kopen en verkopen" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "Aankopen moeten worden gecontroleerd, indien \"VAN TOEPASSING VOOR\" is geselecteerd als {0}" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "Standaard wordt de leveranciersnaam ingesteld op de ingevoerde leveranciersnaam. Als u wilt dat leveranciers worden benoemd volgens een naamgevingsreeks , selecteer dan de optie 'Naamgevingsreeks'." @@ -9402,7 +9409,7 @@ msgstr "Kan niet filteren op basis van vouchernummer, indien gegroepeerd per vou msgid "Can only make payment against unbilled {0}" msgstr "Kan alleen betaling uitvoeren voor ongefactureerde {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9458,9 +9465,9 @@ msgstr "Kan de instellingen van het voorraadaccount niet wijzigen" msgid "Cannot Create Return" msgstr "Kan geen retourzending aanmaken" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "Samenvoegen is niet mogelijk" @@ -9488,7 +9495,7 @@ msgstr "Kan {0} {1}niet wijzigen, maak in plaats daarvan een nieuwe aan." msgid "Cannot apply TDS against multiple parties in one entry" msgstr "Het is niet mogelijk om TDS (Tax Deducted at Source) op meerdere partijen in één invoer toe te passen." -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "Kan geen vast activumartikel zijn omdat het grootboek Voorraad wordt gecreëerd." @@ -9524,7 +9531,7 @@ msgstr "Deze productievoorraadboeking kan niet worden geannuleerd, omdat de gepr msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "Dit document kan niet worden geannuleerd omdat het is gekoppeld aan de ingediende activa-waardeaanpassing {0}. Annuleer de activa-waardeaanpassing om verder te gaan." -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "Dit document kan niet worden geannuleerd omdat het is gekoppeld aan het ingediende bestand {asset_link}. Annuleer het bestand om verder te gaan." @@ -9532,7 +9539,7 @@ msgstr "Dit document kan niet worden geannuleerd omdat het is gekoppeld aan het msgid "Cannot cancel transaction for Completed Work Order." msgstr "Kan transactie voor voltooide werkorder niet annuleren." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "Kan attributen na beurstransactie niet wijzigen. Maak een nieuw artikel en breng aandelen over naar het nieuwe item" @@ -9544,7 +9551,7 @@ msgstr "Het referentiedocumenttype kan niet worden gewijzigd." msgid "Cannot change Service Stop Date for item in row {0}" msgstr "Kan de service-einddatum voor item in rij {0} niet wijzigen" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "Variant-eigenschappen kunnen niet worden gewijzigd na beurstransactie. U moet een nieuw item maken om dit te doen." @@ -9572,11 +9579,11 @@ msgstr "Kan niet worden omgezet naar Groep omdat het accounttype is geselecteerd msgid "Cannot covert to Group because Account Type is selected." msgstr "Kan niet omzetten naar groep omdat accounttype is geselecteerd." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "Het is niet mogelijk om voorraadreserveringen aan te maken voor inkoopbonnen met een toekomstige datum." -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "Er kan geen picklijst worden aangemaakt voor verkooporder {0} omdat er voorraad is gereserveerd. Deblokkeer de voorraad om een picklijst te kunnen aanmaken." @@ -9602,7 +9609,7 @@ msgstr "Kan niet als verloren instellen, omdat offerte is gemaakt." msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "Kan niet aftrekken als categorie is voor ' Valuation ' of ' Valuation en Total '" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "Kan de rij met wisselkoerswinst/verlies niet verwijderen." @@ -9639,7 +9646,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "Het is niet mogelijk om meer exemplaren te demonteren dan er geproduceerd zijn." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9647,8 +9654,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "Het is niet mogelijk om de voorraadadministratie per artikel in te schakelen, omdat er al voorraadboekingen voor het bedrijf {0} bestaan met een voorraadadministratie per magazijn. Annuleer eerst de voorraadtransacties en probeer het opnieuw." -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "Kan levering met serienummer niet garanderen, aangezien artikel {0} wordt toegevoegd met en zonder Levering met serienummer garanderen." @@ -9692,7 +9699,7 @@ msgstr "Kan niet van klant ontvangen tegen een negatief openstaand saldo." msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "De hoeveelheid mag niet lager zijn dan de bestelde of gekochte hoeveelheid." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9710,8 +9717,8 @@ msgstr "Kan het linktoken niet ophalen. Raadpleeg het foutenlogboek voor meer in msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9727,7 +9734,7 @@ msgstr "Kan niet als verloren instellen, omdat er al een verkooporder is gemaakt msgid "Cannot set authorization on basis of Discount for {0}" msgstr "Kan de autorisatie niet instellen op basis van korting voor {0}" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "Kan niet meerdere item-standaardwaarden voor een bedrijf instellen." @@ -10638,7 +10645,7 @@ msgstr "Sluiten (Cr)" msgid "Closing (Dr)" msgstr "Sluiten (Db)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "Sluiten (Opening + totaal)" @@ -11099,7 +11106,7 @@ msgstr "Bedrijven" #: 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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11381,7 +11388,7 @@ msgstr "Bedrijf" msgid "Company Abbreviation" msgstr "Bedrijf afkorting" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11394,7 +11401,7 @@ msgstr "Bedrijfsbegeleiding mag niet meer dan 5 tekens bevatten" msgid "Company Account" msgstr "Bedrijfsrekening" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "Een bedrijfsaccount is verplicht." @@ -11570,7 +11577,7 @@ msgstr "" msgid "Company is mandatory" msgstr "Het bedrijf is verplicht." -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "Een bedrijf is verplicht voor een bedrijfsaccount." @@ -11841,7 +11848,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11854,7 +11861,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "Productassemblage configureren" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11872,13 +11881,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "Configureer de actie om de transactie te stoppen of alleen een waarschuwing te geven als hetzelfde tarief niet wordt aangehouden." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "Configureer de standaardprijslijst wanneer u een nieuwe aankooptransactie aanmaakt. Artikelprijzen worden opgehaald uit deze prijslijst." @@ -12056,7 +12065,7 @@ msgstr "" msgid "Consumed" msgstr "Verbruikt" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "Verbruikte hoeveelheid" @@ -12100,7 +12109,7 @@ msgstr "Kosten van verbruikte artikelen" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12273,10 +12282,6 @@ msgstr "De contactpersoon behoort niet tot de {0}" msgid "Contact:" msgstr "Contact:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Contact: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12454,7 +12459,7 @@ msgstr "Conversiefactor" msgid "Conversion Rate" msgstr "Conversiepercentage" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "Conversiefactor voor Standaard meeteenheid moet 1 zijn in rij {0}" @@ -12726,7 +12731,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12821,7 +12826,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "Kostenplaats is vereist in regel {0} in Belastingen tabel voor type {1}" @@ -13159,7 +13164,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "Een gegroepeerd object maken" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "Creëer Inter Company Journaalboeking" @@ -13532,7 +13537,7 @@ msgstr "Maak {0} {1}?" msgid "Created By Migration" msgstr "Aangemaakt door migratie" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "Scorekaarten {0} aangemaakt voor {1} tussen:" @@ -13675,15 +13680,15 @@ msgstr "Aanmaken van {0} gedeeltelijk succesvol.\n" msgid "Credit" msgstr "Krediet" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "Krediet (transactie)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "Krediet ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "Kredietrekening" @@ -13878,7 +13883,7 @@ msgstr "Crediteurenomloopsnelheid" msgid "Creditors" msgstr "crediteuren" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14176,7 +14181,7 @@ msgstr "Huidige serie-/batchbundel" msgid "Current Serial No" msgstr "Huidig serienummer" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14377,7 +14382,7 @@ msgstr "Aangepaste scheidingstekens" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15150,7 +15155,7 @@ msgstr "Te verwerken datums" msgid "Day Of Week" msgstr "Dag van de week" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15266,11 +15271,11 @@ msgstr "Dealer" msgid "Debit" msgstr "Debet" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "Debet (Transactie)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "Debet ({0})" @@ -15280,7 +15285,7 @@ msgstr "Debet ({0})" msgid "Debit / Credit Note Posting Date" msgstr "Boekingsdatum debet-/creditnota" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "Debetrekening" @@ -15391,7 +15396,7 @@ msgstr "Debet-credit mismatch" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15533,7 +15538,7 @@ msgstr "Standaard verouderingsbereik" msgid "Default BOM" msgstr "Standaard stuklijst" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "Default BOM ({0}) moet actief voor dit artikel of zijn template" @@ -15890,15 +15895,15 @@ msgstr "Standaardgebied" msgid "Default Unit of Measure" msgstr "Standaard meeteenheid" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "De standaard meeteenheid voor artikel {0} kan niet direct worden gewijzigd, omdat u al transacties met een andere meeteenheid hebt uitgevoerd. U moet de gekoppelde documenten annuleren of een nieuw artikel aanmaken." -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "Standaard maateenheid voor post {0} kan niet direct worden gewijzigd, omdat je al enkele transactie (s) met een andere UOM hebben gemaakt. U moet een nieuwe post naar een andere Standaard UOM gebruik maken." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "Standaard maateenheid voor Variant '{0}' moet hetzelfde zijn als in zijn Template '{1}'" @@ -16199,7 +16204,7 @@ msgstr "" msgid "Delivered" msgstr "Geleverd" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Afgeleverd Bedrag" @@ -16249,8 +16254,8 @@ msgstr "Geleverde Artikelen nog te factureren" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16261,11 +16266,11 @@ msgstr "Geleverd aantal" msgid "Delivered Qty (in Stock UOM)" msgstr "Geleverde hoeveelheid (in voorraadeenheid)" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16354,7 +16359,7 @@ msgstr "Bezorgmanager" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16879,7 +16884,7 @@ msgstr "Verschilrekening in artikelentabel" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "De verschilrekening moet een activa-/passivarekening zijn (tijdelijke opening), aangezien deze voorraadboeking een openingsboeking is." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "Verschil moet Account een type Asset / Liability rekening zijn, aangezien dit Stock Verzoening is een opening Entry" @@ -17043,11 +17048,9 @@ msgstr "Schakel cumulatieve drempelwaarde uit" msgid "Disable In Words" msgstr "Uitschakelen in woorden" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "Laatste aankoopkoers uitschakelen" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17088,6 +17091,12 @@ msgstr "Schakel de serienummer- en batchselector uit." msgid "Disable Transaction Threshold" msgstr "Transactiedrempel uitschakelen" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17144,7 +17153,7 @@ msgstr "Demonteren" msgid "Disassemble Order" msgstr "Demontageopdracht" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "De hoeveelheid demonteren kan niet kleiner of gelijk zijn aan 0." @@ -17669,6 +17678,12 @@ msgstr "Gebruik geen batchgewijze waardering." msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17759,9 +17774,12 @@ msgstr "Google Documenten zoeken" msgid "Document Count" msgstr "Aantal documenten" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17779,6 +17797,10 @@ msgstr "Documenttype " msgid "Document Type already used as a dimension" msgstr "Documenttype wordt al als dimensie gebruikt" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "Documentatie" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18083,7 +18105,7 @@ msgstr "Dubbel project met taken" msgid "Duplicate Sales Invoices found" msgstr "Dubbele verkoopfacturen gevonden" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "Foutmelding dubbel serienummer" @@ -18203,8 +18225,8 @@ msgstr "ERPNext gebruikers-ID" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18427,7 +18449,7 @@ msgstr "E-mailbevestiging" msgid "Email Sent to Supplier {0}" msgstr "E-mail verzonden naar leverancier {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18617,7 +18639,7 @@ msgstr "Werknemersgebruikers-ID" msgid "Employee cannot report to himself." msgstr "Werknemer kan niet rapporteren aan zichzelf." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18625,7 +18647,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "Werknemer is verplicht bij het uitgeven van activum {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18638,7 +18660,7 @@ msgstr "Werknemer {0} behoort niet tot het bedrijf {1}" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "Medewerker {0} werkt momenteel op een ander werkstation. Wijs een andere medewerker toe." -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18681,7 +18703,7 @@ msgstr "Afspraken plannen inschakelen" msgid "Enable Auto Email" msgstr "Automatische e-mail inschakelen" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "Automatisch opnieuw bestellen inschakelen" @@ -19282,7 +19304,7 @@ msgstr "Fout: Voor dit activum zijn al {0} afschrijvingsperioden geboekt.\n" "\t\t\t\t\tDe startdatum van de afschrijving moet minimaal {1} perioden na de datum van ingebruikname liggen.\n" "\t\t\t\t\tCorrigeer de datums dienovereenkomstig." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "Fout: {0} is verplicht veld" @@ -19328,7 +19350,7 @@ msgstr "Ex Works" msgid "Example URL" msgstr "Voorbeeld-URL" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "Voorbeeld van een gekoppeld document: {0}" @@ -19358,7 +19380,7 @@ msgstr "Voorbeeld: Serienummer {0} gereserveerd in {1}." msgid "Exception Budget Approver Role" msgstr "Rol van budgetgoedkeurder bij uitzonderingen" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19717,7 +19739,7 @@ msgstr "Verwachte waarde na gebruiksduur" msgid "Expense" msgstr "Kosten" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "Kosten- / Verschillenrekening ({0}) moet een 'Winst of Verlies' rekening zijn." @@ -19765,7 +19787,7 @@ msgstr "Kosten- / Verschillenrekening ({0}) moet een 'Winst of Verlies' rekening msgid "Expense Account" msgstr "Kostenrekening" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "Onkostenrekening ontbreekt" @@ -20228,7 +20250,7 @@ msgstr "Filter totaal aantal nul" msgid "Filter by Reference Date" msgstr "Filteren op referentiedatum" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20558,7 +20580,7 @@ msgstr "Magazijn voor afgewerkte goederen" msgid "Finished Goods based Operating Cost" msgstr "Bedrijfskosten gebaseerd op eindproducten" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "Voltooide product {0} komt niet overeen met werkorder {1}" @@ -20653,7 +20675,7 @@ msgstr "Fiscaal regime is verplicht, stel vriendelijk het fiscale regime in het msgid "Fiscal Year" msgstr "Boekjaar" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20717,7 +20739,7 @@ msgstr "Vaste activa-rekening" msgid "Fixed Asset Defaults" msgstr "Wanbetalingen op vaste activa" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "Fixed Asset punt moet een niet-voorraad artikel zijn." @@ -20867,7 +20889,7 @@ msgstr "Voor het bedrijf" msgid "For Item" msgstr "Voor artikel" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "Voor artikel {0} kunnen niet meer dan {1} stuks worden ontvangen ten opzichte van de {2} {3}" @@ -20898,7 +20920,7 @@ msgstr "Voor de prijslijst" msgid "For Production" msgstr "Voor productie" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "Voor Hoeveelheid (Geproduceerd Aantal) is verplicht" @@ -20982,6 +21004,12 @@ msgstr "Voor item {0}zijn alleen de assets {1} aangemaakt of gekop msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "Voor item {0}moet het tarief een positief getal zijn. Om negatieve tarieven toe te staan, moet u {1} inschakelen in {2}." +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "Voor bewerking {0} op rij {1}, voeg grondstoffen toe of stel een stuklijst in." @@ -21003,7 +21031,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "Voor geprojecteerde en voorspelde hoeveelheden houdt het systeem rekening met alle onderliggende magazijnen van het geselecteerde hoofdmagazijn." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "De hoeveelheid {0} mag niet groter zijn dan de toegestane hoeveelheid {1}" @@ -21012,7 +21040,7 @@ msgstr "De hoeveelheid {0} mag niet groter zijn dan de toegestane hoeveelheid {1 msgid "For reference" msgstr "Ter referentie" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "Voor rij {0} in {1}. Om {2} onder in punt tarief, rijen {3} moet ook opgenomen worden" @@ -21036,7 +21064,7 @@ msgstr "Voor de voorwaarde 'Regel toepassen op andere' is het veld {0} v msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "Voor het gemak van de klant kunnen deze codes worden gebruikt in gedrukte documenten zoals facturen en leveringsbonnen." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "Voor het artikel {0}moet de verbruikte hoeveelheid {1} zijn volgens de stuklijst {2}." @@ -21045,7 +21073,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 "Om de nieuwe {0} te activeren, wilt u de huidige {1} wissen?" -#: erpnext/controllers/stock_controller.py:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "Voor de {0}is geen voorraad beschikbaar voor retourzending in het magazijn {1}." @@ -21658,7 +21686,7 @@ msgstr "G - D" msgid "GENERAL LEDGER" msgstr "ALGEMEEN GROOTBOEK" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21670,7 +21698,7 @@ msgstr "GL-saldo" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "GL-invoer" @@ -22185,7 +22213,7 @@ msgstr "Goederen onderweg" msgid "Goods Transferred" msgstr "Goederen overgedragen" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "Goederen zijn al ontvangen tegen de uitgaande invoer {0}" @@ -22368,7 +22396,7 @@ msgstr "" msgid "Grant Commission" msgstr "Subsidiecommissie" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "Groter dan bedrag" @@ -23009,11 +23037,11 @@ msgstr "Hoe vaak?" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" -msgstr "Hoe vaak moet het project worden bijgewerkt met de totale aankoopkosten?" +msgid "How often should project be updated of Total Purchase Cost ?" +msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling #. Settings' @@ -23168,7 +23196,7 @@ msgstr "Als een bewerking is onderverdeeld in deelbewerkingen, kunnen deze hier msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "Indien dit veld leeg is, wordt bij transacties de standaard magazijnrekening van het moederbedrijf of de standaard bedrijfsinstelling gebruikt." -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23353,7 +23381,7 @@ msgstr "Indien ingeschakeld, staat het systeem het selecteren van meeteenheden i msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "Indien ingeschakeld, kunnen gebruikers de grondstoffen en hun hoeveelheden in de werkorder bewerken. Het systeem zal de hoeveelheden niet terugzetten naar de oorspronkelijke staat volgens de stuklijst, als de gebruiker deze heeft gewijzigd." -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23525,11 +23553,11 @@ msgstr "Als dit niet wenselijk is, annuleer dan de betreffende betalingsinvoer." msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "Als dit artikel varianten heeft, kan het niet worden geselecteerd in verkooporders, enz." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "Als deze optie is geconfigureerd 'Ja', zal ERPNext u verhinderen een inkoopfactuur of ontvangstbewijs te creëren zonder eerst een inkooporder te creëren. Deze configuratie kan voor een bepaalde leverancier worden overschreven door het aankruisvak 'Aanmaken inkoopfactuur zonder inkooporder toestaan' in het leveranciersmodel in te schakelen." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "Als deze optie 'Ja' is geconfigureerd, zal ERPNext u verhinderen een inkoopfactuur aan te maken zonder eerst een inkoopbewijs te creëren. Deze configuratie kan voor een bepaalde leverancier worden overschreven door het aankruisvak 'Aanmaken inkoopfactuur zonder inkoopontvangst toestaan' in de leveranciersstam in te schakelen." @@ -23645,7 +23673,7 @@ msgstr "Negeer lege voorraad" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "Negeer de journaalposten voor wisselkoersherwaardering en winst/verlies." @@ -23697,7 +23725,7 @@ msgstr "De optie 'Prijsregel negeren' is ingeschakeld. Kortingscode kan niet wor #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "Negeer door het systeem gegenereerde credit-/debetnota's." @@ -23740,7 +23768,7 @@ msgstr "Negeer overlapping van werkstationtijden" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "Negeert het verouderde veld 'Is Opening' in de grootboekboeking, waarmee het mogelijk is om het beginsaldo toe te voegen nadat het systeem in gebruik is genomen tijdens het genereren van rapporten." -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "De afbeelding in de beschrijving is verwijderd. Om dit gedrag uit te schakelen, vinkt u \"{0}\" uit in {1}." @@ -23754,6 +23782,7 @@ msgid "Implementation Partner" msgstr "Implementatiepartner" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24107,7 +24136,7 @@ msgstr "Standaard Facebook-assets opnemen" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24361,7 +24390,7 @@ msgstr "Onjuist saldo na transactie" msgid "Incorrect Batch Consumed" msgstr "Onjuiste batch verbruikt" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "Onjuiste check-in (groep) magazijn voor herbestelling" @@ -24369,7 +24398,7 @@ msgstr "Onjuiste check-in (groep) magazijn voor herbestelling" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "Onjuiste componenthoeveelheid" @@ -24579,14 +24608,14 @@ msgstr "geïnitieerd" msgid "Inspected By" msgstr "Geïnspecteerd door" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "Inspectie afgewezen" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "Inspectie Verplicht" @@ -24603,7 +24632,7 @@ msgstr "Inspectie vereist vóór levering" msgid "Inspection Required before Purchase" msgstr "Inspectie vereist vóór aankoop" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "Inspectieaanvraag" @@ -24685,8 +24714,8 @@ msgstr "Onvoldoende machtigingen" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "onvoldoende Stock" @@ -24906,7 +24935,7 @@ msgstr "Interne overplaatsingen" msgid "Internal Work History" msgstr "Interne werkgeschiedenis" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "Interne overboekingen kunnen alleen worden uitgevoerd in de standaardvaluta van het bedrijf." @@ -24999,7 +25028,7 @@ msgstr "Ongeldige leverdatum" msgid "Invalid Discount" msgstr "Ongeldige korting" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "Ongeldig kortingsbedrag" @@ -25029,7 +25058,7 @@ msgstr "Ongeldige groepering" msgid "Invalid Item" msgstr "Ongeldig item" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "Ongeldige itemstandaardwaarden" @@ -25115,12 +25144,12 @@ msgstr "Ongeldig rooster" msgid "Invalid Selling Price" msgstr "Ongeldige verkoopprijs" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "Ongeldige serie- en batchbundel" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "Ongeldige bron- en doelmagazijn" @@ -25157,7 +25186,7 @@ msgstr "Ongeldige filterformule. Controleer de syntaxis." msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "Ongeldige verloren reden {0}, maak een nieuwe verloren reden aan" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Ongeldige naamreeks (. Ontbreekt) voor {0}" @@ -25286,7 +25315,6 @@ msgstr "Annulering van de factuur" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "Factuurdatum" @@ -25307,10 +25335,6 @@ msgstr "Fout bij het selecteren van het factuurdocumenttype" msgid "Invoice Grand Total" msgstr "Totaal factuurbedrag" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "Factuur-ID" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25832,13 +25856,13 @@ msgstr "Is het een spookitem?" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "Is een inkooporder vereist voor het aanmaken van een inkoopfactuur en -ontvangstbewijs?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "Is een aankoopbon vereist voor het aanmaken van een aankoopfactuur?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -26110,7 +26134,7 @@ msgstr "Tickets" msgid "Issuing Date" msgstr "Uitgiftedatum" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "Het kan enkele uren duren voordat de juiste voorraadwaarden zichtbaar zijn na het samenvoegen van artikelen." @@ -26180,7 +26204,7 @@ msgstr "Cursieve tekst voor subtotalen of aantekeningen" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26227,6 +26251,7 @@ msgstr "Cursieve tekst voor subtotalen of aantekeningen" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26242,7 +26267,6 @@ msgstr "Cursieve tekst voor subtotalen of aantekeningen" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -27006,6 +27030,7 @@ msgstr "Fabrikant van het artikel" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -27016,7 +27041,6 @@ msgstr "Fabrikant van het artikel" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27276,11 +27300,11 @@ msgstr "Instellingen voor artikelvarianten" msgid "Item Variant {0} already exists with same attributes" msgstr "Artikel Variant {0} bestaat al met dezelfde kenmerken" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "Artikelvarianten bijgewerkt" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "Het opnieuw boeken van artikelen via het magazijn is nu mogelijk." @@ -27319,6 +27343,15 @@ msgstr "Artikel Website Specificatie" msgid "Item Weight Details" msgstr "Details over het gewicht van het artikel" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27348,7 +27381,7 @@ msgstr "Belastingdetails per artikel" msgid "Item Wise Tax Details" msgstr "Belastingdetails per artikel" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "De belastinggegevens per artikel komen niet overeen met de belastingen en heffingen in de volgende rijen:" @@ -27368,11 +27401,11 @@ msgstr "Artikel en magazijn" msgid "Item and Warranty Details" msgstr "Artikel- en garantiegegevens" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "Artikel voor rij {0} komt niet overeen met materiaal verzoek" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "Item heeft varianten." @@ -27402,7 +27435,7 @@ msgstr "Artikelbewerking" msgid "Item qty can not be updated as raw materials are already processed." msgstr "De artikelhoeveelheid kan niet worden bijgewerkt, omdat de grondstoffen al zijn verwerkt." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "De artikelprijs is bijgewerkt naar nul omdat 'Nulwaardering toestaan' is aangevinkt voor artikel {0}" @@ -27421,10 +27454,14 @@ msgstr "De waarderingsratio van het artikel wordt opnieuw berekend rekening houd msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "De waardebepaling van het artikel wordt opnieuw verwerkt. Het rapport kan een onjuiste waardebepaling van het artikel weergeven." -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "Artikel variant {0} bestaat met dezelfde kenmerken" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "Item {0} is meerdere keren toegevoegd onder hetzelfde bovenliggende item {1} op rijen {2} en {3}" @@ -27438,7 +27475,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "Artikel {0} kan niet vaker dan {1} besteld worden in het kader van raamovereenkomst {2}." #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "Artikel {0} bestaat niet" @@ -27446,7 +27483,7 @@ msgstr "Artikel {0} bestaat niet" msgid "Item {0} does not exist in the system or has expired" msgstr "Artikel {0} bestaat niet in het systeem of is verlopen" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "Item {0} bestaat niet." @@ -27462,15 +27499,15 @@ msgstr "Artikel {0} is al geretourneerd" msgid "Item {0} has been disabled" msgstr "Item {0} is uitgeschakeld" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "Artikel {0} heeft geen serienummer. Alleen artikelen met een serienummer kunnen worden bezorgd op basis van het serienummer." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "Artikel {0} heeft het einde van zijn levensduur bereikt op {1}" @@ -27482,19 +27519,23 @@ msgstr "Artikel {0} genegeerd omdat het niet een voorraadartikel is" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "Artikel {0} is reeds gereserveerd/geleverd voor verkooporder {1}." -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "Artikel {0} is geannuleerd" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "Punt {0} is uitgeschakeld" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "Artikel {0} is geen seriegebonden artikel" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "Artikel {0} is geen voorraadartikel" @@ -27502,7 +27543,11 @@ msgstr "Artikel {0} is geen voorraadartikel" msgid "Item {0} is not a subcontracted item" msgstr "Artikel {0} is geen uitbested artikel." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "ARtikel {0} is niet actief of heeft einde levensduur bereikt" @@ -27518,7 +27563,7 @@ msgstr "Artikel {0} moet een niet-voorraadartikel zijn." msgid "Item {0} must be a non-stock item" msgstr "Item {0} moet een niet-voorraad artikel zijn" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "Artikel {0} niet gevonden in de tabel 'Geleverde grondstoffen' in {1} {2}" @@ -27534,7 +27579,7 @@ msgstr "Item {0}: Bestelde aantal {1} kan niet kleiner dan de minimale afname {2 msgid "Item {0}: {1} qty produced. " msgstr "Artikel {0}: {1} aantal geproduceerd." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "Item {} bestaat niet." @@ -27644,7 +27689,7 @@ msgstr "Artikelen voor grondstofverzoek" msgid "Items not found." msgstr "Artikelen niet gevonden." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "De waardering van de artikelen is bijgewerkt naar nul, omdat 'Nulwaardering toestaan' is aangevinkt voor de volgende artikelen: {0}" @@ -28277,7 +28322,7 @@ msgstr "Laatst gescande magazijn" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "Laatste voorraadtransactie voor artikel {0} onder magazijn {1} was op {2}." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28556,7 +28601,7 @@ msgstr "Legende" msgid "Length (cm)" msgstr "Lengte (cm)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "Minder dan bedrag" @@ -28697,7 +28742,7 @@ msgstr "Gekoppelde facturen" msgid "Linked Location" msgstr "Gekoppelde locatie" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "Gekoppeld aan ingediende documenten" @@ -29092,11 +29137,6 @@ msgstr "Onderhoud activa" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "Houd gedurende de gehele interne transactie hetzelfde tarief aan." -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "Houd gedurende de gehele aankoopcyclus hetzelfde tarief aan." - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29108,6 +29148,11 @@ msgstr "Voorraad op peil houden" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29304,7 +29349,7 @@ msgid "Major/Optional Subjects" msgstr "Hoofdvakken/Keuzevakken" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29473,8 +29518,8 @@ msgstr "Verplichte sectie" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29533,8 +29578,8 @@ msgstr "Handmatige invoer kan niet worden gemaakt! Schakel automatische invoer v #: 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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29683,7 +29728,7 @@ msgstr "Productiedatum" msgid "Manufacturing Manager" msgstr "Productie Manager" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "Productie Aantal is verplicht" @@ -29959,7 +30004,7 @@ msgstr "Materiale consumptie" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "Materiaalverbruik voor de productie" @@ -30030,6 +30075,7 @@ msgstr "Ontvangst van materiaal" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30136,11 +30182,11 @@ msgstr "Artikel plan voor artikelaanvraag" msgid "Material Request Type" msgstr "Materiaalaanvraagtype" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "Materiaalaanvraag niet gecreëerd, als hoeveelheid voor grondstoffen al beschikbaar." @@ -30255,7 +30301,7 @@ msgstr "Materiaal overgedragen voor fabricage" msgid "Material Transferred for Manufacturing" msgstr "Materiaal overgedragen voor productie" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30384,11 +30430,11 @@ msgstr "Maximale betalingssom" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "Maximum aantal voorbeelden - {0} kan worden bewaard voor batch {1} en item {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "Maximale voorbeelden - {0} zijn al bewaard voor Batch {1} en Item {2} in Batch {3}." @@ -30832,11 +30878,11 @@ msgstr "Gemengd" msgid "Miscellaneous Expenses" msgstr "Diverse Kosten" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "Mismatch" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "Vermist" @@ -30874,7 +30920,7 @@ msgstr "Ontbrekende filters" msgid "Missing Finance Book" msgstr "Financieel boek vermist" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "Ontbrekend, voltooid, goed" @@ -30882,11 +30928,11 @@ msgstr "Ontbrekend, voltooid, goed" msgid "Missing Formula" msgstr "Ontbrekende formule" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "Ontbrekend item" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30930,10 +30976,6 @@ msgstr "Ontbrekende waarde" msgid "Mixed Conditions" msgstr "Gemengde omstandigheden" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "Mobiel: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31202,7 +31244,7 @@ msgstr "Meerdere bedrijfsvelden beschikbaar: {0}. Selecteer handmatig." msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "Meerdere fiscale jaar bestaan voor de datum {0}. Stel onderneming in het fiscale jaar" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "Meerdere artikelen kunnen niet als voltooid artikel worden gemarkeerd." @@ -31281,27 +31323,20 @@ msgstr "Genoemde plaats" msgid "Naming Series Prefix" msgstr "Naamgevingsreeksvoorvoegsel" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "Naamgeving van reeksen en standaardprijzen" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "Het benoemen van series is verplicht." +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31349,16 +31384,16 @@ msgstr "Analyse nodig" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "Negatieve hoeveelheid is niet toegestaan" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "Negatieve voorraadfout" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "Negatieve Waarderingstarief is niet toegestaan" @@ -31972,7 +32007,7 @@ msgstr "Er is geen POS-profiel gevonden. Maak eerst een nieuw POS-profiel aan." #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "Geen toestemming" @@ -31985,7 +32020,7 @@ msgstr "Er zijn geen inkooporders aangemaakt." msgid "No Records for these settings." msgstr "Er zijn geen gegevens beschikbaar voor deze instellingen." -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "Geen selectie" @@ -32030,7 +32065,7 @@ msgstr "Er zijn geen onverwerkte betalingen gevonden voor deze partij." msgid "No Work Orders were created" msgstr "Er zijn geen werkorders aangemaakt." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "Geen boekingen voor de volgende magazijnen" @@ -32043,7 +32078,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "Geen actieve stuklijst gevonden voor artikel {0}. Levering met serienummer kan niet worden gegarandeerd" @@ -32055,7 +32090,7 @@ msgstr "Geen extra velden beschikbaar" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "Geen beschikbare hoeveelheid om te reserveren voor artikel {0} in magazijn {1}" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -32063,7 +32098,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32157,7 +32192,7 @@ msgstr "Geen kinderen meer aan de linkerkant" msgid "No more children on Right" msgstr "Geen kinderen meer aan de rechterkant" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32332,7 +32367,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "Er zijn geen voorraadboekingen aangemaakt. Stel de hoeveelheid of waarderingswaarde voor de artikelen correct in en probeer het opnieuw." @@ -32424,7 +32459,7 @@ msgstr "Niet-nulwaarden" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "Geen van de items hebben een verandering in hoeveelheid of waarde." @@ -32528,7 +32563,7 @@ msgstr "Niet geautoriseerd omdat {0} de limieten overschrijdt" msgid "Not authorized to edit frozen Account {0}" msgstr "Niet bevoegd om bevroren rekening te bewerken {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32574,7 +32609,7 @@ msgstr "Opmerking: De betaling wordt niet aangemaakt, aangezien de 'Kas- of Bank msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "Opmerking: Deze kostenplaats is een groep. Kan geen boekingen aanmaken voor groepen." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "Opmerking: om de artikelen samen te voegen, moet u een aparte voorraadafstemming aanmaken voor het oude artikel {0}" @@ -33051,7 +33086,7 @@ msgstr "Bij het toepassen van een uitgesloten vergoeding mag slechts één van d msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "Er kan slechts één bewerking de optie 'Is eindproduct' aangevinkt hebben wanneer 'Halffabricage bijhouden' is ingeschakeld." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "Er kan slechts één {0} -item worden aangemaakt voor de werkorder {1}" @@ -33203,7 +33238,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "Opening" @@ -33362,16 +33397,16 @@ msgstr "De eerste verkoopfacturen zijn aangemaakt." #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Beginvoorraad" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33728,7 +33763,7 @@ msgstr "Optioneel. Deze instelling wordt gebruikt om te filteren op diverse tran msgid "Optional. Used with Financial Report Template" msgstr "Optioneel. Te gebruiken met het sjabloon voor financiële rapporten." -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33862,7 +33897,7 @@ msgstr "Bestelde hoeveelheid" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "Bestellingen" @@ -34070,7 +34105,7 @@ msgstr "Uitstaande bedragen (valuta van het bedrijf)" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34128,7 +34163,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "Toeslag voor te hoge facturering (%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "De factureringslimiet voor inkoopbonitem {0} ({1}) is met {2} % overschreden." @@ -34146,7 +34181,7 @@ msgstr "Toeslag voor overlevering/ontvangst (%)" msgid "Over Picking Allowance" msgstr "Overmatige pluktoeslag" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "Te veel ontvangen" @@ -34389,7 +34424,6 @@ msgstr "POS-veld" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "POS-factuur" @@ -34660,7 +34694,7 @@ msgstr "Levering Opmerking Verpakking Item" msgid "Packed Items" msgstr "Ingepakte artikelen" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "Verpakte artikelen kunnen niet intern worden verplaatst." @@ -35108,7 +35142,7 @@ msgstr "Gedeeltelijk ontvangen" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35244,7 +35278,7 @@ msgstr "Deeltjes per miljoen" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35370,7 +35404,7 @@ msgstr "Partij die niet bij elkaar past" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35456,7 +35490,7 @@ msgstr "Feestspecifiek artikel" #: 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:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35759,7 +35793,6 @@ msgstr "Betaling Entries {0} zijn un-linked" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -36017,7 +36050,7 @@ msgstr "Betalingsreferenties" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36096,10 +36129,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "Betalingsstatus" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37120,7 +37149,7 @@ msgstr "Stel de prioriteit in." msgid "Please Set Supplier Group in Buying Settings." msgstr "Gelieve Leveranciergroep in te stellen in Koopinstellingen." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "Geef het account op." @@ -37152,11 +37181,11 @@ msgstr "Voeg een tijdelijk openstaand account toe in het rekeningschema" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "Voeg ten minste één serienummer/batchnummer toe." @@ -37176,7 +37205,7 @@ msgstr "Voeg het account toe aan Bedrijf op hoofdniveau - {}" msgid "Please add {1} role to user {0}." msgstr "Voeg de rol {1} toe aan gebruiker {0}." -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "Pas de hoeveelheid aan of bewerk {0} om verder te gaan." @@ -37283,7 +37312,7 @@ msgstr "Maak de aankoop aan vanuit het interne verkoop- of leveringsdocument zel msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "Maak een aankoopbevestiging of een inkoopfactuur voor het artikel {0}" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "Verwijder productbundel {0}voordat u {1} samenvoegt met {2}." @@ -37352,11 +37381,11 @@ msgstr "Vul Account for Change Bedrag" msgid "Please enter Approving Role or Approving User" msgstr "Vul de Goedkeurders Rol of Goedkeurende Gebruiker in" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "Voer het batchnummer in." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "Vul kostenplaats in" @@ -37368,7 +37397,7 @@ msgstr "Vul de Leveringsdatum in" msgid "Please enter Employee Id of this sales person" msgstr "Vul Employee Id van deze verkoper" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "Vul Kostenrekening in" @@ -37413,7 +37442,7 @@ msgstr "Vul Peildatum in" msgid "Please enter Root Type for account- {0}" msgstr "Voer het roottype voor het account in: {0}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "Voer het serienummer in." @@ -37490,7 +37519,7 @@ msgstr "Voer de eerste leverdatum in." msgid "Please enter the phone number first" msgstr "Voer eerst het telefoonnummer in" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "Voer de {schedule_date} in." @@ -37604,12 +37633,12 @@ msgstr "Sla de verkooporder op voordat u een leveringsschema toevoegt." msgid "Please select Template Type to download template" msgstr "Selecteer het sjabloontype om de sjabloon te downloaden" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "Selecteer Apply Korting op" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "Selecteer een stuklijst met item {0}" @@ -37625,13 +37654,13 @@ msgstr "Selecteer Bankrekening" msgid "Please select Category first" msgstr "Selecteer eerst een Categorie" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "Selecteer eerst een Charge Type" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "Selecteer Company" @@ -37640,7 +37669,7 @@ msgstr "Selecteer Company" msgid "Please select Company and Posting Date to getting entries" msgstr "Selecteer Bedrijf en Boekingsdatum om transacties op te halen" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "Selecteer Company eerste" @@ -37689,7 +37718,7 @@ msgstr "Selecteer de rekening voor het verschil in periodieke boekingen." msgid "Please select Posting Date before selecting Party" msgstr "Selecteer Boekingsdatum voordat Party selecteren" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "Selecteer Boekingsdatum eerste" @@ -37697,11 +37726,11 @@ msgstr "Selecteer Boekingsdatum eerste" msgid "Please select Price List" msgstr "Selecteer Prijslijst" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "Selecteer alstublieft aantal tegen item {0}" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "Selecteer eerst Sample Retention Warehouse in Stock Settings" @@ -37754,7 +37783,7 @@ msgstr "Selecteer een inkooporder voor onderaanneming." msgid "Please select a Supplier" msgstr "Selecteer een leverancier" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "Selecteer een magazijn." @@ -37815,7 +37844,7 @@ msgstr "Selecteer een rij om een herplaatsingsbericht aan te maken." msgid "Please select a supplier for fetching payments." msgstr "Selecteer een leverancier voor het innen van betalingen." -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37835,7 +37864,7 @@ msgstr "Selecteer een artikelcode voordat u het magazijn instelt." msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "Selecteer ten minste één filter: Artikelcode, Batchnummer of Serienummer." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37942,7 +37971,7 @@ msgstr "Selecteer een geldig documenttype." msgid "Please select weekly off day" msgstr "Selecteer wekelijkse vrije dag" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "Selecteer eerst {0}" @@ -38082,7 +38111,7 @@ msgstr "Stel de werkelijke vraag of de verkoopprognose in om het rapport voor ma msgid "Please set an Address on the Company '%s'" msgstr "Stel een adres in voor het bedrijf '%s'" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "Stel een onkostenrekening in in de tabel 'Artikelen'." @@ -38126,7 +38155,7 @@ msgstr "Stel de standaard onkostenrekening in bij Bedrijf {0}" msgid "Please set default UOM in Stock Settings" msgstr "Stel de standaard UOM in bij Voorraadinstellingen" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "Stel de standaardkostenrekening voor verkochte goederen in bij bedrijf {0} voor het boeken van afrondingswinsten en -verliezen tijdens voorraadoverdracht." @@ -38245,7 +38274,7 @@ msgstr "Geef eerst een {0} op." msgid "Please specify at least one attribute in the Attributes table" msgstr "Gelieve ten minste één attribuut in de tabel attributen opgeven" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "Specificeer ofwel Hoeveelheid of Waarderingstarief of beide" @@ -38416,7 +38445,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38441,7 +38470,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38556,7 +38585,7 @@ msgstr "Publicatiedatum en -tijd" msgid "Posting Time" msgstr "Plaatsing Time" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "Plaatsingsdatum en -tijd is verplicht" @@ -38735,6 +38764,12 @@ msgstr "Preventief onderhoud" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39028,7 +39063,9 @@ msgstr "Prijs- of productkortingsplaten zijn vereist" msgid "Price per Unit (Stock UOM)" msgstr "Prijs per stuk (voorraadeenheid)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40383,6 +40420,7 @@ msgstr "Aankoopkosten voor artikel {0}" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40419,6 +40457,12 @@ msgstr "Inkoopfactuur Voorschot" msgid "Purchase Invoice Item" msgstr "Inkoopfactuur Artikel" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40470,6 +40514,7 @@ msgstr "Inkoopfacturen" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40479,7 +40524,7 @@ msgstr "Inkoopfacturen" #: 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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40596,7 +40641,7 @@ msgstr "Inkooporder {0} aangemaakt" msgid "Purchase Order {0} is not submitted" msgstr "Inkooporder {0} is niet ingediend" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "Inkooporders" @@ -40659,6 +40704,7 @@ msgstr "Inkoopprijslijst" #: 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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40673,7 +40719,7 @@ msgstr "Inkoopprijslijst" msgid "Purchase Receipt" msgstr "Ontvangstbevestiging" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40939,7 +40985,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41527,7 +41572,7 @@ msgstr "Kwaliteitsbeoordeling" msgid "Quality Review Objective" msgstr "Kwaliteitsbeoordeling Doelstelling" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41588,7 +41633,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41782,7 +41827,7 @@ msgstr "Queryroute-string" msgid "Queue Size should be between 5 and 100" msgstr "De wachtrijgrootte moet tussen de 5 en 100 liggen." -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "Korte dagboeknotitie" @@ -41837,7 +41882,7 @@ msgstr "Offerte/Lead %" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -42000,7 +42045,6 @@ msgstr "Opgelost door (e-mail)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42410,8 +42454,8 @@ msgstr "Grondstoffen rechtstreeks aan de klant" msgid "Raw SQL" msgstr "Ruwe SQL" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "De verbruikte hoeveelheid grondstoffen wordt gevalideerd op basis van de vereiste hoeveelheid in de FG-BOM (Feestproduct-Bill of Materials)." @@ -42819,11 +42863,10 @@ msgstr "Banktransactie afstemmen" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43347,7 +43390,7 @@ msgstr "Afgekeurde serie- en batchbundel" msgid "Rejected Warehouse" msgstr "Afgekeurd magazijn" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "Het afgekeurde magazijn en het geaccepteerde magazijn kunnen niet hetzelfde zijn." @@ -43397,7 +43440,7 @@ msgid "Remaining Balance" msgstr "Resterende saldo" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43451,7 +43494,7 @@ msgstr "Opmerking" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43490,7 +43533,7 @@ msgstr "Nulwaarden verwijderen" msgid "Remove item if charges is not applicable to that item" msgstr "Verwijder het artikel als er geen kosten aan verbonden zijn." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "Verwijderde items met geen verandering in de hoeveelheid of waarde." @@ -43895,6 +43938,7 @@ msgstr "Verzoek om informatie" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44168,7 +44212,7 @@ msgstr "Reserveer voor subassemblage" msgid "Reserved" msgstr "Gereserveerd" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "Conflict in gereserveerde batch" @@ -44781,7 +44825,7 @@ msgstr "" msgid "Reversal Of" msgstr "Omkering van" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "Omgekeerde journaalpost" @@ -44930,10 +44974,7 @@ msgstr "Functie waarin je meer kunt leveren dan verwacht/ontvangen" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "Rol die het recht heeft om de stopactie te overrulen" @@ -44948,8 +44989,11 @@ msgstr "Rol waarmee de kredietlimiet kan worden omzeild" msgid "Role allowed to bypass period restrictions." msgstr "De functie stond toe om periodebeperkingen te omzeilen." +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45150,8 +45194,8 @@ msgstr "Afrondingsverliescorrectie" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "De afrondingsverliestoeslag moet tussen 0 en 1 liggen." -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "Afrondingswinst/verlies Boeking voor aandelenoverdracht" @@ -45178,11 +45222,11 @@ msgstr "Routeringsnaam" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "Rij # {0}: Kan niet meer dan terugkeren {1} voor post {2}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "Rijnummer {0}: Voeg een serienummer en batchbundel toe voor item {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "Rij # {0}: Voer de hoeveelheid in voor artikel {1} , aangezien deze niet nul is." @@ -45208,7 +45252,7 @@ msgstr "Rij # {0} (betalingstabel): bedrag moet negatief zijn" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "Rij # {0} (betalingstabel): bedrag moet positief zijn" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "Rij #{0}: Er bestaat al een herbestelling voor magazijn {1} met herbestellingstype {2}." @@ -45409,7 +45453,7 @@ msgstr "Rij # {0}: Duplicate entry in Referenties {1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "Rij # {0}: Verwachte Afleverdatum kan niet vóór de Aankoopdatum zijn" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "Rij #{0}: Kostenrekening niet ingesteld voor het item {1}. {2}" @@ -45469,7 +45513,7 @@ msgstr "Rij #{0}: De velden 'Van tijd' en 'Tot tijd' zijn verplicht." msgid "Row #{0}: Item added" msgstr "Rij # {0}: item toegevoegd" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "Rij #{0}: Item {1} kan niet meer dan {2} worden overgeplaatst naar {3} {4}" @@ -45497,7 +45541,7 @@ msgstr "Rij #{0}: Artikel {1} in magazijn {2}: Beschikbaar {3}, Nodig {4}." msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "Rij #{0}: Artikel {1} is geen door de klant geleverd artikel." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "Rij # {0}: artikel {1} is geen geserialiseerd / batch artikel. Het kan geen serienummer / batchnummer hebben." @@ -45550,7 +45594,7 @@ msgstr "Rij #{0}: Alleen {1} beschikbaar om te reserveren voor item {2}" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "Rij #{0}: De beginwaarde van de geaccumuleerde afschrijving moet kleiner dan of gelijk aan {1} zijn." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "Rij # {0}: bewerking {1} is niet voltooid voor {2} aantal voltooide goederen in werkorder {3}. Werk de bedieningsstatus bij via opdrachtkaart {4}." @@ -45575,7 +45619,7 @@ msgstr "Rij #{0}: Selecteer het eindproduct waarvoor dit door de klant aangeleve msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Rij #{0}: Selecteer het magazijn voor de subassemblage" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "Rij # {0}: Stel nabestelling hoeveelheid" @@ -45601,15 +45645,15 @@ msgstr "Rij #{0}: Aantal moet een positief getal zijn" 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 "Rij #{0}: De hoeveelheid moet kleiner of gelijk zijn aan de beschikbare hoeveelheid om te reserveren (werkelijke hoeveelheid - gereserveerde hoeveelheid) {1} voor artikel {2} tegen batch {3} in magazijn {4}." -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "Rij #{0}: Kwaliteitsinspectie is vereist voor artikel {1}" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "Rij #{0}: Kwaliteitsinspectie {1} is niet ingediend voor het artikel: {2}" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "Rij #{0}: Kwaliteitsinspectie {1} werd afgekeurd voor artikel {2}" @@ -45640,11 +45684,11 @@ msgstr "Rij #{0}: De hoeveelheid die voor het artikel {1} gereserveerd moet word msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "Rij #{0}: Tarief moet hetzelfde zijn als {1}: {2} ({3} / {4})" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "Rij # {0}: Reference document moet een van Purchase Order, Purchase Invoice of Inboeken zijn" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "Rij # {0}: het type referentiedocument moet een verkooporder, verkoopfactuur, journaalboeking of aanmaning zijn" @@ -45690,7 +45734,7 @@ msgstr "Rij #{0}: De verkoopprijs voor artikel {1} is lager dan die van {2}.\n" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "Rij #{0}: Volgorde-ID moet {1} of {2} zijn voor bewerking {3}." -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "Rij # {0}: Serienummer {1} hoort niet bij Batch {2}" @@ -45738,11 +45782,11 @@ msgstr "Rij #{0}: Bronmagazijn {1} voor artikel {2} mag geen klantmagazijn zijn. msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "Rij #{0}: Bronmagazijn {1} voor artikel {2} moet hetzelfde zijn als bronmagazijn {3} in de werkorder." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "Rij #{0}: Bron- en doelmagazijn mogen niet hetzelfde zijn voor materiaaloverdracht" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "Rij #{0}: Bron-, doelmagazijn- en voorraadafmetingen mogen niet exact hetzelfde zijn voor materiaaloverdracht." @@ -45795,11 +45839,11 @@ msgstr "Rij #{0}: Voorraadhoeveelheid {1} ({2}) voor artikel {3} mag niet groter msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "Rij #{0}: Het doelmagazijn moet hetzelfde zijn als het klantmagazijn {1} uit de gekoppelde onderaannemingsopdracht." -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "Rij # {0}: de batch {1} is al verlopen." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "Rij #{0}: Het magazijn {1} is geen ondergeschikt magazijn van een groepsmagazijn {2}" @@ -45827,7 +45871,7 @@ msgstr "Rij #{0}: Inhoudingsbedrag {1} komt niet overeen met het berekende bedra msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "Rij #{0}: Er bestaat een werkorder voor de volledige of gedeeltelijke hoeveelheid van artikel {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "Rij #{0}: U kunt de voorraaddimensie '{1}' niet gebruiken in voorraadafstemming om de hoeveelheid of waarderingskoers te wijzigen. Voorraadafstemming met voorraaddimensies is uitsluitend bedoeld voor het uitvoeren van openingsboekingen." @@ -45863,23 +45907,23 @@ msgstr "Rij #{1}: Magazijn is verplicht voor voorraadartikel {0}" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "Rij #{idx}: Kan geen leveranciersmagazijn selecteren bij het leveren van grondstoffen aan een onderaannemer." -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "Rij #{idx}: De artikelprijs is bijgewerkt volgens de waarderingskoers, aangezien het een interne voorraadoverdracht betreft." -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "Rij #{idx}: Voer een locatie in voor het object {item_code}." -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "Rij #{idx}: De ontvangen hoeveelheid moet gelijk zijn aan de geaccepteerde + afgewezen hoeveelheid voor artikel {item_code}." -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "Rij #{idx}: {field_label} kan niet negatief zijn voor item {item_code}." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "Rij #{idx}: {field_label} is verplicht." @@ -45887,7 +45931,7 @@ msgstr "Rij #{idx}: {field_label} is verplicht." msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "Rij #{idx}: {from_warehouse_field} en {to_warehouse_field} mogen niet hetzelfde zijn." -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "Rij #{idx}: {schedule_date} mag niet vóór {transaction_date} komen." @@ -45952,7 +45996,7 @@ msgstr "Rij # {}: {}" msgid "Row #{}: {} {} does not exist." msgstr "Rij # {}: {} {} bestaat niet." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "Rijnummer {}: {} {} behoort niet tot bedrijf {}. Selecteer een geldige {}." @@ -45968,7 +46012,7 @@ msgstr "Rij {0}: bewerking vereist ten opzichte van het artikel met de grondstof msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "De hoeveelheid die in rij {0} is verzameld, is kleiner dan de vereiste hoeveelheid; er is een extra hoeveelheid van {1} {2} nodig." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "Rij {0}# Item {1} niet gevonden in tabel 'Geleverde grondstoffen' in {2} {3}" @@ -46000,7 +46044,7 @@ msgstr "Rij {0}: Toegewezen bedrag {1} moet kleiner of gelijk zijn aan het opens msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "Rij {0}: Toegewezen bedrag {1} moet kleiner of gelijk zijn aan het resterende betalingsbedrag {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "Rij {0}: Omdat {1} is ingeschakeld, kunnen er geen grondstoffen worden toegevoegd aan item {2} . Gebruik item {3} om grondstoffen te verbruiken." @@ -46059,7 +46103,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "Rij {0}: Ofwel het artikel op de leveringsbon, ofwel de referentie naar het verpakte artikel is verplicht." #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "Rij {0}: Wisselkoers is verplicht" @@ -46100,7 +46144,7 @@ msgstr "Rij {0}: Van tijd en binnen Tijd is verplicht." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "Rij {0}: Van tijd en de tijd van de {1} overlapt met {2}" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "Rij {0}: Vanuit magazijn is verplicht voor interne overdrachten" @@ -46224,7 +46268,7 @@ msgstr "Rij {0}: Aantal moet groter zijn dan 0." msgid "Row {0}: Quantity cannot be negative." msgstr "Rij {0}: De hoeveelheid mag niet negatief zijn." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "Rij {0}: hoeveelheid niet beschikbaar voor {4} in magazijn {1} op het moment van boeking ({2} {3})" @@ -46236,11 +46280,11 @@ msgstr "Rij {0}: Verkoopfactuur {1} is al aangemaakt voor {2}" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "Rij {0}: De shift kan niet worden gewijzigd omdat de afschrijving al is verwerkt." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "Rij {0}: uitbesteed artikel is verplicht voor de grondstof {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "Rij {0}: Doelmagazijn is verplicht voor interne overdrachten" @@ -46264,7 +46308,7 @@ msgstr "Rij {0}: De {3} rekening {1} behoort niet tot het bedrijf {2}" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "Rij {0}: Om de periodiciteit {1} in te stellen, moet het verschil tussen de begin- en einddatum groter dan of gelijk aan {2} zijn." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "Rij {0}: De overgedragen hoeveelheid mag niet groter zijn dan de gevraagde hoeveelheid." @@ -46317,7 +46361,7 @@ msgstr "Rij {0}: {2} Item {1} bestaat niet in {2} {3}" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "Rij {1}: hoeveelheid ({0}) mag geen breuk zijn. Schakel '{2}' uit in maateenheid {3} om dit toe te staan." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "Rij {idx}: De naamgevingsreeks voor activa is verplicht voor het automatisch aanmaken van activa voor item {item_code}." @@ -46347,7 +46391,7 @@ msgstr "Rijen met dezelfde rekeningnamen worden in het grootboek samengevoegd." msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "Rijen met dubbele vervaldatums in andere rijen zijn gevonden: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "Rijen: {0} hebben 'Betalingsinvoer' als referentietype. Dit mag niet handmatig worden ingesteld." @@ -46413,7 +46457,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46710,7 +46754,7 @@ msgstr "Verkoopinkomstenpercentage" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46884,7 +46928,7 @@ msgstr "Verkoopkansen per bron" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -47007,8 +47051,8 @@ msgstr "Verkooporder nodig voor Artikel {0}" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "Verkooporder {0} bestaat al voor de inkooporder van de klant {1}. Om meerdere verkooporders toe te staan, schakelt u {2} in via {3}." -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47419,7 +47463,7 @@ msgstr "Hetzelfde artikel" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "Dezelfde artikel- en magazijncombinatie is al ingevoerd." @@ -47456,7 +47500,7 @@ msgstr "Monsterbewaringsmagazijn" msgid "Sample Size" msgstr "Monster grootte" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "Voorbeeldhoeveelheid {0} kan niet meer dan ontvangen aantal {1} zijn" @@ -47747,7 +47791,7 @@ msgstr "Zoeken op artikelcode, serienummer of barcode" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47892,7 +47936,7 @@ msgstr "Selecteer merk ..." msgid "Select Columns and Filters" msgstr "Kolommen en filters selecteren" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "Selecteer Bedrijf" @@ -48588,7 +48632,7 @@ msgstr "Serienummerbereik" msgid "Serial No Reserved" msgstr "Serienummer gereserveerd" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "Serienummerreeks overlapt" @@ -48649,7 +48693,7 @@ msgstr "Serienummer is verplicht" msgid "Serial No is mandatory for Item {0}" msgstr "Serienummer is verplicht voor Artikel {0}" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "Serienummer {0} bestaat al" @@ -48935,7 +48979,7 @@ msgstr "Serienummers niet beschikbaar voor artikel {0} in magazijn {1}. Probeer #: 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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48961,7 +49005,7 @@ msgstr "Serienummers niet beschikbaar voor artikel {0} in magazijn {1}. Probeer #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49359,12 +49403,6 @@ msgstr "Doelmagazijn instellen" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "Stel de waarderingskoers in op basis van het bronmagazijn." -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "Stel een waarderingspercentage in voor afgekeurde materialen" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "Set Warehouse" @@ -49470,6 +49508,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "Stel {0} in in activacategorie {1} voor bedrijf {2}" @@ -49968,7 +50012,7 @@ msgstr "Saldo's weergeven in het rekeningschema" msgid "Show Barcode Field in Stock Transactions" msgstr "Toon het barcodeveld in aandelentransacties" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "Geannuleerde boekingen tonen" @@ -49976,7 +50020,7 @@ msgstr "Geannuleerde boekingen tonen" msgid "Show Completed" msgstr "Show voltooid" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "Toon credit/debet in de valuta van het bedrijf." @@ -50059,7 +50103,7 @@ msgstr "Toon gekoppelde leveringsbonnen" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "Toon nettowaarden in de rekening van de partij" @@ -50071,7 +50115,7 @@ msgstr "" msgid "Show Open" msgstr "Toon geopend" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "Openingsitems weergeven" @@ -50084,11 +50128,6 @@ msgstr "Toon de begin- en eindbalans" msgid "Show Operations" msgstr "Showoperaties" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "Toon betaalknop in inkooporderportaal" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "Toon betalingsgegevens" @@ -50104,7 +50143,7 @@ msgstr "Toon het betalingsschema in gedrukte vorm." #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "Toon opmerkingen" @@ -50171,6 +50210,11 @@ msgstr "Toon alleen POS" msgid "Show only the Immediate Upcoming Term" msgstr "Toon alleen de eerstvolgende termijn" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "Toon lopende inzendingen" @@ -50459,11 +50503,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50529,7 +50573,7 @@ msgstr "Het bronmagazijn {0} moet hetzelfde zijn als het klantmagazijn {1} in de msgid "Source and Target Location cannot be same" msgstr "Bron en doellocatie kunnen niet hetzelfde zijn" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "Bron- en doelmagazijn kan niet hetzelfde zijn voor de rij {0}" @@ -50543,8 +50587,8 @@ msgid "Source of Funds (Liabilities)" msgstr "Bron van Kapitaal (Passiva)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "Bron magazijn is verplicht voor rij {0}" @@ -50709,8 +50753,8 @@ msgstr "Standaardtariefkosten" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "Standaard Verkoop" @@ -51043,7 +51087,7 @@ msgstr "Logboek voor voorraadafsluiting" msgid "Stock Details" msgstr "Voorraadgegevens" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "Reeds aangemaakte voorraadboekingen voor werkorder {0}: {1}" @@ -51314,7 +51358,7 @@ msgstr "Voorraad ontvangen maar nog niet gefactureerd" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51326,7 +51370,7 @@ msgstr "Voorraad Aflettering" msgid "Stock Reconciliation Item" msgstr "Voorraad Afletteren Artikel" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "Voorraadafstemmingen" @@ -51364,7 +51408,7 @@ msgstr "Instellingen voor het opnieuw plaatsen van aandelen" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51392,7 +51436,7 @@ msgstr "Aandelenreserveringsinschrijvingen geannuleerd" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "Aangemaakte reserveringsposten voor voorraden" @@ -51774,7 +51818,7 @@ msgstr "Stopped Work Order kan niet geannuleerd worden, laat het eerst annuleren #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "Winkels" @@ -51852,10 +51896,6 @@ msgstr "Suboperaties" msgid "Sub Procedure" msgstr "Subprocedure" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "Subtotaal" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "De referenties naar de subassemblages ontbreken. Haal de subassemblages en grondstoffen opnieuw op." @@ -52072,7 +52112,7 @@ msgstr "Onderbesteding Inkomende Order Serviceartikel" msgid "Subcontracting Order" msgstr "Ondercontracteringsopdracht" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52098,7 +52138,7 @@ msgstr "Ondercontracteringsopdracht Serviceartikel" msgid "Subcontracting Order Supplied Item" msgstr "Ondercontractuele opdracht, geleverd artikel" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "Ondercontracteringsopdracht {0} aangemaakt." @@ -52187,7 +52227,7 @@ msgstr "" msgid "Subdivision" msgstr "Onderverdeling" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "Actie verzenden mislukt" @@ -52362,7 +52402,7 @@ msgstr "Succesvol Afgeletterd" msgid "Successfully Set Supplier" msgstr "Leverancier met succes instellen" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "De artikeleenheid is succesvol gewijzigd. Definieer de conversiefactoren opnieuw voor de nieuwe eenheid." @@ -52518,6 +52558,7 @@ msgstr "Meegeleverde Aantal" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52559,8 +52600,8 @@ msgstr "Meegeleverde Aantal" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52608,6 +52649,12 @@ msgstr "Leverancier Adressen en Contacten" msgid "Supplier Contact" msgstr "Contactpersoon leverancier" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52702,7 +52749,7 @@ msgstr "Factuurdatum Leverancier" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "Factuurnr. Leverancier" @@ -52982,19 +53029,10 @@ msgstr "Leverancier van goederen of diensten." msgid "Supplier {0} not found in {1}" msgstr "Leverancier {0} niet gevonden in {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Leverancier(s)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "Leverancier-gebaseerde Verkoop Analyse" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53056,7 +53094,7 @@ msgstr "Ondersteuningsteam" msgid "Support Tickets" msgstr "Ondersteuning tickets" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53316,8 +53354,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "Het doelmagazijn {0} moet hetzelfde zijn als het leveringsmagazijn {1} in het artikel van de onderaannemingsorder." #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "Doel magazijn is verplicht voor rij {0}" @@ -53786,7 +53824,7 @@ msgstr "Belasting wordt alleen ingehouden voor bedragen die de cumulatieve dremp #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "Belastbaar bedrag" @@ -53947,7 +53985,7 @@ msgstr "Afgetrokken belastingen en heffingen" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "Ingehouden belastingen en heffingen (valuta van het bedrijf)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "Belastingen rij #{0}: {1} kan niet kleiner zijn dan {2}" @@ -54137,7 +54175,6 @@ msgstr "Voorwaardensjabloon" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54329,7 +54366,7 @@ msgstr "De toegang tot offerteaanvragen via de portal is uitgeschakeld. Om toega msgid "The BOM which will be replaced" msgstr "De stuklijst die vervangen zal worden" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "De batch {0} heeft een negatieve batchhoeveelheid {1}. Om dit te corrigeren, ga naar de batch en klik op Batchhoeveelheid opnieuw berekenen. Als het probleem zich blijft voordoen, maak dan een inkomende boeking aan." @@ -54373,7 +54410,7 @@ msgstr "De betalingstermijn op rij {0} is mogelijk een duplicaat." 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 "De picklijst met voorraadreserveringen kan niet worden bijgewerkt. Als u wijzigingen wilt aanbrengen, raden we u aan de bestaande voorraadreserveringen te annuleren voordat u de picklijst bijwerkt." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "De hoeveelheid procesverlies is gereset volgens de werkbonnen." @@ -54389,7 +54426,7 @@ msgstr "Het serienummer op rij #{0}: {1} is niet beschikbaar in magazijn {2}." msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "Het serienummer {0} is gereserveerd voor de {1} {2} en kan niet voor andere transacties worden gebruikt." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "De Serial and Batch Bundle {0} is niet geldig voor deze transactie. Het 'Type of Transaction' moet 'Outward' zijn in plaats van 'Inward' in Serial and Batch Bundle {0}." @@ -54426,7 +54463,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "De batch {0} is al gereserveerd in {1} {2}. Daarom kan niet verder met {3} {4}, die is aangemaakt voor {5} {6}." @@ -54532,7 +54569,7 @@ msgstr "De volgende batches zijn verlopen, vul ze alstublieft weer aan:
{0} msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "De volgende geannuleerde herplaatsingsberichten bestaan voor {0}:

{1}

Verwijder deze berichten voordat u verdergaat." -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "De volgende verwijderde attributen bestaan in varianten maar niet in de sjabloon. U kunt de varianten verwijderen of het / de attribuut (en) in de sjabloon behouden." @@ -54576,15 +54613,15 @@ msgstr "De vakantie op {0} is niet tussen Van Datum en To Date" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "Het item {item} is niet gemarkeerd als {type_of} item. U kunt het als {type_of} item inschakelen via de itemmaster." -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "De items {0} en {1} zijn aanwezig in het volgende {2}:" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "De items {items} zijn niet gemarkeerd als {type_of} item. Je kunt ze inschakelen als {type_of} item via hun itemmasters." @@ -54740,7 +54777,7 @@ msgstr "De shares bestaan niet met de {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "De voorraad van het artikel {0} in het magazijn {1} was negatief op de {2}. U dient een positieve boeking {3} te maken vóór de datum {4} en tijd {5} om de juiste waarderingskoers te boeken. Raadpleeg voor meer informatie de documentatie ." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "De volgende artikelen en magazijnen zijn gereserveerd. Deblokkeer deze reservering om de voorraadafstemming te voltooien: {0}

{1}" @@ -54762,11 +54799,11 @@ 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 "Het systeem genereert op basis van deze instelling een verkoopfactuur of een kassabonfactuur via de kassainterface. Voor transacties met een hoog volume wordt het gebruik van de kassabon aanbevolen." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "De taak is in de wacht gezet als achtergrondtaak. Als er een probleem is met de verwerking op de achtergrond, zal het systeem een opmerking toevoegen over de fout bij deze voorraadafstemming en terugkeren naar de conceptfase" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "De taak is als achtergrondtaak in de wachtrij geplaatst. Als er zich een probleem voordoet tijdens de verwerking op de achtergrond, voegt het systeem een opmerking over de fout toe aan deze voorraadafstemming en keert terug naar de status 'Ingediend'." @@ -54838,7 +54875,7 @@ msgstr "De {0} ({1}) moet gelijk zijn aan {2} ({3})" msgid "The {0} contains Unit Price Items." msgstr "De {0} bevat artikelen met een eenheidsprijs." -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "Het voorvoegsel {0} '{1}' bestaat al. Wijzig de serienummerreeks, anders krijgt u een foutmelding 'Dubbele invoer'." @@ -54891,7 +54928,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "Er zijn geen plaatsen meer beschikbaar op deze datum." -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54935,7 +54972,7 @@ msgstr "Er is geen batch gevonden voor de {0}: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "Deze voorraadpost moet minimaal één afgewerkt product bevatten." @@ -54991,11 +55028,11 @@ msgstr "Dit artikel is een variant van {0} (Sjabloon)." msgid "This Month's Summary" msgstr "Samenvatting van deze maand" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "Deze inkooporder is volledig uitbesteed." -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "Deze verkooporder is volledig uitbesteed." @@ -55796,7 +55833,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "Om Belastingen op te nemen in het Artikeltarief in rij {0}, moeten de belastingen in rijen {1} ook worden opgenomen" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "Om samen te voegen, moeten de volgende eigenschappen hetzelfde zijn voor beide artikelen" @@ -55831,7 +55868,7 @@ msgstr "Om een ander financieel boek te gebruiken, moet u 'Standaard FB-activa o #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "Om een ander financieel boek te gebruiken, schakelt u 'Standaard FB-boekingen opnemen' uit." @@ -55982,7 +56019,7 @@ msgstr "Totale toewijzingen" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Totaal bedrag" @@ -56405,7 +56442,7 @@ msgstr "Het totale bedrag van het betalingsverzoek mag niet groter zijn dan {0}" msgid "Total Payments" msgstr "Totaal betalingen" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "De totale gepickte hoeveelheid {0} is groter dan de bestelde hoeveelheid {1}. U kunt de overpicktoeslag instellen in de voorraadinstellingen." @@ -56437,7 +56474,7 @@ msgstr "Totale aankoopkosten (via aankoopfactuur)" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Totaal Aantal" @@ -56823,7 +56860,7 @@ msgstr "Tracking-URL" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56834,7 +56871,7 @@ msgstr "Transactie" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "Transactievaluta" @@ -57506,11 +57543,11 @@ msgstr "BTW-instellingen van de VAE" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57582,7 +57619,7 @@ msgstr "Eenheid Omrekeningsfactor is vereist in rij {0}" msgid "UOM Name" msgstr "Eenheidsnaam" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "Vereiste omrekeningsfactor voor UOM: {0} in Artikel: {1}" @@ -57658,7 +57695,7 @@ msgstr "Kan geen score beginnen bij {0}. Je moet een score hebben van 0 tot 100" msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "Het is niet mogelijk om een tijdslot te vinden in de komende {0} dagen voor de bewerking {1}. Verhoog de 'Capaciteitsplanning voor (dagen)' in de {2}." -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "Variabele niet gevonden:" @@ -57777,7 +57814,7 @@ msgstr "Meeteenheid" msgid "Unit of Measure (UOM)" msgstr "Hoeveelheidseenheid (HE)" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel" @@ -57897,10 +57934,9 @@ msgid "Unreconcile Transaction" msgstr "Niet-afgestemde transactie" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "Onverzoend" @@ -57923,10 +57959,6 @@ msgstr "Niet-geharmoniseerde boekingen" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57972,7 +58004,7 @@ msgstr "Niet gepland" msgid "Unsecured Loans" msgstr "Leningen zonder onderpand" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "Niet-afgestemd betalingsverzoek" @@ -58187,12 +58219,6 @@ msgstr "Update voorraad" msgid "Update Type" msgstr "Updatetype" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "Updatefrequentie van het project" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58233,7 +58259,7 @@ msgstr "Bijgewerkte {0} rij(en) in het financieel rapport met nieuwe categoriena msgid "Updating Costing and Billing fields against this Project..." msgstr "De velden Kosten en Facturering voor dit project bijwerken..." -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "Varianten bijwerken ..." @@ -58691,12 +58717,6 @@ msgstr "Valideer de toegepaste regel" msgid "Validate Components and Quantities Per BOM" msgstr "Controleer de componenten en aantallen volgens de stuklijst." -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "Controleer de verbruikte hoeveelheid (conform de stuklijst)." - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58720,6 +58740,12 @@ msgstr "Valideer de prijsregel" msgid "Validate Stock on Save" msgstr "Controleer de voorraad bij het opslaan." +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58826,11 +58852,11 @@ msgstr "Waarderingstarief ontbreekt" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "Waarderingstarief voor het item {0}, is vereist om boekhoudkundige gegevens voor {1} {2} te doen." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "Valuation Rate is verplicht als Opening Stock ingevoerd" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "Waarderingspercentage vereist voor artikel {0} op rij {1}" @@ -58840,7 +58866,7 @@ msgstr "Waarderingspercentage vereist voor artikel {0} op rij {1}" msgid "Valuation and Total" msgstr "Waardering en totaal" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "De waarderingsgraad voor door de klant aangeleverde artikelen is op nul gezet." @@ -58990,7 +59016,7 @@ msgstr "Variantie ({})" msgid "Variant" msgstr "Variant" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "Fout bij variantkenmerk" @@ -59009,7 +59035,7 @@ msgstr "Variant stuklijst" msgid "Variant Based On" msgstr "Variant gebaseerd op" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "Variant op basis kan niet worden gewijzigd" @@ -59027,7 +59053,7 @@ msgstr "Variantveld" msgid "Variant Item" msgstr "Variant item" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "Variantartikelen" @@ -59408,7 +59434,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59448,7 +59474,7 @@ msgstr "Voucher Aantal" #. 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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "Voucher-subtype" @@ -59480,7 +59506,7 @@ msgstr "Voucher-subtype" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59715,7 +59741,7 @@ msgstr "Magazijn {0} bestaat niet" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "Magazijn {0} is niet toegestaan voor verkooporder {1}, het moet {2} zijn." -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "Magazijn {0} is niet gekoppeld aan een account. Vermeld het account in de magazijngegevens of stel een standaardvoorraadaccount in bij bedrijf {1}." @@ -59762,7 +59788,7 @@ msgstr "Warehouses met bestaande transactie kan niet worden geconverteerd naar g #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59818,6 +59844,12 @@ msgstr "Waarschuwing voor nieuwe offerteaanvragen" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "Waarschuwing - Rij {0}: De gefactureerde uren zijn hoger dan de werkelijke uren" @@ -60001,7 +60033,7 @@ msgstr "Website specificaties" msgid "Website:" msgstr "Website:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60375,7 +60407,7 @@ msgstr "Verbruikte materialen volgens werkorder" msgid "Work Order Item" msgstr "Werkorderitem" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60437,11 +60469,11 @@ msgstr "Werkorder niet gemaakt" msgid "Work Order {0} created" msgstr "Werkorder {0} aangemaakt" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "Werkorder {0}: opdrachtkaart niet gevonden voor de bewerking {1}" @@ -60757,11 +60789,11 @@ msgstr "Jaar Naam" msgid "Year Start Date" msgstr "Begindatum van het jaar" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60814,7 +60846,7 @@ msgstr "U kunt deze link ook kopiëren en plakken in uw browser" msgid "You can also set default CWIP account in Company {}" msgstr "U kunt ook een standaard CWIP-account instellen in Bedrijf {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60968,6 +61000,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60996,7 +61032,7 @@ msgstr "Je hebt {0} en {1} ingeschakeld in {2}. Dit kan ertoe leiden dat prijzen msgid "You have entered a duplicate Delivery Note on Row" msgstr "U heeft een dubbele leveringsbon ingevoerd op deze regel." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -61004,7 +61040,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "U moet automatisch opnieuw bestellen inschakelen in Voorraadinstellingen om opnieuw te bestellen." @@ -61075,8 +61111,11 @@ msgstr "Nul beoordeling" msgid "Zero quantity" msgstr "Nul hoeveelheid" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61188,7 +61227,7 @@ msgstr "wisselkoers.host" msgid "fieldname" msgstr "veldnaam" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61406,6 +61445,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "unieke code, bijvoorbeeld SAVE20. Te gebruiken voor korting." +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "variantie" @@ -61464,7 +61507,8 @@ msgstr "{0} Gebruikte coupon is {1}. Toegestane hoeveelheid is op" msgid "{0} Digest" msgstr "{0} Samenvatting" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61484,7 +61528,7 @@ msgstr "{0} Bewerkingen: {1}" msgid "{0} Request for {1}" msgstr "{0} Verzoek om {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} Bewaar monster is gebaseerd op batch. Controleer Heeft batchnummer om een monster van het artikel te behouden" @@ -61597,7 +61641,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} twee keer opgenomen in Artikel BTW" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "{0} tweemaal ingevoerd {1} in Artikelbelastingen" @@ -61765,7 +61809,7 @@ msgstr "{0} parameter is ongeldig" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} betaling items kunnen niet worden gefilterd door {1}" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "{0} aantal van Artikel {1} wordt ontvangen in Magazijn {2} met capaciteit {3}." @@ -61778,7 +61822,7 @@ msgstr "{0} tot {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "{0} eenheden zijn gereserveerd voor Artikel {1} in Magazijn {2}, gelieve deze reservering te deblokkeren in {3} de Voorraadafstemming." @@ -61980,7 +62024,7 @@ msgstr "{0} {1}: Account {2} is niet actief" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: Accounting Entry voor {2} kan alleen worden gemaakt in valuta: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: kostenplaats is verplicht voor artikel {2}" @@ -62066,23 +62110,23 @@ msgstr "{0}: {1} bestaat niet" msgid "{0}: {1} is a group account." msgstr "{0}: {1} is een groepsaccount." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} moet kleiner zijn dan {2}" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "{count} Assets gemaakt voor {item_code}" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} is geannuleerd of gesloten." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "{item_name}De steekproefomvang ({sample_size}) mag niet groter zijn dan de geaccepteerde hoeveelheid ({accepted_quantity})." -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "{ref_doctype} {ref_name} is {status}." diff --git a/erpnext/locale/pl.po b/erpnext/locale/pl.po index a1d275c6bfc..d09dd7ab0bb 100644 --- a/erpnext/locale/pl.po +++ b/erpnext/locale/pl.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:20\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:20\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Polish\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr "" msgid " Summary" msgstr "" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "" @@ -302,7 +302,7 @@ msgstr "" msgid "'From Date' must be after 'To Date'" msgstr "" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "" @@ -338,7 +338,7 @@ msgstr "" msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "Konto '{0}' jest już używane przez {1}. Proszę użyć innego konta." @@ -1047,7 +1047,7 @@ msgstr "" msgid "A logical Warehouse against which stock entries are made." msgstr "Logiczny Magazyn przeciwny do zapisów." -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1259,7 +1259,7 @@ msgstr "" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1929,8 +1929,8 @@ msgstr "Zapisy księgowe" msgid "Accounting Entry for Asset" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1938,7 +1938,7 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "" @@ -1951,16 +1951,16 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "" @@ -2258,12 +2258,6 @@ msgstr "Działanie, jeśli kontrola jakości nie zostanie przesłana" msgid "Action If Quality Inspection Is Rejected" msgstr "" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "" @@ -2322,6 +2316,12 @@ msgstr "" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2589,7 +2589,7 @@ msgstr "Rzeczywisty czas (w godzinach)" msgid "Actual qty in stock" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "" @@ -2603,7 +2603,7 @@ msgstr "" msgid "Add / Edit Prices" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "" @@ -2757,7 +2757,7 @@ msgstr "" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -3002,7 +3002,7 @@ msgstr "Dodatkowa kwota rabatu" msgid "Additional Discount Amount (Company Currency)" msgstr "Dodatkowa kwota rabatu (waluta firmy)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -3287,7 +3287,7 @@ msgstr "Dostosuj ilość" msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "Korekta w oparciu o kurs faktury zakupu" @@ -3400,7 +3400,7 @@ msgstr "" msgid "Advance amount" msgstr "Kwota Zaliczki" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Ilość wyprzedzeniem nie może być większa niż {0} {1}" @@ -3469,7 +3469,7 @@ msgstr "Wyklucza" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "" @@ -3587,7 +3587,7 @@ msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "" @@ -3611,7 +3611,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "" @@ -3892,7 +3892,7 @@ msgstr "" msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "" @@ -3900,7 +3900,7 @@ msgstr "" msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "" @@ -3949,7 +3949,7 @@ msgstr "" msgid "Allocate Advances Automatically (FIFO)" msgstr "Automatycznie przydzielaj zaliczki (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "" @@ -3959,7 +3959,7 @@ msgstr "" msgid "Allocate Payment Based On Payment Terms" msgstr "Przydziel płatność na podstawie warunków płatności" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "" @@ -3989,7 +3989,7 @@ msgstr "Przydzielone" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4110,15 +4110,15 @@ msgstr "Zezwalaj na zwroty" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "Zezwalaj na wielokrotne dodawanie przedmiotu w transakcji" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "Zezwalaj na wielokrotne dodawanie przedmiotu w transakcji" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4147,12 +4147,6 @@ msgstr "Dozwolony ujemny stan" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4365,8 +4359,11 @@ msgstr "" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4458,7 +4455,7 @@ msgstr "" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4655,7 +4652,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4685,7 +4682,6 @@ msgstr "" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4855,10 +4851,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5478,7 +5470,7 @@ msgstr "" msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "" -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "" @@ -5628,7 +5620,7 @@ msgstr "" msgid "Asset Category Name" msgstr "Zaleta Nazwa kategorii" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "Kategoria atutem jest obowiązkowe dla Fixed pozycja aktywów" @@ -6024,7 +6016,7 @@ msgstr "Zasób {0} nie został przesłany. Proszę przesłać zasób przed konty msgid "Asset {0} must be submitted" msgstr "" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6062,11 +6054,11 @@ msgstr "" msgid "Assets Setup" msgstr "Ustawienia zasobów" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "Zasoby nie zostały utworzone dla {item_code}. Będziesz musiał utworzyć zasób ręcznie." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "" @@ -6139,7 +6131,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "" @@ -6171,7 +6163,7 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "" @@ -6235,7 +6227,11 @@ msgstr "" msgid "Attribute Value" msgstr "Wartość atrybutu" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "" @@ -6243,11 +6239,19 @@ msgstr "" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "" @@ -6307,24 +6311,12 @@ msgstr "Autoryzowany Wartość" msgid "Auto Create Exchange Rate Revaluation" msgstr "" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6443,6 +6435,18 @@ msgstr "Błąd automatycznego tworzenia użytkownika" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6660,7 +6664,7 @@ msgstr "" msgid "Available for use date is required" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "" @@ -6759,7 +6763,7 @@ msgstr "" msgid "BIN Qty" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7032,7 +7036,7 @@ msgstr "BOM Website Element" msgid "BOM Website Operation" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7123,8 +7127,8 @@ msgstr "Surowiec do płukania zwrotnego z magazynu w toku" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "Rozliczenie wsteczne materiałów podwykonawstwa" +msgid "Backflush raw materials of subcontract based on" +msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7144,7 +7148,7 @@ msgstr "" msgid "Balance (Dr - Cr)" msgstr "Balans (Dr - Cr)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "" @@ -7675,11 +7679,11 @@ msgstr "" msgid "Barcode Type" msgstr "" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "" @@ -8046,12 +8050,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "Batch {0} pozycji {1} wygasł." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -8124,7 +8128,7 @@ msgstr "" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" +msgid "Bill for rejected quantity in Purchase Invoice" msgstr "" #. Label of a Card Break in the Manufacturing Workspace @@ -8465,8 +8469,11 @@ msgstr "" msgid "Blanket Order Rate" msgstr "Ogólny koszt zamówienia" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -8981,7 +8988,7 @@ msgstr "" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "" @@ -9346,7 +9353,7 @@ msgstr "" msgid "Can only make payment against unbilled {0}" msgstr "Mogą jedynie wpłaty przed Unbilled {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9402,9 +9409,9 @@ msgstr "" msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "" @@ -9432,7 +9439,7 @@ msgstr "" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "" @@ -9468,7 +9475,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9476,7 +9483,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "" -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "" @@ -9488,7 +9495,7 @@ msgstr "" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "" @@ -9516,11 +9523,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9546,7 +9553,7 @@ msgstr "Nie można zadeklarować jako zagubiony z powodu utworzenia kwotacji" msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -9583,7 +9590,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9591,8 +9598,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "Nie można zapewnić dostawy według numeru seryjnego, ponieważ pozycja {0} jest dodawana zi bez opcji Zapewnij dostawę według numeru seryjnego." @@ -9636,7 +9643,7 @@ msgstr "" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9654,8 +9661,8 @@ msgstr "" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9671,7 +9678,7 @@ msgstr "" msgid "Cannot set authorization on basis of Discount for {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "" @@ -10582,7 +10589,7 @@ msgstr "" msgid "Closing (Dr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "" @@ -11043,7 +11050,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11325,7 +11332,7 @@ msgstr "" msgid "Company Abbreviation" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11338,7 +11345,7 @@ msgstr "" msgid "Company Account" msgstr "Konto firmowe" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "Konto firmowe jest obowiązkowe" @@ -11514,7 +11521,7 @@ msgstr "Filtr firmy nie został ustawiony!" msgid "Company is mandatory" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "" @@ -11785,7 +11792,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11798,7 +11805,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11816,13 +11825,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "" @@ -12000,7 +12009,7 @@ msgstr "" msgid "Consumed" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "" @@ -12044,7 +12053,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12217,10 +12226,6 @@ msgstr "" msgid "Contact:" msgstr "Kontakt:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Kontakt: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12398,7 +12403,7 @@ msgstr "" msgid "Conversion Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "" @@ -12670,7 +12675,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12765,7 +12770,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "" @@ -13103,7 +13108,7 @@ msgstr "Utwórz produkty gotowe" msgid "Create Grouped Asset" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "" @@ -13476,7 +13481,7 @@ msgstr "" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "" @@ -13618,15 +13623,15 @@ msgstr "" msgid "Credit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "" @@ -13821,7 +13826,7 @@ msgstr "" msgid "Creditors" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14119,7 +14124,7 @@ msgstr "" msgid "Current Serial No" msgstr "Aktualny numer seryjny" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14320,7 +14325,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15093,7 +15098,7 @@ msgstr "" msgid "Day Of Week" msgstr "Dzień tygodnia" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15209,11 +15214,11 @@ msgstr "" msgid "Debit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "" @@ -15223,7 +15228,7 @@ msgstr "" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "" @@ -15334,7 +15339,7 @@ msgstr "" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15476,7 +15481,7 @@ msgstr "" msgid "Default BOM" msgstr "Domyślne Zestawienie Materiałów" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "" @@ -15833,15 +15838,15 @@ msgstr "Domyślne terytorium" msgid "Default Unit of Measure" msgstr "Domyślna jednostka miary" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "" -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "" @@ -16142,7 +16147,7 @@ msgstr "" msgid "Delivered" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "" @@ -16192,8 +16197,8 @@ msgstr "" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16204,11 +16209,11 @@ msgstr "" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16297,7 +16302,7 @@ msgstr "" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16822,7 +16827,7 @@ msgstr "" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "Konto różnicowe musi być kontem typu Aktywa/Zobowiązania, ponieważ ta rekonsyliacja magazynowa jest wpisem otwarcia" @@ -16986,10 +16991,8 @@ msgstr "" msgid "Disable In Words" msgstr "" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' @@ -17031,6 +17034,12 @@ msgstr "" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17087,7 +17096,7 @@ msgstr "" msgid "Disassemble Order" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17612,6 +17621,12 @@ msgstr "" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17702,9 +17717,12 @@ msgstr "" msgid "Document Count" msgstr "Liczba dokumentów" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17722,6 +17740,10 @@ msgstr "" msgid "Document Type already used as a dimension" msgstr "" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18026,7 +18048,7 @@ msgstr "" msgid "Duplicate Sales Invoices found" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18146,8 +18168,8 @@ msgstr "ERPNext Identyfikator użytkownika" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18370,7 +18392,7 @@ msgstr "" msgid "Email Sent to Supplier {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "Adres e-mail jest wymagany do utworzenia użytkownika" @@ -18560,7 +18582,7 @@ msgstr "" msgid "Employee cannot report to himself." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "Pracownik jest wymagany" @@ -18568,7 +18590,7 @@ msgstr "Pracownik jest wymagany" msgid "Employee is required while issuing Asset {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "Pracownik {0} ma już połączonego użytkownika" @@ -18581,7 +18603,7 @@ msgstr "Pracownik {0} nie należy do firmy {1}" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "Pracownik {0} nie został znaleziony" @@ -18624,7 +18646,7 @@ msgstr "Włącz harmonogram spotkań" msgid "Enable Auto Email" msgstr "" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "" @@ -19222,7 +19244,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "" @@ -19268,7 +19290,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "" @@ -19297,7 +19319,7 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "Rola zatwierdzającego wyjątku dla budżetu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19656,7 +19678,7 @@ msgstr "Przewidywany okres użytkowania wartości po" msgid "Expense" msgstr "" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "" @@ -19704,7 +19726,7 @@ msgstr "" msgid "Expense Account" msgstr "" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "" @@ -20167,7 +20189,7 @@ msgstr "" msgid "Filter by Reference Date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20497,7 +20519,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20592,7 +20614,7 @@ msgstr "" msgid "Fiscal Year" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20656,7 +20678,7 @@ msgstr "Konto trwałego" msgid "Fixed Asset Defaults" msgstr "" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "" @@ -20806,7 +20828,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20837,7 +20859,7 @@ msgstr "Dla Listy Cen" msgid "For Production" msgstr "Dla Produkcji" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "" @@ -20921,6 +20943,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20942,7 +20970,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -20951,7 +20979,7 @@ msgstr "" msgid "For reference" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" @@ -20975,7 +21003,7 @@ msgstr "" msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "Dla wygody klientów, te kody mogą być użyte w formacie drukowania jak faktury czy dowody dostawy" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -20984,7 +21012,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "Dla {0} brak zapasów na zwrot w magazynie {1}." @@ -21597,7 +21625,7 @@ msgstr "" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21609,7 +21637,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "" @@ -22124,7 +22152,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -22307,7 +22335,7 @@ msgstr "" msgid "Grant Commission" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "" @@ -22948,10 +22976,10 @@ msgstr "" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23106,7 +23134,7 @@ msgstr "Jeśli operacja jest podzielona na podoperacje, można je tutaj dodać." msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "Jeśli puste, nadrzędne konto magazynu lub wartość domyślna firmy będą brane pod uwagę w transakcjach" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23288,7 +23316,7 @@ msgstr "" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23460,11 +23488,11 @@ msgstr "" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "Jeśli ta opcja jest ustawiona na 'Tak', ERPNext uniemożliwi tworzenie faktury zakupu lub przyjęcia zakupu bez wcześniejszego utworzenia zamówienia zakupu. Można to zmienić dla konkretnego dostawcy, zaznaczając pole wyboru 'Zezwól na tworzenie faktury zakupu bez zamówienia zakupu' w kartotece dostawcy." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "Jeśli ta opcja jest ustawiona na 'Tak', ERPNext uniemożliwi tworzenie faktury zakupu bez wcześniejszego utworzenia przyjęcia zakupu. Można to zmienić dla konkretnego dostawcy, zaznaczając pole wyboru 'Zezwól na tworzenie faktury zakupu bez przyjęcia zakupu' w kartotece dostawcy." @@ -23580,7 +23608,7 @@ msgstr "" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23632,7 +23660,7 @@ msgstr "" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "" @@ -23675,7 +23703,7 @@ msgstr "Zignoruj nakładanie się czasu w stacji roboczej" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23689,6 +23717,7 @@ msgid "Implementation Partner" msgstr "" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24042,7 +24071,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24296,7 +24325,7 @@ msgstr "" msgid "Incorrect Batch Consumed" msgstr "" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" @@ -24304,7 +24333,7 @@ msgstr "" msgid "Incorrect Company" msgstr "Nieprawidłowa firma" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "" @@ -24514,14 +24543,14 @@ msgstr "" msgid "Inspected By" msgstr "" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "" @@ -24538,7 +24567,7 @@ msgstr "Wymagane Kontrola przed dostawą" msgid "Inspection Required before Purchase" msgstr "Wymagane Kontrola przed zakupem" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "" @@ -24620,8 +24649,8 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "" @@ -24841,7 +24870,7 @@ msgstr "" msgid "Internal Work History" msgstr "Wewnętrzne Historia Pracuj" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -24934,7 +24963,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -24964,7 +24993,7 @@ msgstr "" msgid "Invalid Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "" @@ -25050,12 +25079,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25092,7 +25121,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "" @@ -25221,7 +25250,6 @@ msgstr "" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "" @@ -25242,10 +25270,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25767,13 +25791,13 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "Czy do wystawienia faktury i paragonu zakupu wymagane jest zamówienie zakupu?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "Czy do utworzenia faktury zakupu jest wymagany dowód zakupu?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -26045,7 +26069,7 @@ msgstr "" msgid "Issuing Date" msgstr "Data emisji" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" @@ -26115,7 +26139,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26162,6 +26186,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26177,7 +26202,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26941,6 +26965,7 @@ msgstr "" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26951,7 +26976,6 @@ msgstr "" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27211,11 +27235,11 @@ msgstr "" msgid "Item Variant {0} already exists with same attributes" msgstr "" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "" @@ -27254,6 +27278,15 @@ msgstr "" msgid "Item Weight Details" msgstr "Szczegóły dotyczące wagi przedmiotu" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27283,7 +27316,7 @@ msgstr "" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27303,11 +27336,11 @@ msgstr "" msgid "Item and Warranty Details" msgstr "Przedmiot i gwarancji Szczegóły" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "" @@ -27337,7 +27370,7 @@ msgstr "Obsługa przedmiotu" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27356,10 +27389,14 @@ msgstr "Jednostkowy wskaźnik wyceny przeliczone z uwzględnieniem kosztów ilo msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27373,7 +27410,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "" @@ -27381,7 +27418,7 @@ msgstr "" msgid "Item {0} does not exist in the system or has expired" msgstr "" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "" @@ -27397,15 +27434,15 @@ msgstr "" msgid "Item {0} has been disabled" msgstr "Przedmiot {0} został wyłączony" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "" @@ -27417,19 +27454,23 @@ msgstr "" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "" @@ -27437,7 +27478,11 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -27453,7 +27498,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27469,7 +27514,7 @@ msgstr "" msgid "Item {0}: {1} qty produced. " msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "" @@ -27579,7 +27624,7 @@ msgstr "" msgid "Items not found." msgstr "Nie znaleziono elementów." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -28212,7 +28257,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28490,7 +28535,7 @@ msgstr "" msgid "Length (cm)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "" @@ -28631,7 +28676,7 @@ msgstr "" msgid "Linked Location" msgstr "" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "" @@ -29026,11 +29071,6 @@ msgstr "" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "Utrzymuj tę samą stawkę w całym cyklu zakupu" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29042,6 +29082,11 @@ msgstr "Utrzymanie Zapasów" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29238,7 +29283,7 @@ msgid "Major/Optional Subjects" msgstr "Główne/Opcjonalne Tematy" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29407,8 +29452,8 @@ msgstr "" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29467,8 +29512,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29617,7 +29662,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "" @@ -29893,7 +29938,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "Zużycie materiału do produkcji" @@ -29964,6 +30009,7 @@ msgstr "" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30070,11 +30116,11 @@ msgstr "" msgid "Material Request Type" msgstr "Typ zamówienia produktu" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "" @@ -30189,7 +30235,7 @@ msgstr "Materiał Przeniesiony do Produkcji" msgid "Material Transferred for Manufacturing" msgstr "Materiał Przeniesiony do Produkowania" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30318,11 +30364,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -30766,11 +30812,11 @@ msgstr "Pozostałe" msgid "Miscellaneous Expenses" msgstr "" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "" @@ -30808,7 +30854,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "" @@ -30816,11 +30862,11 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "Brakujący parametr" @@ -30864,10 +30910,6 @@ msgstr "" msgid "Mixed Conditions" msgstr "Warunki mieszane" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "Mobilny: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31136,7 +31178,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:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31215,27 +31257,20 @@ msgstr "" msgid "Naming Series Prefix" msgstr "" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31283,16 +31318,16 @@ msgstr "" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "" @@ -31906,7 +31941,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "" @@ -31919,7 +31954,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "" @@ -31964,7 +31999,7 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "" @@ -31977,7 +32012,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "" @@ -31989,7 +32024,7 @@ msgstr "" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -31997,7 +32032,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32091,7 +32126,7 @@ msgstr "" msgid "No more children on Right" msgstr "" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32266,7 +32301,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32358,7 +32393,7 @@ msgstr "" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "" @@ -32462,7 +32497,7 @@ msgstr "" msgid "Not authorized to edit frozen Account {0}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32508,7 +32543,7 @@ msgstr "" msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "" -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -32985,7 +33020,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33136,7 +33171,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "" @@ -33295,16 +33330,16 @@ msgstr "" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33661,7 +33696,7 @@ msgstr "" msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33795,7 +33830,7 @@ msgstr "" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "" @@ -34003,7 +34038,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34061,7 +34096,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "Dopuszczalne przekroczenie fakturowania (%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34079,7 +34114,7 @@ msgstr "Dopuszczalne przekroczenie dostawy/przyjęcia (%)" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "" @@ -34322,7 +34357,6 @@ msgstr "" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "" @@ -34593,7 +34627,7 @@ msgstr "" msgid "Packed Items" msgstr "Przedmioty pakowane" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -35041,7 +35075,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35177,7 +35211,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35303,7 +35337,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35389,7 +35423,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35692,7 +35726,6 @@ msgstr "" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35950,7 +35983,7 @@ msgstr "Odniesienia płatności" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36029,10 +36062,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37052,7 +37081,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "" @@ -37084,11 +37113,11 @@ msgstr "" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "" @@ -37108,7 +37137,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -37215,7 +37244,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "" @@ -37284,11 +37313,11 @@ msgstr "" msgid "Please enter Approving Role or Approving User" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "Proszę wprowadzić numer partii" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "" @@ -37300,7 +37329,7 @@ msgstr "" msgid "Please enter Employee Id of this sales person" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "" @@ -37345,7 +37374,7 @@ msgstr "" msgid "Please enter Root Type for account- {0}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "Proszę wprowadzić numer seryjny" @@ -37422,7 +37451,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37536,12 +37565,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "" @@ -37557,13 +37586,13 @@ msgstr "" msgid "Please select Category first" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "" @@ -37572,7 +37601,7 @@ msgstr "" msgid "Please select Company and Posting Date to getting entries" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "" @@ -37621,7 +37650,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "" @@ -37629,11 +37658,11 @@ msgstr "" msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "" @@ -37686,7 +37715,7 @@ msgstr "" msgid "Please select a Supplier" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "" @@ -37747,7 +37776,7 @@ msgstr "Proszę wybrać wiersz, aby utworzyć wpis przeksięgowania" msgid "Please select a supplier for fetching payments." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37767,7 +37796,7 @@ msgstr "" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "Wybierz co najmniej jeden filtr: kod produktu, serię lub numer seryjny." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37874,7 +37903,7 @@ msgstr "" msgid "Please select weekly off day" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "" @@ -38014,7 +38043,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -38058,7 +38087,7 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" @@ -38177,7 +38206,7 @@ msgstr "" msgid "Please specify at least one attribute in the Attributes table" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "" @@ -38348,7 +38377,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38373,7 +38402,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38488,7 +38517,7 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "" @@ -38667,6 +38696,12 @@ msgstr "Konserwacja zapobiegawcza" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -38960,7 +38995,9 @@ msgstr "" msgid "Price per Unit (Stock UOM)" msgstr "" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40315,6 +40352,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40351,6 +40389,12 @@ msgstr "" msgid "Purchase Invoice Item" msgstr "" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40402,6 +40446,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40411,7 +40456,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40528,7 +40573,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "" @@ -40591,6 +40636,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40605,7 +40651,7 @@ msgstr "" msgid "Purchase Receipt" msgstr "" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40871,7 +40917,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41459,7 +41504,7 @@ msgstr "" msgid "Quality Review Objective" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41520,7 +41565,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41714,7 +41759,7 @@ msgstr "" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "" @@ -41769,7 +41814,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41932,7 +41977,6 @@ msgstr "Wywołany przez (Email)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42342,8 +42386,8 @@ msgstr "" msgid "Raw SQL" msgstr "" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42751,11 +42795,10 @@ msgstr "" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43279,7 +43322,7 @@ msgstr "" msgid "Rejected Warehouse" msgstr "Odrzucony Magazyn" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "" @@ -43329,7 +43372,7 @@ msgid "Remaining Balance" msgstr "" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43383,7 +43426,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43422,7 +43465,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "Usuń element, jeśli opłata nie ma zastosowania do tej pozycji" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "" @@ -43826,6 +43869,7 @@ msgstr "Prośba o informację" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44099,7 +44143,7 @@ msgstr "" msgid "Reserved" msgstr "" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44712,7 +44756,7 @@ msgstr "" msgid "Reversal Of" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "" @@ -44861,10 +44905,7 @@ msgstr "" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "" @@ -44879,8 +44920,11 @@ msgstr "" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45081,8 +45125,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -45109,11 +45153,11 @@ msgstr "Nazwa trasy" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45139,7 +45183,7 @@ msgstr "" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "" @@ -45340,7 +45384,7 @@ msgstr "Wiersz #{0}: Zduplikowany wpis w referencjach {1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -45400,7 +45444,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45428,7 +45472,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "Wiersz #{0}: Przedmiot {1} nie jest seryjny ani partiowy. Nie można przypisać numeru seryjnego/partii do niego." @@ -45481,7 +45525,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "" @@ -45506,7 +45550,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Wiersz #{0}: Proszę wybrać magazyn podmontażowy" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "" @@ -45532,15 +45576,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "Wiersz #{0}: Ilość powinna być mniejsza lub równa dostępnej ilości do rezerwacji (rzeczywista ilość - zarezerwowana ilość) {1} dla przedmiotu {2} w partii {3} w magazynie {4}." -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45571,11 +45615,11 @@ msgstr "" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "" @@ -45618,7 +45662,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "\t\t\t\t\tSprzedaż {3} powinna wynosić co najmniej {4}.

Alternatywnie," @@ -45666,11 +45710,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45723,11 +45767,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "" -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "" @@ -45755,7 +45799,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "" @@ -45791,23 +45835,23 @@ msgstr "" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "Wiersz #{idx}: Nie można wybrać magazynu dostawcy podczas dostarczania surowców do podwykonawcy." -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "Wiersz #{idx}: Stawka przedmiotu została zaktualizowana zgodnie z wyceną, ponieważ jest to transfer wewnętrzny zapasów." -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "Wiersz #{idx}: Odebrana ilość musi być równa zaakceptowanej + odrzuconej ilości dla przedmiotu {item_code}." -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "Wiersz #{idx}: {field_label} nie może być ujemne dla przedmiotu {item_code}." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45815,7 +45859,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45880,7 +45924,7 @@ msgstr "Wiersz #{}: {}" msgid "Row #{}: {} {} does not exist." msgstr "Wiersz #{}: {} {} nie istnieje." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "Wiersz #{}: {} {} nie należy do firmy {}. Proszę wybrać poprawne {}." @@ -45896,7 +45940,7 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "Wiersz {0}# Przedmiot {1} nie znaleziony w tabeli 'Dostarczone surowce' w {2} {3}" @@ -45928,7 +45972,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:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -45986,7 +46030,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "" @@ -46027,7 +46071,7 @@ msgstr "" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -46151,7 +46195,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "" @@ -46163,11 +46207,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:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -46191,7 +46235,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:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46244,7 +46288,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:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -46274,7 +46318,7 @@ msgstr "" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "Wiersze: {0} mają „Payment Entry” jako typ referencji. Nie powinno to być ustawiane ręcznie." @@ -46340,7 +46384,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46637,7 +46681,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46811,7 +46855,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46934,8 +46978,8 @@ msgstr "" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47346,7 +47390,7 @@ msgstr "" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "" @@ -47383,7 +47427,7 @@ msgstr "Przykładowy magazyn retencyjny" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -47674,7 +47718,7 @@ msgstr "" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47819,7 +47863,7 @@ msgstr "" msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "" @@ -48514,7 +48558,7 @@ msgstr "" msgid "Serial No Reserved" msgstr "" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48575,7 +48619,7 @@ msgstr "" msgid "Serial No is mandatory for Item {0}" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "" @@ -48861,7 +48905,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48887,7 +48931,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49285,12 +49329,6 @@ msgstr "" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "" @@ -49396,6 +49434,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "" @@ -49894,7 +49938,7 @@ msgstr "" msgid "Show Barcode Field in Stock Transactions" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "" @@ -49902,7 +49946,7 @@ msgstr "" msgid "Show Completed" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -49985,7 +50029,7 @@ msgstr "" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "" @@ -49997,7 +50041,7 @@ msgstr "" msgid "Show Open" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "" @@ -50010,11 +50054,6 @@ msgstr "" msgid "Show Operations" msgstr "Pokaż Operations" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "" @@ -50030,7 +50069,7 @@ msgstr "Pokaż harmonogram płatności w druku" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "" @@ -50097,6 +50136,11 @@ msgstr "" msgid "Show only the Immediate Upcoming Term" msgstr "" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "" @@ -50383,11 +50427,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50453,7 +50497,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "" @@ -50467,8 +50511,8 @@ msgid "Source of Funds (Liabilities)" msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "" @@ -50633,8 +50677,8 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "" @@ -50967,7 +51011,7 @@ msgstr "" msgid "Stock Details" msgstr "Zdjęcie Szczegóły" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -51238,7 +51282,7 @@ msgstr "" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51250,7 +51294,7 @@ msgstr "" msgid "Stock Reconciliation Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "" @@ -51288,7 +51332,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51316,7 +51360,7 @@ msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "" @@ -51698,7 +51742,7 @@ msgstr "" #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "" @@ -51776,10 +51820,6 @@ msgstr "Podoperacje" msgid "Sub Procedure" msgstr "Procedura podrzędna" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -51996,7 +52036,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52022,7 +52062,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "" @@ -52111,7 +52151,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "" @@ -52286,7 +52326,7 @@ msgstr "" msgid "Successfully Set Supplier" msgstr "" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "" @@ -52442,6 +52482,7 @@ msgstr "" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52483,8 +52524,8 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52532,6 +52573,12 @@ msgstr "" msgid "Supplier Contact" msgstr "" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52626,7 +52673,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "" @@ -52906,19 +52953,10 @@ msgstr "" msgid "Supplier {0} not found in {1}" msgstr "Dostawca {0} nie znaleziony w {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -52980,7 +53018,7 @@ msgstr "" msgid "Support Tickets" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53239,8 +53277,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "" @@ -53708,7 +53746,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "" @@ -53869,7 +53907,7 @@ msgstr "Podatki i opłaty potrącenia" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "Podatki i opłaty potrącone (Firmowe)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "" @@ -54059,7 +54097,6 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54251,7 +54288,7 @@ msgstr "" msgid "The BOM which will be replaced" msgstr "BOM zostanie zastąpiony" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54295,7 +54332,7 @@ msgstr "Warunek płatności w wierszu {0} prawdopodobnie jest zduplikowany." 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:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54311,7 +54348,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "" @@ -54347,7 +54384,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54453,7 +54490,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "" @@ -54497,15 +54534,15 @@ msgstr "" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54661,7 +54698,7 @@ msgstr "" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "Zapasy dla pozycji {0} w magazynie {1} były ujemne w dniu {2}. Powinieneś utworzyć pozytywny zapis {3} przed datą {4} i godziną {5}, aby zaksięgować prawidłową wartość wyceny. Aby uzyskać więcej informacji, przeczytaj dokumentację." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "" @@ -54683,11 +54720,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -54759,7 +54796,7 @@ msgstr "" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54812,7 +54849,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54856,7 +54893,7 @@ msgstr "" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54912,11 +54949,11 @@ msgstr "" msgid "This Month's Summary" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55717,7 +55754,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "" @@ -55752,7 +55789,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "" @@ -55903,7 +55940,7 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "" @@ -56326,7 +56363,7 @@ msgstr "" msgid "Total Payments" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56358,7 +56395,7 @@ msgstr "Całkowity koszt zakupu (faktura zakupu za pośrednictwem)" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "" @@ -56744,7 +56781,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56755,7 +56792,7 @@ msgstr "" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "" @@ -57427,11 +57464,11 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57503,7 +57540,7 @@ msgstr "Współczynnik konwersji jm jest wymagany w wierszu {0}" msgid "UOM Name" msgstr "Nazwa Jednostki Miary" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "Wymagany współczynnik konwersji jm dla jm: {0} w pozycji: {1}" @@ -57579,7 +57616,7 @@ msgstr "" msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "" @@ -57698,7 +57735,7 @@ msgstr "" msgid "Unit of Measure (UOM)" msgstr "" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "" @@ -57818,10 +57855,9 @@ msgid "Unreconcile Transaction" msgstr "" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "" @@ -57844,10 +57880,6 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57893,7 +57925,7 @@ msgstr "Nieplanowany" msgid "Unsecured Loans" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58108,12 +58140,6 @@ msgstr "Aktualizuj Stan" msgid "Update Type" msgstr "" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58154,7 +58180,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "" @@ -58612,12 +58638,6 @@ msgstr "Sprawdź poprawność zastosowanej reguły" msgid "Validate Components and Quantities Per BOM" msgstr "Zwaliduj komponenty i ilości na BOM-ie" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58641,6 +58661,12 @@ msgstr "Zwaliduj regułę wyceny" msgid "Validate Stock on Save" msgstr "Zwaliduj zapasy podczas zapisu" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58747,11 +58773,11 @@ msgstr "" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "" -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "" @@ -58761,7 +58787,7 @@ msgstr "" msgid "Valuation and Total" msgstr "Wycena i kwota całkowita" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "" @@ -58911,7 +58937,7 @@ msgstr "" msgid "Variant" msgstr "" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "" @@ -58930,7 +58956,7 @@ msgstr "" msgid "Variant Based On" msgstr "" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "" @@ -58948,7 +58974,7 @@ msgstr "" msgid "Variant Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "" @@ -59329,7 +59355,7 @@ msgstr "Nazwa Voucheru" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59369,7 +59395,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "Podtyp Voucheru" @@ -59401,7 +59427,7 @@ msgstr "Podtyp Voucheru" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59636,7 +59662,7 @@ msgstr "Magazyn {0} nie istnieje" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "" @@ -59683,7 +59709,7 @@ msgstr "" #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59739,6 +59765,12 @@ msgstr "Ostrzegaj przed nowym żądaniem ofert" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "Ostrzeżenie - Wiersz {0}: Godziny rozliczeniowe są większe niż rzeczywiste godziny" @@ -59922,7 +59954,7 @@ msgstr "" msgid "Website:" msgstr "Strona WWW:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60296,7 +60328,7 @@ msgstr "" msgid "Work Order Item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60358,11 +60390,11 @@ msgstr "" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "" @@ -60678,11 +60710,11 @@ msgstr "" msgid "Year Start Date" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60735,7 +60767,7 @@ msgstr "" msgid "You can also set default CWIP account in Company {}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60889,6 +60921,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60917,7 +60953,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "Wprowadziłeś zduplikowaną notę dostawy w wierszu." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60925,7 +60961,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "" @@ -60996,8 +61032,11 @@ msgstr "" msgid "Zero quantity" msgstr "" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61109,7 +61148,7 @@ msgstr "" msgid "fieldname" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61327,6 +61366,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "unikatowy np. SAVE20 Do wykorzystania w celu uzyskania rabatu" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "" @@ -61385,7 +61428,8 @@ msgstr "" msgid "{0} Digest" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61405,7 +61449,7 @@ msgstr "" msgid "{0} Request for {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "" @@ -61518,7 +61562,7 @@ msgid "{0} entered twice in Item Tax" msgstr "" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "" @@ -61686,7 +61730,7 @@ msgstr "" msgid "{0} payment entries can not be filtered by {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61699,7 +61743,7 @@ msgstr "{0} do {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" @@ -61901,7 +61945,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -61987,23 +62031,23 @@ msgstr "" msgid "{0}: {1} is a group account." msgstr "{0}: {1} jest kontem grupowym." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} zostanie anulowane lub zamknięte." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" diff --git a/erpnext/locale/pt.po b/erpnext/locale/pt.po index c005a5ecaed..d918d638cb1 100644 --- a/erpnext/locale/pt.po +++ b/erpnext/locale/pt.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:21\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:20\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Portuguese\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr "" msgid " Summary" msgstr " Resumo" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "" @@ -302,7 +302,7 @@ msgstr "" msgid "'From Date' must be after 'To Date'" msgstr "" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "" @@ -338,7 +338,7 @@ msgstr "" msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "A conta \"{0}\" já está sendo utilizada por {1}. Utilize outra conta." @@ -999,7 +999,7 @@ msgstr "" msgid "A logical Warehouse against which stock entries are made." msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1211,7 +1211,7 @@ msgstr "A Chave de Acesso é necessária para o Provedor de Serviço: {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1881,8 +1881,8 @@ msgstr "" msgid "Accounting Entry for Asset" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1890,7 +1890,7 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "" @@ -1903,16 +1903,16 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "" @@ -2210,12 +2210,6 @@ msgstr "" msgid "Action If Quality Inspection Is Rejected" msgstr "" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "" @@ -2274,6 +2268,12 @@ msgstr "" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2541,7 +2541,7 @@ msgstr "" msgid "Actual qty in stock" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "" @@ -2555,7 +2555,7 @@ msgstr "" msgid "Add / Edit Prices" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "" @@ -2709,7 +2709,7 @@ msgstr "" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -2954,7 +2954,7 @@ msgstr "" msgid "Additional Discount Amount (Company Currency)" msgstr "Quantia de Desconto Adicional (Moeda da Empresa)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -3239,7 +3239,7 @@ msgstr "Ajustar a quantidade" msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3352,7 +3352,7 @@ msgstr "" msgid "Advance amount" msgstr "Valor do Adiantamento" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "O montante do adiantamento não pode ser maior do que {0} {1}" @@ -3421,7 +3421,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "" @@ -3539,7 +3539,7 @@ msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "" @@ -3563,7 +3563,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "" @@ -3844,7 +3844,7 @@ msgstr "" msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "" @@ -3852,7 +3852,7 @@ msgstr "" msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "" @@ -3901,7 +3901,7 @@ msgstr "" msgid "Allocate Advances Automatically (FIFO)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "" @@ -3911,7 +3911,7 @@ msgstr "" msgid "Allocate Payment Based On Payment Terms" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "" @@ -3941,7 +3941,7 @@ msgstr "" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4062,15 +4062,15 @@ msgstr "" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4099,12 +4099,6 @@ msgstr "" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4317,8 +4311,11 @@ msgstr "" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4410,7 +4407,7 @@ msgstr "" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4607,7 +4604,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4637,7 +4634,6 @@ msgstr "" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4807,10 +4803,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5430,7 +5422,7 @@ msgstr "" msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "" -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "" @@ -5580,7 +5572,7 @@ msgstr "" msgid "Asset Category Name" msgstr "" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "" @@ -5976,7 +5968,7 @@ msgstr "O Ativo {0} não está submetido. Por favor, submeta o ativo antes de co msgid "Asset {0} must be submitted" msgstr "" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6014,11 +6006,11 @@ msgstr "" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "" -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "" @@ -6091,7 +6083,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "" @@ -6123,7 +6115,7 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "" @@ -6187,7 +6179,11 @@ msgstr "" msgid "Attribute Value" msgstr "" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "" @@ -6195,11 +6191,19 @@ msgstr "" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "" @@ -6259,24 +6263,12 @@ msgstr "" msgid "Auto Create Exchange Rate Revaluation" msgstr "" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6395,6 +6387,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6612,7 +6616,7 @@ msgstr "" msgid "Available for use date is required" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "" @@ -6711,7 +6715,7 @@ msgstr "" msgid "BIN Qty" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -6984,7 +6988,7 @@ msgstr "" msgid "BOM Website Operation" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7075,7 +7079,7 @@ msgstr "" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" +msgid "Backflush raw materials of subcontract based on" msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' @@ -7096,7 +7100,7 @@ msgstr "" msgid "Balance (Dr - Cr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "" @@ -7627,11 +7631,11 @@ msgstr "" msgid "Barcode Type" msgstr "" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "" @@ -7998,12 +8002,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -8076,7 +8080,7 @@ msgstr "" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" +msgid "Bill for rejected quantity in Purchase Invoice" msgstr "" #. Label of a Card Break in the Manufacturing Workspace @@ -8417,8 +8421,11 @@ msgstr "" msgid "Blanket Order Rate" msgstr "" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -8933,7 +8940,7 @@ msgstr "" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "" @@ -9298,7 +9305,7 @@ msgstr "" msgid "Can only make payment against unbilled {0}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9354,9 +9361,9 @@ msgstr "" msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "" @@ -9384,7 +9391,7 @@ msgstr "" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "" @@ -9420,7 +9427,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9428,7 +9435,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "" -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "" @@ -9440,7 +9447,7 @@ msgstr "" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "" @@ -9468,11 +9475,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9498,7 +9505,7 @@ msgstr "" msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -9535,7 +9542,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9543,8 +9550,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "" @@ -9588,7 +9595,7 @@ msgstr "" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9606,8 +9613,8 @@ msgstr "" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9623,7 +9630,7 @@ msgstr "" msgid "Cannot set authorization on basis of Discount for {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "" @@ -10534,7 +10541,7 @@ msgstr "" msgid "Closing (Dr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "" @@ -10995,7 +11002,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11277,7 +11284,7 @@ msgstr "" msgid "Company Abbreviation" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11290,7 +11297,7 @@ msgstr "" msgid "Company Account" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "A Conta da Empresa é obrigatória" @@ -11466,7 +11473,7 @@ msgstr "" msgid "Company is mandatory" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "" @@ -11737,7 +11744,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11750,7 +11757,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11768,13 +11777,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "" @@ -11952,7 +11961,7 @@ msgstr "" msgid "Consumed" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "" @@ -11996,7 +12005,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12169,10 +12178,6 @@ msgstr "" msgid "Contact:" msgstr "Contacto:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "" - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12350,7 +12355,7 @@ msgstr "" msgid "Conversion Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "" @@ -12622,7 +12627,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12717,7 +12722,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "" @@ -13055,7 +13060,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "" @@ -13428,7 +13433,7 @@ msgstr "" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "" @@ -13569,15 +13574,15 @@ msgstr "" msgid "Credit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "" @@ -13772,7 +13777,7 @@ msgstr "" msgid "Creditors" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14070,7 +14075,7 @@ msgstr "" msgid "Current Serial No" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14271,7 +14276,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15044,7 +15049,7 @@ msgstr "" msgid "Day Of Week" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15160,11 +15165,11 @@ msgstr "" msgid "Debit" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "" @@ -15174,7 +15179,7 @@ msgstr "" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "" @@ -15285,7 +15290,7 @@ msgstr "" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15427,7 +15432,7 @@ msgstr "" msgid "Default BOM" msgstr "" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "" @@ -15784,15 +15789,15 @@ msgstr "" msgid "Default Unit of Measure" msgstr "" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "" -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "" @@ -16093,7 +16098,7 @@ msgstr "" msgid "Delivered" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "" @@ -16143,8 +16148,8 @@ msgstr "" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16155,11 +16160,11 @@ msgstr "" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16248,7 +16253,7 @@ msgstr "" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16773,7 +16778,7 @@ msgstr "" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "" @@ -16937,10 +16942,8 @@ msgstr "" msgid "Disable In Words" msgstr "" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' @@ -16982,6 +16985,12 @@ msgstr "" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17038,7 +17047,7 @@ msgstr "" msgid "Disassemble Order" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17563,6 +17572,12 @@ msgstr "" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17653,9 +17668,12 @@ msgstr "" msgid "Document Count" msgstr "Contagem de Documentos" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17673,6 +17691,10 @@ msgstr "" msgid "Document Type already used as a dimension" msgstr "" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -17977,7 +17999,7 @@ msgstr "" msgid "Duplicate Sales Invoices found" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18097,8 +18119,8 @@ msgstr "" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18321,7 +18343,7 @@ msgstr "" msgid "Email Sent to Supplier {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18511,7 +18533,7 @@ msgstr "" msgid "Employee cannot report to himself." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18519,7 +18541,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18532,7 +18554,7 @@ msgstr "O Empregado {0} não pertence à empresa {1}" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18575,7 +18597,7 @@ msgstr "" msgid "Enable Auto Email" msgstr "" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "" @@ -19173,7 +19195,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "" @@ -19219,7 +19241,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "" @@ -19248,7 +19270,7 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19607,7 +19629,7 @@ msgstr "" msgid "Expense" msgstr "" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "" @@ -19655,7 +19677,7 @@ msgstr "" msgid "Expense Account" msgstr "" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "" @@ -20118,7 +20140,7 @@ msgstr "" msgid "Filter by Reference Date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20448,7 +20470,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20543,7 +20565,7 @@ msgstr "" msgid "Fiscal Year" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20607,7 +20629,7 @@ msgstr "" msgid "Fixed Asset Defaults" msgstr "" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "" @@ -20757,7 +20779,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20788,7 +20810,7 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "" @@ -20872,6 +20894,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20893,7 +20921,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -20902,7 +20930,7 @@ msgstr "" msgid "For reference" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" @@ -20926,7 +20954,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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -20935,7 +20963,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -21548,7 +21576,7 @@ msgstr "" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21560,7 +21588,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "" @@ -22075,7 +22103,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -22258,7 +22286,7 @@ msgstr "" msgid "Grant Commission" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "" @@ -22899,10 +22927,10 @@ msgstr "" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23057,7 +23085,7 @@ msgstr "" msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23239,7 +23267,7 @@ msgstr "" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23411,11 +23439,11 @@ msgstr "" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "" @@ -23531,7 +23559,7 @@ msgstr "" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23583,7 +23611,7 @@ msgstr "" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "" @@ -23626,7 +23654,7 @@ msgstr "" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23640,6 +23668,7 @@ msgid "Implementation Partner" msgstr "" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -23993,7 +24022,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24247,7 +24276,7 @@ msgstr "" msgid "Incorrect Batch Consumed" msgstr "" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" @@ -24255,7 +24284,7 @@ msgstr "" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "" @@ -24465,14 +24494,14 @@ msgstr "Iniciado" msgid "Inspected By" msgstr "" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "" @@ -24489,7 +24518,7 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "" @@ -24571,8 +24600,8 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "" @@ -24792,7 +24821,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -24885,7 +24914,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -24915,7 +24944,7 @@ msgstr "" msgid "Invalid Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "" @@ -25001,12 +25030,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25043,7 +25072,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "" @@ -25172,7 +25201,6 @@ msgstr "" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "" @@ -25193,10 +25221,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25718,12 +25742,12 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' @@ -25996,7 +26020,7 @@ msgstr "" msgid "Issuing Date" msgstr "" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" @@ -26066,7 +26090,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26113,6 +26137,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26128,7 +26153,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26892,6 +26916,7 @@ msgstr "" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26902,7 +26927,6 @@ msgstr "" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27162,11 +27186,11 @@ msgstr "" msgid "Item Variant {0} already exists with same attributes" msgstr "" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "" @@ -27205,6 +27229,15 @@ msgstr "" msgid "Item Weight Details" msgstr "" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27234,7 +27267,7 @@ msgstr "" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27254,11 +27287,11 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "" @@ -27288,7 +27321,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27307,10 +27340,14 @@ msgstr "" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27324,7 +27361,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "" @@ -27332,7 +27369,7 @@ msgstr "" msgid "Item {0} does not exist in the system or has expired" msgstr "" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "" @@ -27348,15 +27385,15 @@ msgstr "" msgid "Item {0} has been disabled" msgstr "O Item {0} foi desativado" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "" @@ -27368,19 +27405,23 @@ msgstr "" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "" @@ -27388,7 +27429,11 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -27404,7 +27449,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27420,7 +27465,7 @@ msgstr "" msgid "Item {0}: {1} qty produced. " msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "" @@ -27530,7 +27575,7 @@ msgstr "" msgid "Items not found." msgstr "Artigos não encontrados." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -28163,7 +28208,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28441,7 +28486,7 @@ msgstr "" msgid "Length (cm)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "" @@ -28582,7 +28627,7 @@ msgstr "" msgid "Linked Location" msgstr "" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "" @@ -28977,11 +29022,6 @@ msgstr "" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -28993,6 +29033,11 @@ msgstr "" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29189,7 +29234,7 @@ msgid "Major/Optional Subjects" msgstr "" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29358,8 +29403,8 @@ msgstr "" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29418,8 +29463,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29568,7 +29613,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "" @@ -29844,7 +29889,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -29915,6 +29960,7 @@ msgstr "" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30021,11 +30067,11 @@ msgstr "" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "" @@ -30140,7 +30186,7 @@ msgstr "" msgid "Material Transferred for Manufacturing" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30269,11 +30315,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -30717,11 +30763,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "" @@ -30759,7 +30805,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "" @@ -30767,11 +30813,11 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30815,10 +30861,6 @@ msgstr "" msgid "Mixed Conditions" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "" - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31087,7 +31129,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:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31166,27 +31208,20 @@ msgstr "" msgid "Naming Series Prefix" msgstr "" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31234,16 +31269,16 @@ msgstr "" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "" @@ -31857,7 +31892,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "" @@ -31870,7 +31905,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "" @@ -31915,7 +31950,7 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "" @@ -31928,7 +31963,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "" @@ -31940,7 +31975,7 @@ msgstr "" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -31948,7 +31983,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32042,7 +32077,7 @@ msgstr "" msgid "No more children on Right" msgstr "" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32217,7 +32252,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32309,7 +32344,7 @@ msgstr "" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "" @@ -32413,7 +32448,7 @@ msgstr "" msgid "Not authorized to edit frozen Account {0}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32459,7 +32494,7 @@ msgstr "" msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "" -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -32936,7 +32971,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33087,7 +33122,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "" @@ -33246,16 +33281,16 @@ msgstr "" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33612,7 +33647,7 @@ msgstr "" msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33746,7 +33781,7 @@ msgstr "" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "" @@ -33954,7 +33989,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34012,7 +34047,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34030,7 +34065,7 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "" @@ -34273,7 +34308,6 @@ msgstr "" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "" @@ -34544,7 +34578,7 @@ msgstr "" msgid "Packed Items" msgstr "" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -34992,7 +35026,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35128,7 +35162,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35254,7 +35288,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35340,7 +35374,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35643,7 +35677,6 @@ msgstr "" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35901,7 +35934,7 @@ msgstr "" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -35980,10 +36013,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37003,7 +37032,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "" @@ -37035,11 +37064,11 @@ msgstr "" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "" @@ -37059,7 +37088,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -37166,7 +37195,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "" @@ -37235,11 +37264,11 @@ msgstr "" msgid "Please enter Approving Role or Approving User" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "Por favor, insira o N.º do Lote" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "" @@ -37251,7 +37280,7 @@ msgstr "" msgid "Please enter Employee Id of this sales person" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "" @@ -37296,7 +37325,7 @@ msgstr "" msgid "Please enter Root Type for account- {0}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "Por favor, insira o N.º de Série" @@ -37373,7 +37402,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37487,12 +37516,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "" @@ -37508,13 +37537,13 @@ msgstr "" msgid "Please select Category first" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "" @@ -37523,7 +37552,7 @@ msgstr "" msgid "Please select Company and Posting Date to getting entries" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "" @@ -37572,7 +37601,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "" @@ -37580,11 +37609,11 @@ msgstr "" msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "" @@ -37637,7 +37666,7 @@ msgstr "" msgid "Please select a Supplier" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "" @@ -37698,7 +37727,7 @@ msgstr "Por favor selecione uma linha para criar uma Entrada de Repostagem" msgid "Please select a supplier for fetching payments." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37718,7 +37747,7 @@ msgstr "" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "Selecione pelo menos um filtro: Código do Item, Lote ou N.º de Série." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37825,7 +37854,7 @@ msgstr "" msgid "Please select weekly off day" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "" @@ -37965,7 +37994,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -38009,7 +38038,7 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" @@ -38128,7 +38157,7 @@ msgstr "" msgid "Please specify at least one attribute in the Attributes table" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "" @@ -38299,7 +38328,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38324,7 +38353,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38439,7 +38468,7 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "" @@ -38618,6 +38647,12 @@ msgstr "" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -38911,7 +38946,9 @@ msgstr "" msgid "Price per Unit (Stock UOM)" msgstr "" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40266,6 +40303,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40302,6 +40340,12 @@ msgstr "" msgid "Purchase Invoice Item" msgstr "" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40353,6 +40397,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40362,7 +40407,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40479,7 +40524,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "" @@ -40542,6 +40587,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40556,7 +40602,7 @@ msgstr "" msgid "Purchase Receipt" msgstr "" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40822,7 +40868,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41410,7 +41455,7 @@ msgstr "" msgid "Quality Review Objective" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41471,7 +41516,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41665,7 +41710,7 @@ msgstr "" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "" @@ -41720,7 +41765,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41883,7 +41928,6 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42293,8 +42337,8 @@ msgstr "" msgid "Raw SQL" msgstr "" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42702,11 +42746,10 @@ msgstr "" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43230,7 +43273,7 @@ msgstr "" msgid "Rejected Warehouse" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "" @@ -43280,7 +43323,7 @@ msgid "Remaining Balance" msgstr "" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43334,7 +43377,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43373,7 +43416,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "" @@ -43777,6 +43820,7 @@ msgstr "" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44050,7 +44094,7 @@ msgstr "" msgid "Reserved" msgstr "" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44663,7 +44707,7 @@ msgstr "" msgid "Reversal Of" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "" @@ -44812,10 +44856,7 @@ msgstr "" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "" @@ -44830,8 +44871,11 @@ msgstr "" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45032,8 +45076,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -45060,11 +45104,11 @@ msgstr "" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45090,7 +45134,7 @@ msgstr "" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "" @@ -45291,7 +45335,7 @@ msgstr "" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -45351,7 +45395,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45379,7 +45423,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "" @@ -45432,7 +45476,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "" @@ -45457,7 +45501,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Linha #{0}: Selecione o Armazém de Submontagem" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "" @@ -45483,15 +45527,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45522,11 +45566,11 @@ msgstr "" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "" @@ -45569,7 +45613,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "" @@ -45617,11 +45661,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45674,11 +45718,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "" -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "" @@ -45706,7 +45750,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "" @@ -45742,23 +45786,23 @@ msgstr "" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45766,7 +45810,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45831,7 +45875,7 @@ msgstr "" msgid "Row #{}: {} {} does not exist." msgstr "" -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" @@ -45847,7 +45891,7 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -45879,7 +45923,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:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -45937,7 +45981,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "" @@ -45978,7 +46022,7 @@ msgstr "" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -46102,7 +46146,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "" @@ -46114,11 +46158,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:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -46142,7 +46186,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:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46195,7 +46239,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:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -46225,7 +46269,7 @@ msgstr "" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" @@ -46291,7 +46335,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46588,7 +46632,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46762,7 +46806,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46885,8 +46929,8 @@ msgstr "" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47297,7 +47341,7 @@ msgstr "" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "" @@ -47334,7 +47378,7 @@ msgstr "" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -47623,7 +47667,7 @@ msgstr "" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47768,7 +47812,7 @@ msgstr "" msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "" @@ -48463,7 +48507,7 @@ msgstr "" msgid "Serial No Reserved" msgstr "" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48524,7 +48568,7 @@ msgstr "" msgid "Serial No is mandatory for Item {0}" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "" @@ -48810,7 +48854,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48836,7 +48880,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49234,12 +49278,6 @@ msgstr "" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "" @@ -49345,6 +49383,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "" @@ -49843,7 +49887,7 @@ msgstr "" msgid "Show Barcode Field in Stock Transactions" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "" @@ -49851,7 +49895,7 @@ msgstr "" msgid "Show Completed" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -49934,7 +49978,7 @@ msgstr "" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "" @@ -49946,7 +49990,7 @@ msgstr "" msgid "Show Open" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "" @@ -49959,11 +50003,6 @@ msgstr "" msgid "Show Operations" msgstr "" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "" @@ -49979,7 +50018,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "" @@ -50046,6 +50085,11 @@ msgstr "" msgid "Show only the Immediate Upcoming Term" msgstr "" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "" @@ -50332,11 +50376,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50402,7 +50446,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "" @@ -50416,8 +50460,8 @@ msgid "Source of Funds (Liabilities)" msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "" @@ -50582,8 +50626,8 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "" @@ -50916,7 +50960,7 @@ msgstr "" msgid "Stock Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -51187,7 +51231,7 @@ msgstr "" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51199,7 +51243,7 @@ msgstr "" msgid "Stock Reconciliation Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "" @@ -51237,7 +51281,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51265,7 +51309,7 @@ msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "" @@ -51647,7 +51691,7 @@ msgstr "" #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "" @@ -51725,10 +51769,6 @@ msgstr "" msgid "Sub Procedure" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -51945,7 +51985,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -51971,7 +52011,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "" @@ -52060,7 +52100,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "" @@ -52235,7 +52275,7 @@ msgstr "" msgid "Successfully Set Supplier" msgstr "" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "" @@ -52391,6 +52431,7 @@ msgstr "" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52432,8 +52473,8 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52481,6 +52522,12 @@ msgstr "" msgid "Supplier Contact" msgstr "" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52575,7 +52622,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "" @@ -52855,19 +52902,10 @@ msgstr "" msgid "Supplier {0} not found in {1}" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -52929,7 +52967,7 @@ msgstr "" msgid "Support Tickets" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53188,8 +53226,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "" @@ -53657,7 +53695,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "" @@ -53818,7 +53856,7 @@ msgstr "" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "" @@ -54008,7 +54046,6 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54200,7 +54237,7 @@ msgstr "" msgid "The BOM which will be replaced" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54244,7 +54281,7 @@ msgstr "" msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54260,7 +54297,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "" @@ -54296,7 +54333,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54402,7 +54439,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "" @@ -54446,15 +54483,15 @@ msgstr "" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54610,7 +54647,7 @@ msgstr "" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "" @@ -54632,11 +54669,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -54708,7 +54745,7 @@ msgstr "" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54761,7 +54798,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54805,7 +54842,7 @@ msgstr "" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54861,11 +54898,11 @@ msgstr "" msgid "This Month's Summary" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55666,7 +55703,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "" @@ -55701,7 +55738,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "" @@ -55852,7 +55889,7 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "" @@ -56275,7 +56312,7 @@ msgstr "" msgid "Total Payments" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56307,7 +56344,7 @@ msgstr "" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "" @@ -56693,7 +56730,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56704,7 +56741,7 @@ msgstr "" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "" @@ -57376,11 +57413,11 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57452,7 +57489,7 @@ msgstr "" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57528,7 +57565,7 @@ msgstr "" msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "" @@ -57647,7 +57684,7 @@ msgstr "" msgid "Unit of Measure (UOM)" msgstr "" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "" @@ -57767,10 +57804,9 @@ msgid "Unreconcile Transaction" msgstr "" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "" @@ -57793,10 +57829,6 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57842,7 +57874,7 @@ msgstr "" msgid "Unsecured Loans" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58057,12 +58089,6 @@ msgstr "" msgid "Update Type" msgstr "" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58103,7 +58129,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "" @@ -58561,12 +58587,6 @@ msgstr "" msgid "Validate Components and Quantities Per BOM" msgstr "" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58590,6 +58610,12 @@ msgstr "" msgid "Validate Stock on Save" msgstr "" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58696,11 +58722,11 @@ msgstr "" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "" -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "" @@ -58710,7 +58736,7 @@ msgstr "" msgid "Valuation and Total" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "" @@ -58860,7 +58886,7 @@ msgstr "" msgid "Variant" msgstr "" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "" @@ -58879,7 +58905,7 @@ msgstr "" msgid "Variant Based On" msgstr "" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "" @@ -58897,7 +58923,7 @@ msgstr "" msgid "Variant Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "" @@ -59278,7 +59304,7 @@ msgstr "Nome do Documento" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59318,7 +59344,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "" @@ -59350,7 +59376,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59585,7 +59611,7 @@ msgstr "O Armazém {0} não existe" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "" @@ -59632,7 +59658,7 @@ msgstr "" #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59688,6 +59714,12 @@ msgstr "" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" @@ -59871,7 +59903,7 @@ msgstr "" msgid "Website:" msgstr "Website:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60245,7 +60277,7 @@ msgstr "" msgid "Work Order Item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60307,11 +60339,11 @@ msgstr "" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "" @@ -60627,11 +60659,11 @@ msgstr "" msgid "Year Start Date" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60684,7 +60716,7 @@ msgstr "" msgid "You can also set default CWIP account in Company {}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60838,6 +60870,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60866,7 +60902,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60874,7 +60910,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "" @@ -60945,8 +60981,11 @@ msgstr "" msgid "Zero quantity" msgstr "" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61058,7 +61097,7 @@ msgstr "" msgid "fieldname" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61276,6 +61315,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "" @@ -61334,7 +61377,8 @@ msgstr "" msgid "{0} Digest" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61354,7 +61398,7 @@ msgstr "" msgid "{0} Request for {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "" @@ -61467,7 +61511,7 @@ msgid "{0} entered twice in Item Tax" msgstr "" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "" @@ -61635,7 +61679,7 @@ msgstr "" msgid "{0} payment entries can not be filtered by {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61648,7 +61692,7 @@ msgstr "{0} a {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" @@ -61850,7 +61894,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -61936,23 +61980,23 @@ msgstr "" msgid "{0}: {1} is a group account." msgstr "{0}: {1} é uma conta de grupo." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "" -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" diff --git a/erpnext/locale/pt_BR.po b/erpnext/locale/pt_BR.po index b0f11ebce0e..5455a64288c 100644 --- a/erpnext/locale/pt_BR.po +++ b/erpnext/locale/pt_BR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:21\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:21\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Portuguese, Brazilian\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr "" msgid " Summary" msgstr "" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"Item fornecido pelo cliente\" não pode ser item de compra também" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"Item fornecido pelo cliente\" não pode ter taxa de avaliação" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "" @@ -302,7 +302,7 @@ msgstr "'Informe a 'Data Inicial'" msgid "'From Date' must be after 'To Date'" msgstr "A 'Data Final' deve ser posterior a 'Data Inicial'" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "'Tem Número Serial' não pode ser confirmado para itens sem controle de estoque" @@ -338,7 +338,7 @@ msgstr "'Atualização do Estoque' não pode ser verificado porque os itens não msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "'Atualizar Estoque' não pode ser selecionado para venda de ativo fixo" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "A conta '{0}' já está sendo usada por {1}. Use outra conta." @@ -999,7 +999,7 @@ msgstr "" msgid "A logical Warehouse against which stock entries are made." msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1211,7 +1211,7 @@ msgstr "" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1881,8 +1881,8 @@ msgstr "" msgid "Accounting Entry for Asset" msgstr "Entrada Contábil de Ativo" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1890,7 +1890,7 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Lançamento Contábil Para Serviço" @@ -1903,16 +1903,16 @@ msgstr "Lançamento Contábil Para Serviço" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Lançamento Contábil de Estoque" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "" @@ -2210,12 +2210,6 @@ msgstr "" msgid "Action If Quality Inspection Is Rejected" msgstr "" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "Ação Inicializada" @@ -2274,6 +2268,12 @@ msgstr "" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2541,7 +2541,7 @@ msgstr "" msgid "Actual qty in stock" msgstr "Quantidade real em estoque" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "" @@ -2555,7 +2555,7 @@ msgstr "" msgid "Add / Edit Prices" msgstr "Adicionar / Editar Preços" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "" @@ -2709,7 +2709,7 @@ msgstr "" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -2954,7 +2954,7 @@ msgstr "Valor do Desconto Adicional" msgid "Additional Discount Amount (Company Currency)" msgstr "Valor de desconto adicional (moeda da empresa)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -3239,7 +3239,7 @@ msgstr "Ajustar quantidade" msgid "Adjustment Against" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3352,7 +3352,7 @@ msgstr "" msgid "Advance amount" msgstr "Valor adiantado" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "O valor do adiantamento não pode ser superior a {0} {1}" @@ -3421,7 +3421,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Contra À Conta" @@ -3539,7 +3539,7 @@ msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "Contra o Comprovante" @@ -3563,7 +3563,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "" @@ -3844,7 +3844,7 @@ msgstr "" msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "Todos os itens já foram faturados / devolvidos" @@ -3852,7 +3852,7 @@ msgstr "Todos os itens já foram faturados / devolvidos" msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Todos os itens já foram transferidos para esta Ordem de Serviço." @@ -3901,7 +3901,7 @@ msgstr "Alocar" msgid "Allocate Advances Automatically (FIFO)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Atribuir Valor do Pagamento" @@ -3911,7 +3911,7 @@ msgstr "Atribuir Valor do Pagamento" msgid "Allocate Payment Based On Payment Terms" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "" @@ -3941,7 +3941,7 @@ msgstr "" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4062,15 +4062,15 @@ msgstr "" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4099,12 +4099,6 @@ msgstr "" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4317,8 +4311,11 @@ msgstr "" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4410,7 +4407,7 @@ msgstr "Permitido Transacionar Com" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4607,7 +4604,7 @@ msgstr "" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4637,7 +4634,6 @@ msgstr "" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4807,10 +4803,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5430,7 +5422,7 @@ msgstr "Como o campo {0} está habilitado, o campo {1} é obrigatório." msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "Como o campo {0} está habilitado, o valor do campo {1} deve ser maior que 1." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "" @@ -5580,7 +5572,7 @@ msgstr "Ativo Categoria Conta" msgid "Asset Category Name" msgstr "" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "" @@ -5976,7 +5968,7 @@ msgstr "O Ativo {0} não foi submetido. Por favor, submeta o ativo antes de pros msgid "Asset {0} must be submitted" msgstr "O Ativo {0} deve ser enviado" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6014,11 +6006,11 @@ msgstr "Ativos" msgid "Assets Setup" msgstr "Configurações de Ativos" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "Recursos não criados para {item_code}. Você terá que criar o ativo manualmente." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "" @@ -6091,7 +6083,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "" @@ -6123,7 +6115,7 @@ msgstr "" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "" @@ -6187,7 +6179,11 @@ msgstr "" msgid "Attribute Value" msgstr "" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "A tabela de atributos é obrigatório" @@ -6195,11 +6191,19 @@ msgstr "A tabela de atributos é obrigatório" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "Atributo {0} selecionada várias vezes na tabela de atributos" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Atributos" @@ -6259,24 +6263,12 @@ msgstr "" msgid "Auto Create Exchange Rate Revaluation" msgstr "" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6395,6 +6387,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6612,7 +6616,7 @@ msgstr "" msgid "Available for use date is required" msgstr "Disponível para data de uso é obrigatório" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "A quantidade disponível é {0}, você precisa de {1}" @@ -6711,7 +6715,7 @@ msgstr "" msgid "BIN Qty" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -6984,7 +6988,7 @@ msgstr "LDM do Item do Site" msgid "BOM Website Operation" msgstr "LDM da Operação do Site" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7075,7 +7079,7 @@ msgstr "" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" +msgid "Backflush raw materials of subcontract based on" msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' @@ -7096,7 +7100,7 @@ msgstr "Balanço" msgid "Balance (Dr - Cr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Equilíbrio ({0})" @@ -7627,11 +7631,11 @@ msgstr "Bancos" msgid "Barcode Type" msgstr "" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "O código de barras {0} não é um código {1} válido" @@ -7998,12 +8002,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -8076,7 +8080,7 @@ msgstr "" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" +msgid "Bill for rejected quantity in Purchase Invoice" msgstr "" #. Label of a Card Break in the Manufacturing Workspace @@ -8417,8 +8421,11 @@ msgstr "" msgid "Blanket Order Rate" msgstr "" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -8933,7 +8940,7 @@ msgstr "" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "" @@ -9298,7 +9305,7 @@ msgstr "" msgid "Can only make payment against unbilled {0}" msgstr "Só pode fazer o pagamento contra a faturar {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9354,9 +9361,9 @@ msgstr "" msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "" @@ -9384,7 +9391,7 @@ msgstr "" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "" @@ -9420,7 +9427,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9428,7 +9435,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "Não é possível cancelar a transação para a ordem de serviço concluída." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "Não é possível alterar os Atributos após a transação do estoque. Faça um novo Item e transfira estoque para o novo Item" @@ -9440,7 +9447,7 @@ msgstr "" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "" @@ -9468,11 +9475,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9498,7 +9505,7 @@ msgstr "" msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -9535,7 +9542,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9543,8 +9550,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "" @@ -9588,7 +9595,7 @@ msgstr "" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9606,8 +9613,8 @@ msgstr "" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9623,7 +9630,7 @@ msgstr "" msgid "Cannot set authorization on basis of Discount for {0}" msgstr "Não é possível definir a autorização com base em desconto para {0}" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "" @@ -10534,7 +10541,7 @@ msgstr "" msgid "Closing (Dr)" msgstr "Fechamento (dr)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "Fechamento (Abertura + Total)" @@ -10995,7 +11002,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11277,7 +11284,7 @@ msgstr "Empresa" msgid "Company Abbreviation" msgstr "Abreviação da Empresa" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11290,7 +11297,7 @@ msgstr "Abreviação da Empresa não pode ter mais de 5 caracteres" msgid "Company Account" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "Conta da Empresa é obrigatória" @@ -11466,7 +11473,7 @@ msgstr "" msgid "Company is mandatory" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "" @@ -11737,7 +11744,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11750,7 +11757,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11768,13 +11777,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "" @@ -11952,7 +11961,7 @@ msgstr "" msgid "Consumed" msgstr "Consumido" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "Quantidade Consumida" @@ -11996,7 +12005,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12169,10 +12178,6 @@ msgstr "" msgid "Contact:" msgstr "Contato:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Contato: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12350,7 +12355,7 @@ msgstr "Fator de Conversão" msgid "Conversion Rate" msgstr "Taxa de Conversão" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}" @@ -12622,7 +12627,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12717,7 +12722,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "Centro de Custo é necessária na linha {0} no Imposto de mesa para o tipo {1}" @@ -13055,7 +13060,7 @@ msgstr "Criar produtos acabados" msgid "Create Grouped Asset" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "Criar Entrada de Diário Entre Empresas" @@ -13428,7 +13433,7 @@ msgstr "" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "" @@ -13569,15 +13574,15 @@ msgstr "" msgid "Credit" msgstr "Crédito" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "Crédito ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "Conta de Crédito" @@ -13772,7 +13777,7 @@ msgstr "" msgid "Creditors" msgstr "Credores" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14070,7 +14075,7 @@ msgstr "" msgid "Current Serial No" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14271,7 +14276,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15044,7 +15049,7 @@ msgstr "" msgid "Day Of Week" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15160,11 +15165,11 @@ msgstr "" msgid "Debit" msgstr "Débito" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "Débito ({0})" @@ -15174,7 +15179,7 @@ msgstr "Débito ({0})" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "Conta de Débito" @@ -15285,7 +15290,7 @@ msgstr "" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15427,7 +15432,7 @@ msgstr "" msgid "Default BOM" msgstr "" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "" @@ -15784,15 +15789,15 @@ msgstr "" msgid "Default Unit of Measure" msgstr "" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "" -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "A unidade de medida padrão para a variante '{0}' deve ser o mesmo que no modelo '{1}'" @@ -16093,7 +16098,7 @@ msgstr "" msgid "Delivered" msgstr "Entregue" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Quantia Entregue" @@ -16143,8 +16148,8 @@ msgstr "" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16155,11 +16160,11 @@ msgstr "" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16248,7 +16253,7 @@ msgstr "" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16773,7 +16778,7 @@ msgstr "" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "" @@ -16937,10 +16942,8 @@ msgstr "" msgid "Disable In Words" msgstr "" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' @@ -16982,6 +16985,12 @@ msgstr "" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17038,7 +17047,7 @@ msgstr "" msgid "Disassemble Order" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "A Qtd de Desmontagem não pode ser menor ou igual a 0." @@ -17563,6 +17572,12 @@ msgstr "" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17653,9 +17668,12 @@ msgstr "Pesquisa do Documentos" msgid "Document Count" msgstr "Contagem de Documentos" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17673,6 +17691,10 @@ msgstr "" msgid "Document Type already used as a dimension" msgstr "" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -17977,7 +17999,7 @@ msgstr "Projeto duplicado com tarefas" msgid "Duplicate Sales Invoices found" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18097,8 +18119,8 @@ msgstr "" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18321,7 +18343,7 @@ msgstr "" msgid "Email Sent to Supplier {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18511,7 +18533,7 @@ msgstr "" msgid "Employee cannot report to himself." msgstr "Colaborador não pode denunciar a si mesmo." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18519,7 +18541,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "O funcionário é necessário ao emitir o Ativo {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18532,7 +18554,7 @@ msgstr "O Funcionário {0} não pertence à empresa {1}" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "Colaborador {0} não encontrado" @@ -18575,7 +18597,7 @@ msgstr "" msgid "Enable Auto Email" msgstr "" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "Ativar Reordenação Automática" @@ -19173,7 +19195,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "Erro: {0} é campo obrigatório" @@ -19219,7 +19241,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "" @@ -19248,7 +19270,7 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19607,7 +19629,7 @@ msgstr "" msgid "Expense" msgstr "Despesa" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "Despesa conta / Diferença ({0}) deve ser um 'resultados' conta" @@ -19655,7 +19677,7 @@ msgstr "Despesa conta / Diferença ({0}) deve ser um 'resultados' conta" msgid "Expense Account" msgstr "Conta de Despesas" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "Conta de Despesas Ausente" @@ -20118,7 +20140,7 @@ msgstr "" msgid "Filter by Reference Date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20448,7 +20470,7 @@ msgstr "Armazém de Produtos Acabados" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20543,7 +20565,7 @@ msgstr "Regime Fiscal é obrigatório, gentilmente definir o regime fiscal na em msgid "Fiscal Year" msgstr "Exercício Fiscal" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20607,7 +20629,7 @@ msgstr "" msgid "Fixed Asset Defaults" msgstr "" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "" @@ -20757,7 +20779,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20788,7 +20810,7 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "" @@ -20872,6 +20894,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20893,7 +20921,7 @@ msgstr "Para o projeto {0}, atualize seu status" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -20902,7 +20930,7 @@ msgstr "" msgid "For reference" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "Para linha {0} em {1}. Para incluir {2} na taxa de Item, linhas {3} também devem ser incluídos" @@ -20926,7 +20954,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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -20935,7 +20963,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -21548,7 +21576,7 @@ msgstr "" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21560,7 +21588,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "Lançamento GL" @@ -22075,7 +22103,7 @@ msgstr "Mercadorias Em Trânsito" msgid "Goods Transferred" msgstr "Mercadorias Transferidas" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "As mercadorias já são recebidas contra a entrada de saída {0}" @@ -22258,7 +22286,7 @@ msgstr "" msgid "Grant Commission" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "Maior Que Quantidade" @@ -22899,10 +22927,10 @@ msgstr "" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23057,7 +23085,7 @@ msgstr "" msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23239,7 +23267,7 @@ msgstr "" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23411,11 +23439,11 @@ msgstr "" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "" @@ -23531,7 +23559,7 @@ msgstr "" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23583,7 +23611,7 @@ msgstr "" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "" @@ -23626,7 +23654,7 @@ msgstr "" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23640,6 +23668,7 @@ msgid "Implementation Partner" msgstr "" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -23993,7 +24022,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24247,7 +24276,7 @@ msgstr "" msgid "Incorrect Batch Consumed" msgstr "" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" @@ -24255,7 +24284,7 @@ msgstr "" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "" @@ -24465,14 +24494,14 @@ msgstr "Iniciada" msgid "Inspected By" msgstr "Inspecionado Por" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "Inspeção Obrigatória" @@ -24489,7 +24518,7 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "" @@ -24571,8 +24600,8 @@ msgstr "Permissões Insuficientes" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "Estoque Insuficiente" @@ -24792,7 +24821,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -24885,7 +24914,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -24915,7 +24944,7 @@ msgstr "" msgid "Invalid Item" msgstr "Artigo Inválido" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "" @@ -25001,12 +25030,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "Preço de Venda Inválido" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25043,7 +25072,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Série de nomenclatura inválida (. Ausente) para {0}" @@ -25172,7 +25201,6 @@ msgstr "" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "" @@ -25193,10 +25221,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "Total Geral da Fatura" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25718,12 +25742,12 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' @@ -25996,7 +26020,7 @@ msgstr "Incidentes" msgid "Issuing Date" msgstr "" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" @@ -26066,7 +26090,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26113,6 +26137,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26128,7 +26153,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26892,6 +26916,7 @@ msgstr "" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26902,7 +26927,6 @@ msgstr "" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27162,11 +27186,11 @@ msgstr "Configurações da Variante de Item" msgid "Item Variant {0} already exists with same attributes" msgstr "" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "" @@ -27205,6 +27229,15 @@ msgstr "Especificação do Site do Item" msgid "Item Weight Details" msgstr "Detalhes do Peso do Item" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27234,7 +27267,7 @@ msgstr "" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27254,11 +27287,11 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "" @@ -27288,7 +27321,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27307,10 +27340,14 @@ msgstr "" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27324,7 +27361,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "" #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "" @@ -27332,7 +27369,7 @@ msgstr "" msgid "Item {0} does not exist in the system or has expired" msgstr "" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "" @@ -27348,15 +27385,15 @@ msgstr "" msgid "Item {0} has been disabled" msgstr "O item {0} foi desativado" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "" @@ -27368,19 +27405,23 @@ msgstr "" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "" @@ -27388,7 +27429,11 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -27404,7 +27449,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27420,7 +27465,7 @@ msgstr "" msgid "Item {0}: {1} qty produced. " msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "" @@ -27530,7 +27575,7 @@ msgstr "Itens Para Solicitação de Matéria-prima" msgid "Items not found." msgstr "Itens não encontrados." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -28163,7 +28208,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28441,7 +28486,7 @@ msgstr "" msgid "Length (cm)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "Menos Que Quantidade" @@ -28582,7 +28627,7 @@ msgstr "" msgid "Linked Location" msgstr "Local Vinculado" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "" @@ -28977,11 +29022,6 @@ msgstr "" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -28993,6 +29033,11 @@ msgstr "" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29189,7 +29234,7 @@ msgid "Major/Optional Subjects" msgstr "" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29358,8 +29403,8 @@ msgstr "" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29418,8 +29463,8 @@ msgstr "A entrada manual não pode ser criada! Desative a entrada automática pa #: 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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29568,7 +29613,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "Gerente de Fabricação" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "" @@ -29844,7 +29889,7 @@ msgstr "Consumo de Material" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -29915,6 +29960,7 @@ msgstr "Entrada de Material" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30021,11 +30067,11 @@ msgstr "" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "Solicitação de material não criada, como quantidade para matérias-primas já disponíveis." @@ -30140,7 +30186,7 @@ msgstr "" msgid "Material Transferred for Manufacturing" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30269,11 +30315,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -30717,11 +30763,11 @@ msgstr "Diversos" msgid "Miscellaneous Expenses" msgstr "Despesas Diversas" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "" @@ -30759,7 +30805,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "" @@ -30767,11 +30813,11 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "Faltando Parâmetro" @@ -30815,10 +30861,6 @@ msgstr "" msgid "Mixed Conditions" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "Móvel: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31087,7 +31129,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:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31166,27 +31208,20 @@ msgstr "" msgid "Naming Series Prefix" msgstr "" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31234,16 +31269,16 @@ msgstr "Precisa de Análise" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "Negativo Quantidade não é permitido" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "Taxa de Avaliação negativa não é permitida" @@ -31857,7 +31892,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "Nenhuma Permissão" @@ -31870,7 +31905,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "" @@ -31915,7 +31950,7 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "Nenhuma entrada de contabilidade para os seguintes armazéns" @@ -31928,7 +31963,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "Nenhum BOM ativo encontrado para o item {0}. a entrega por número de série não pode ser garantida" @@ -31940,7 +31975,7 @@ msgstr "" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -31948,7 +31983,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32042,7 +32077,7 @@ msgstr "" msgid "No more children on Right" msgstr "" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32217,7 +32252,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32309,7 +32344,7 @@ msgstr "" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "Nenhum dos itens tiver qualquer mudança na quantidade ou valor." @@ -32413,7 +32448,7 @@ msgstr "" msgid "Not authorized to edit frozen Account {0}" msgstr "Não autorizado para editar conta congelada {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32459,7 +32494,7 @@ msgstr "" msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "" -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -32936,7 +32971,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33087,7 +33122,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "Abertura" @@ -33246,16 +33281,16 @@ msgstr "" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Abertura de Estoque" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33612,7 +33647,7 @@ msgstr "Opcional. Esta configuração será usada para filtrar em várias transa msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33746,7 +33781,7 @@ msgstr "Quantidade Encomendada" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "Pedidos" @@ -33954,7 +33989,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34012,7 +34047,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34030,7 +34065,7 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "" @@ -34273,7 +34308,6 @@ msgstr "Campo POS" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "Fatura PDV" @@ -34544,7 +34578,7 @@ msgstr "" msgid "Packed Items" msgstr "" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -34992,7 +35026,7 @@ msgstr "Parcialmente Recebido" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35128,7 +35162,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35254,7 +35288,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35340,7 +35374,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35643,7 +35677,6 @@ msgstr "Os Registos de Pagamento {0} não estão relacionados" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35901,7 +35934,7 @@ msgstr "" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -35980,10 +36013,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37003,7 +37032,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "" @@ -37035,11 +37064,11 @@ msgstr "Adicione uma conta de abertura temporária no plano de contas" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "" @@ -37059,7 +37088,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -37166,7 +37195,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "" @@ -37235,11 +37264,11 @@ msgstr "" msgid "Please enter Approving Role or Approving User" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "Por favor, insira o Nº do Lote" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "" @@ -37251,7 +37280,7 @@ msgstr "Digite Data de Entrega" msgid "Please enter Employee Id of this sales person" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "" @@ -37296,7 +37325,7 @@ msgstr "" msgid "Please enter Root Type for account- {0}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "Por favor, insira o Nº de Série" @@ -37373,7 +37402,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37487,12 +37516,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "" @@ -37508,13 +37537,13 @@ msgstr "" msgid "Please select Category first" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "" @@ -37523,7 +37552,7 @@ msgstr "" msgid "Please select Company and Posting Date to getting entries" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "" @@ -37572,7 +37601,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "" @@ -37580,11 +37609,11 @@ msgstr "" msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "" @@ -37637,7 +37666,7 @@ msgstr "" msgid "Please select a Supplier" msgstr "Selecione um fornecedor" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "" @@ -37698,7 +37727,7 @@ msgstr "Selecione uma linha para criar uma entrada de repostagem" msgid "Please select a supplier for fetching payments." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37718,7 +37747,7 @@ msgstr "" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "Por favor, selecione pelo menos um filtro: Código do Item, Lote ou Nº de Série." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37825,7 +37854,7 @@ msgstr "" msgid "Please select weekly off day" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "" @@ -37965,7 +37994,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -38009,7 +38038,7 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "Defina o UOM padrão nas Configurações de estoque" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" @@ -38128,7 +38157,7 @@ msgstr "" msgid "Please specify at least one attribute in the Attributes table" msgstr "Especifique pelo menos um atributo na tabela de atributos" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "" @@ -38299,7 +38328,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38324,7 +38353,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38439,7 +38468,7 @@ msgstr "" msgid "Posting Time" msgstr "Horário da Postagem" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "Data e horário da postagem são obrigatórios" @@ -38618,6 +38647,12 @@ msgstr "" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -38911,7 +38946,9 @@ msgstr "As lajes de desconto de preço ou produto são necessárias" msgid "Price per Unit (Stock UOM)" msgstr "" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40266,6 +40303,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40302,6 +40340,12 @@ msgstr "Adiantamento da Fatura de Compra" msgid "Purchase Invoice Item" msgstr "" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40353,6 +40397,7 @@ msgstr "Faturas de Compra" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40362,7 +40407,7 @@ msgstr "Faturas de Compra" #: 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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40479,7 +40524,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "Pedido de Compra {0} não é enviado" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "Ordens de Compra" @@ -40542,6 +40587,7 @@ msgstr "Preço de Compra Lista" #: 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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40556,7 +40602,7 @@ msgstr "Preço de Compra Lista" msgid "Purchase Receipt" msgstr "Recibo de Compra" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40822,7 +40868,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41410,7 +41455,7 @@ msgstr "Revisão de Qualidade" msgid "Quality Review Objective" msgstr "Objetivo de Revisão de Qualidade" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41471,7 +41516,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41665,7 +41710,7 @@ msgstr "" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "Lançamento no Livro Diário Rápido" @@ -41720,7 +41765,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41883,7 +41928,6 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42293,8 +42337,8 @@ msgstr "" msgid "Raw SQL" msgstr "" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42702,11 +42746,10 @@ msgstr "" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43230,7 +43273,7 @@ msgstr "" msgid "Rejected Warehouse" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "" @@ -43280,7 +43323,7 @@ msgid "Remaining Balance" msgstr "Saldo Remanescente" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43334,7 +43377,7 @@ msgstr "Observação" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43373,7 +43416,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "Itens removidos sem nenhuma alteração na quantidade ou valor." @@ -43777,6 +43820,7 @@ msgstr "" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44050,7 +44094,7 @@ msgstr "" msgid "Reserved" msgstr "" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44663,7 +44707,7 @@ msgstr "" msgid "Reversal Of" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "Entrada de Diário Reversa" @@ -44812,10 +44856,7 @@ msgstr "" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "" @@ -44830,8 +44871,11 @@ msgstr "" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45032,8 +45076,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -45060,11 +45104,11 @@ msgstr "" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45090,7 +45134,7 @@ msgstr "" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "" @@ -45291,7 +45335,7 @@ msgstr "" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -45351,7 +45395,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45379,7 +45423,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "" @@ -45432,7 +45476,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "" @@ -45457,7 +45501,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Linha #{0}: selecione o armazém de subconjuntos" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "" @@ -45483,15 +45527,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45522,11 +45566,11 @@ msgstr "" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "" @@ -45569,7 +45613,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "" @@ -45617,11 +45661,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45674,11 +45718,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "" -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "" @@ -45706,7 +45750,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "" @@ -45742,23 +45786,23 @@ msgstr "" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45766,7 +45810,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45831,7 +45875,7 @@ msgstr "Linha #{}: {}" msgid "Row #{}: {} {} does not exist." msgstr "" -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" @@ -45847,7 +45891,7 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -45879,7 +45923,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:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -45937,7 +45981,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "Linha {0}: Taxa de Câmbio é obrigatória" @@ -45978,7 +46022,7 @@ msgstr "Linha {0}: É obrigatório colocar a Periodicidade." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -46102,7 +46146,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "Linha {0}: Quantidade não disponível para {4} no depósito {1} no momento da postagem da entrada ({2} {3})" @@ -46114,11 +46158,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:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "Linha {0}: Item subcontratado é obrigatório para a matéria-prima {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -46142,7 +46186,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:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46195,7 +46239,7 @@ msgstr "" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "Linha {1}: Quantidade ({0}) não pode ser uma fração. Para permitir isso, desative ';{2}'; no UOM {3}." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -46225,7 +46269,7 @@ msgstr "" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "Linhas com datas de vencimento duplicadas em outras linhas foram encontradas: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" @@ -46291,7 +46335,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46588,7 +46632,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46762,7 +46806,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46885,8 +46929,8 @@ msgstr "" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47297,7 +47341,7 @@ msgstr "" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "" @@ -47334,7 +47378,7 @@ msgstr "" msgid "Sample Size" msgstr "Tamanho da Amostra" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "A quantidade de amostra {0} não pode ser superior à quantidade recebida {1}" @@ -47623,7 +47667,7 @@ msgstr "" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47768,7 +47812,7 @@ msgstr "Selecione a Marca..." msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "Selecione Empresa" @@ -48463,7 +48507,7 @@ msgstr "" msgid "Serial No Reserved" msgstr "" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48524,7 +48568,7 @@ msgstr "" msgid "Serial No is mandatory for Item {0}" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "" @@ -48810,7 +48854,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48836,7 +48880,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49234,12 +49278,6 @@ msgstr "" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "" @@ -49345,6 +49383,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "" @@ -49843,7 +49887,7 @@ msgstr "" msgid "Show Barcode Field in Stock Transactions" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "Mostrar Entradas Canceladas" @@ -49851,7 +49895,7 @@ msgstr "Mostrar Entradas Canceladas" msgid "Show Completed" msgstr "Mostrar Concluído" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -49934,7 +49978,7 @@ msgstr "Mostrar Notas de Entrega Vinculadas" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "" @@ -49946,7 +49990,7 @@ msgstr "" msgid "Show Open" msgstr "Mostrar Aberta" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "Mostrar Entradas de Abertura" @@ -49959,11 +50003,6 @@ msgstr "" msgid "Show Operations" msgstr "" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "Mostrar Detalhes de Pagamento" @@ -49979,7 +50018,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "" @@ -50046,6 +50085,11 @@ msgstr "Mostrar apenas POS" msgid "Show only the Immediate Upcoming Term" msgstr "" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "" @@ -50332,11 +50376,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50402,7 +50446,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "A origem e o local de destino não podem ser iguais" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "Fonte e armazém de destino não pode ser o mesmo para a linha {0}" @@ -50416,8 +50460,8 @@ msgid "Source of Funds (Liabilities)" msgstr "Fonte de Recursos (passivos)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "O Armazém de origem é obrigatório para a linha {0}" @@ -50582,8 +50626,8 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "Venda Padrão" @@ -50916,7 +50960,7 @@ msgstr "" msgid "Stock Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -51187,7 +51231,7 @@ msgstr "" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51199,7 +51243,7 @@ msgstr "Conciliação de Estoque" msgid "Stock Reconciliation Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "Reconciliações de Estoque" @@ -51237,7 +51281,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51265,7 +51309,7 @@ msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "" @@ -51647,7 +51691,7 @@ msgstr "A ordem de trabalho interrompida não pode ser cancelada, descompacte-a #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "Lojas" @@ -51725,10 +51769,6 @@ msgstr "" msgid "Sub Procedure" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -51945,7 +51985,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -51971,7 +52011,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "" @@ -52060,7 +52100,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "" @@ -52235,7 +52275,7 @@ msgstr "Reconciliados Com Sucesso" msgid "Successfully Set Supplier" msgstr "Definir o Fornecedor Com Sucesso" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "" @@ -52391,6 +52431,7 @@ msgstr "" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52432,8 +52473,8 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52481,6 +52522,12 @@ msgstr "Contatos e Endereços de Fornecedores" msgid "Supplier Contact" msgstr "" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52575,7 +52622,7 @@ msgstr "Data de Emissão da Nota Fiscal de Compra" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "" @@ -52855,19 +52902,10 @@ msgstr "" msgid "Supplier {0} not found in {1}" msgstr "Fornecedor {0} não encontrado em {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Fornecedor(es)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "Análise de Vendas Por Fornecedor" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -52929,7 +52967,7 @@ msgstr "Equipe de Pós-vendas" msgid "Support Tickets" msgstr "Bilhetes de Suporte" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53188,8 +53226,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "" @@ -53657,7 +53695,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "Valor Tributável" @@ -53818,7 +53856,7 @@ msgstr "" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "" @@ -54008,7 +54046,6 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54200,7 +54237,7 @@ msgstr "O Acesso À Solicitação de Cotação do Portal Está Desabilitado. Par msgid "The BOM which will be replaced" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54244,7 +54281,7 @@ msgstr "O termo de pagamento na linha {0} é possivelmente uma duplicata." 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:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54260,7 +54297,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "" @@ -54296,7 +54333,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54402,7 +54439,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "" @@ -54446,15 +54483,15 @@ msgstr "O feriado em {0} não é entre de Data e To Date" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54610,7 +54647,7 @@ msgstr "As ações não existem com o {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "" @@ -54632,11 +54669,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -54708,7 +54745,7 @@ msgstr "O {0} ({1}) deve ser igual a {2} ({3})" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54761,7 +54798,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54805,7 +54842,7 @@ msgstr "Nenhum lote encontrado em {0}: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54861,11 +54898,11 @@ msgstr "Este Item É Uma Variante de {0} (modelo)." msgid "This Month's Summary" msgstr "Resumo Deste Mês" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55666,7 +55703,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "Para incluir impostos na linha {0} na taxa de Item, os impostos em linhas {1} também deve ser incluída" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "" @@ -55701,7 +55738,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "" @@ -55852,7 +55889,7 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Valor Total" @@ -56275,7 +56312,7 @@ msgstr "O valor total da solicitação de pagamento não pode ser maior que o va msgid "Total Payments" msgstr "Total de Pagamentos" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56307,7 +56344,7 @@ msgstr "" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Quantidade Total" @@ -56693,7 +56730,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56704,7 +56741,7 @@ msgstr "Transação" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "" @@ -57376,11 +57413,11 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57452,7 +57489,7 @@ msgstr "Fator de Conversão da UDM é necessário na linha {0}" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57528,7 +57565,7 @@ msgstr "Não foi possível encontrar uma pontuação a partir de {0}. Você prec msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "" @@ -57647,7 +57684,7 @@ msgstr "Unidade de Medida" msgid "Unit of Measure (UOM)" msgstr "" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator" @@ -57767,10 +57804,9 @@ msgid "Unreconcile Transaction" msgstr "" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "Não Reconciliado" @@ -57793,10 +57829,6 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57842,7 +57874,7 @@ msgstr "" msgid "Unsecured Loans" msgstr "Empréstimos Não Garantidos" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58057,12 +58089,6 @@ msgstr "" msgid "Update Type" msgstr "" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58103,7 +58129,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "Atualizando Variantes..." @@ -58561,12 +58587,6 @@ msgstr "" msgid "Validate Components and Quantities Per BOM" msgstr "" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58590,6 +58610,12 @@ msgstr "" msgid "Validate Stock on Save" msgstr "" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58696,11 +58722,11 @@ msgstr "Taxa de Avaliação Ausente" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "Taxa de avaliação para o item {0}, é necessária para fazer lançamentos contábeis para {1} {2}." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "É obrigatório colocar a Taxa de Avaliação se foi introduzido o Estoque de Abertura" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "" @@ -58710,7 +58736,7 @@ msgstr "" msgid "Valuation and Total" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "" @@ -58860,7 +58886,7 @@ msgstr "Variação ({})" msgid "Variant" msgstr "Variante" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "Erro de Atributo Variante" @@ -58879,7 +58905,7 @@ msgstr "Bom Variante" msgid "Variant Based On" msgstr "" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "A variante baseada em não pode ser alterada" @@ -58897,7 +58923,7 @@ msgstr "Campo Variante" msgid "Variant Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "Itens Variantes" @@ -59278,7 +59304,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59318,7 +59344,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "" @@ -59350,7 +59376,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59585,7 +59611,7 @@ msgstr "O Depósito {0} não existe" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "" @@ -59632,7 +59658,7 @@ msgstr "Os Armazéns com transação existente não podem ser convertidos em raz #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59688,6 +59714,12 @@ msgstr "" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" @@ -59871,7 +59903,7 @@ msgstr "" msgid "Website:" msgstr "Site:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60245,7 +60277,7 @@ msgstr "" msgid "Work Order Item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60307,11 +60339,11 @@ msgstr "Ordem de serviço não criada" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "Ordem de Serviço {0}: Cartão de Trabalho não encontrado para a operação {1}" @@ -60627,11 +60659,11 @@ msgstr "" msgid "Year Start Date" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60684,7 +60716,7 @@ msgstr "Você também pode copiar e colar este link no seu navegador" msgid "You can also set default CWIP account in Company {}" msgstr "Você também pode definir uma conta CWIP padrão na Empresa {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60838,6 +60870,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60866,7 +60902,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60874,7 +60910,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "Você precisa habilitar a reordenação automática nas Configurações de estoque para manter os níveis de reordenamento." @@ -60945,8 +60981,11 @@ msgstr "" msgid "Zero quantity" msgstr "" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61058,7 +61097,7 @@ msgstr "" msgid "fieldname" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61276,6 +61315,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "" @@ -61334,7 +61377,8 @@ msgstr "{0} o cupom usado é {1}. a quantidade permitida está esgotada" msgid "{0} Digest" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61354,7 +61398,7 @@ msgstr "{0} Operações: {1}" msgid "{0} Request for {1}" msgstr "{0} pedido para {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "" @@ -61467,7 +61511,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} entrou duas vezes no Imposto do Item" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "" @@ -61635,7 +61679,7 @@ msgstr "{0} parâmetro é inválido" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} entradas de pagamento não podem ser filtrados por {1}" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61648,7 +61692,7 @@ msgstr "{0} a {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" @@ -61850,7 +61894,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -61936,23 +61980,23 @@ msgstr "" msgid "{0}: {1} is a group account." msgstr "{0}: {1} é uma conta de grupo." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "" -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" diff --git a/erpnext/locale/ru.po b/erpnext/locale/ru.po index 41663cb09e0..6d16449d27b 100644 --- a/erpnext/locale/ru.po +++ b/erpnext/locale/ru.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:21\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:20\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Russian\n" "MIME-Version: 1.0\n" @@ -100,15 +100,15 @@ msgstr " Подузел" msgid " Summary" msgstr " Резюме" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"Товар, предоставленный клиентом\" не может быть предметом покупки" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"Предоставленный клиентом товар\" не может иметь оценку" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "Нельзя убрать отметку \"Является основным средством\", поскольку по данному пункту имеется запись по активам" @@ -307,7 +307,7 @@ msgstr "Поле 'С даты' является обязательным для msgid "'From Date' must be after 'To Date'" msgstr "Значение 'С даты' должно быть после 'До даты'" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "'Имеет серийный номер' не может быть 'Да' для товаров без запасов" @@ -343,7 +343,7 @@ msgstr "Нельзя выбрать 'Обновить запасы', так ка msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "'Обновление запасов' не может быть проверено при продаже основных средств" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "Учётная запись «{0}» уже используется пользователем {1}. Используйте другую учётную запись." @@ -1104,7 +1104,7 @@ msgstr "Драйвер должен быть установлен для отп msgid "A logical Warehouse against which stock entries are made." msgstr "Логическое Хранилище, по которому производятся записи о запасах." -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "При создании серийных номеров возник конфликт в именовании. Пожалуйста, измените именование для элемента {0}." @@ -1316,7 +1316,7 @@ msgstr "Ключ доступа необходим для Поставщика msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "В соответствии с CEFACT/ICG/2010/IC013 или CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "В соответствии с BOM {0}, товар '{1}' отсутствует в складской записи." @@ -1986,8 +1986,8 @@ msgstr "Бухгалтерские проводки" msgid "Accounting Entry for Asset" msgstr "Учетная запись для активов" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "Бухгалтерская запись для LCV в записи на складе {0}" @@ -1995,7 +1995,7 @@ msgstr "Бухгалтерская запись для LCV в записи на msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "Бухгалтерская запись для ваучера на погрузочно-разгрузочные работы для SCR {0}" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Бухгалтерская запись для обслуживания" @@ -2008,16 +2008,16 @@ msgstr "Бухгалтерская запись для обслуживания" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Бухгалтерская Проводка по Запасам" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "Бухгалтерская проводка для {0}" @@ -2315,12 +2315,6 @@ msgstr "Действие, если проверка качества не пре msgid "Action If Quality Inspection Is Rejected" msgstr "Действие, если проверка качества отклонена" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "Действие, если одинаковый курс не поддерживается" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "Действие инициализировано" @@ -2379,6 +2373,12 @@ msgstr "Действия в случае превышения годового msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "Действия, если одинаковая ставка не поддерживается на протяжении всей внутренней транзакции" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2646,7 +2646,7 @@ msgstr "Фактическое время в часах (по табелю уч msgid "Actual qty in stock" msgstr "Количество штук в наличии" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "Фактический тип налога не может быть включён в стоимость продукта в строке {0}" @@ -2660,7 +2660,7 @@ msgstr "Специальное количество" msgid "Add / Edit Prices" msgstr "Добавить/изменить цены" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "Добавить столбцы в валюту транзакции" @@ -2814,7 +2814,7 @@ msgstr "Добавить серийный номер/номер партии" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "Добавить серийный номер/номер партии (отклоненное количество)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -3059,7 +3059,7 @@ msgstr "Сумма дополнительной скидки" msgid "Additional Discount Amount (Company Currency)" msgstr "Сумма дополнительной скидки (в валюте компании)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "Сумма дополнительной скидки ({discount_amount}) не может превышать общую сумму до предоставления такой скидки ({total_before_discount})" @@ -3348,7 +3348,7 @@ msgstr "Изменить количество" msgid "Adjustment Against" msgstr "Корректировка в отношении" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "Корректировка на основе ставки по счету-фактуре покупки" @@ -3461,7 +3461,7 @@ msgstr "Тип авансового документа" msgid "Advance amount" msgstr "Сумма аванса" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Предварительная сумма не может быть больше, чем {0} {1}" @@ -3530,7 +3530,7 @@ msgstr "Против" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Со счета" @@ -3648,7 +3648,7 @@ msgstr "По счет-фактуре поставщика {0}" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "Против ваучером" @@ -3672,7 +3672,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "Против Сертификаты Тип" @@ -3953,7 +3953,7 @@ msgstr "Все коммуникации, включая и вышеупомян msgid "All items are already requested" msgstr "Все предметы уже запрошены" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "На все товары уже выставлен счет / возврат" @@ -3961,7 +3961,7 @@ msgstr "На все товары уже выставлен счет / возвр msgid "All items have already been received" msgstr "Все товары уже получены" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Все продукты уже переведены для этого Заказа." @@ -4010,7 +4010,7 @@ msgstr "Выделить" msgid "Allocate Advances Automatically (FIFO)" msgstr "Автоматическое распределение авансов (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Выделяют Сумма платежа" @@ -4020,7 +4020,7 @@ msgstr "Выделяют Сумма платежа" msgid "Allocate Payment Based On Payment Terms" msgstr "Распределить платеж на основе условий оплаты" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "Разместить запрос на оплату" @@ -4050,7 +4050,7 @@ msgstr "Выделено" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4171,15 +4171,15 @@ msgstr "Разрешить возврат" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "Разрешить внутренние переводы по рыночной цене" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "Разрешить многократное добавление элемента в транзакцию" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "Разрешить многократное добавление элемента в транзакцию" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4208,12 +4208,6 @@ msgstr "Разрешить отрицательный запас" msgid "Allow Negative Stock for Batch" msgstr "Разрешить отрицательный остаток для партии" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "Разрешить отрицательные ставки для товаров" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4426,8 +4420,11 @@ msgstr "Разрешить выставление счетов в несколь msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4519,7 +4516,7 @@ msgstr "Разрешено спрятать" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "Разрешенные основные роли: «Клиент» и «Поставщик». Пожалуйста, выберите только одну из этих ролей." -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4716,7 +4713,7 @@ msgstr "Всегда спрашивайте" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4746,7 +4743,6 @@ msgstr "Всегда спрашивайте" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4916,10 +4912,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "Сумма в валюте счета" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "сумма прописью" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5539,7 +5531,7 @@ msgstr "Поскольку поле {0} включено, поле {1} явля msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "Поскольку поле {0} включено, значение поля {1} должно быть больше 1." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "Поскольку существуют отправленные транзакции по элементу {0}, вы не можете изменить значение {1}." @@ -5689,7 +5681,7 @@ msgstr "Счёт категории активов" msgid "Asset Category Name" msgstr "Название категории актива" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "Категория активов является обязательным для фиксированного элемента активов" @@ -6085,7 +6077,7 @@ msgstr "Актив {0} не представлен. Пожалуйста, пре msgid "Asset {0} must be submitted" msgstr "Актив {0} должен быть проведен" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "Актив {assets_link} создан для {item_code}" @@ -6123,11 +6115,11 @@ msgstr "Активы" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "Активы не созданы для {item_code}. Вам придется создать актив вручную." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "Активы {assets_link} созданные для {item_code}" @@ -6200,7 +6192,7 @@ msgstr "Как минимум одна единица сырья должна п msgid "At least one row is required for a financial report template" msgstr "Для шаблона финансового отчета требуется как минимум одна строка" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "Обязательно наличие хотя бы одного склада" @@ -6232,7 +6224,7 @@ msgstr "В строке {0}: Количество является обязат msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "В строке {0}: Серийный номер является обязательным для элемента {1}" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "В строке {0}: Серийный и партионный комплект {1} уже созданы. Пожалуйста, удалите значения из полей серийного номера или номера партии." @@ -6296,7 +6288,11 @@ msgstr "Имя атрибута" msgid "Attribute Value" msgstr "Значение атрибута" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "Таблица атрибутов является обязательной" @@ -6304,11 +6300,19 @@ msgstr "Таблица атрибутов является обязательн msgid "Attribute value: {0} must appear only once" msgstr "Значение атрибута: {0} должно встречаться только один раз" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "Атрибут {0} выбран несколько раз в таблице атрибутов" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Атрибуты" @@ -6368,24 +6372,12 @@ msgstr "Разрешенное значение" msgid "Auto Create Exchange Rate Revaluation" msgstr "Автоматическое создание переоценки обменного курса" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "Автоматическое создание квитанции о покупке" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "Автоматическое создание серийного и партионного комплекта для исходящих отправлений" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "Автоматическое создание субподрядного заказа" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6504,6 +6496,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "Автоматическое \"Перспективного клиента\" после ответа через указанное количество дней" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6721,7 +6725,7 @@ msgstr "" msgid "Available for use date is required" msgstr "Доступна дата использования" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "Доступное количество: {0}, вам нужно {1}" @@ -6820,7 +6824,7 @@ msgstr "Банковские и финансовые услуги" msgid "BIN Qty" msgstr "Количество в ячейке" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7093,7 +7097,7 @@ msgstr "Спецификация продукта на сайте" msgid "BOM Website Operation" msgstr "Операция спецификации на сайте" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "Спецификация материалов (BOM) и количество готовой продукции обязательны для разборки" @@ -7184,8 +7188,8 @@ msgstr "Автоматическое списание сырья со склад #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "Выполнение списания материалов по субподряду на основе" +msgid "Backflush raw materials of subcontract based on" +msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7205,7 +7209,7 @@ msgstr "Баланс" msgid "Balance (Dr - Cr)" msgstr "Баланс (Дт-Кт)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Баланс ({0})" @@ -7736,11 +7740,11 @@ msgstr "Банковские операции" msgid "Barcode Type" msgstr "Тип штрих-кода" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "Штрихкод {0} уже используется для продукта {1}" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "Штрих-код {0} не является допустимым кодом {1}" @@ -8107,12 +8111,12 @@ msgstr "Партия {0} и склад" msgid "Batch {0} is not available in warehouse {1}" msgstr "Партия {0} недоступна на складе {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "Партия {0} продукта {1} просрочена" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "Пакет {0} элемента {1} отключен." @@ -8185,8 +8189,8 @@ msgstr "Номер счета" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "Счет за отклоненное количество в счете-фактуре покупки" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8526,8 +8530,11 @@ msgstr "Позиция общего заказа" msgid "Blanket Order Rate" msgstr "Фиксированная ставка на долгосрочный заказ" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -9042,7 +9049,7 @@ msgstr "Покупка и продажа" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "Покупка должна быть проверена, если выбран Применимо для как {0}" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "По умолчанию Имя поставщика устанавливается в соответствии с введенным именем поставщика. Если вы хотите, чтобы поставщики были названы по серии именования, выберите опцию «Серия именования»." @@ -9407,7 +9414,7 @@ msgstr "Не можете фильтровать на основе ваучер msgid "Can only make payment against unbilled {0}" msgstr "Могу только осуществить платеж против нефактурированных {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9463,9 +9470,9 @@ msgstr "Невозможно изменить настройки учетной msgid "Cannot Create Return" msgstr "Невозможно создать возврат" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "Невозможно объединить" @@ -9493,7 +9500,7 @@ msgstr "Невозможно исправить {0} {1}, пожалуйста, msgid "Cannot apply TDS against multiple parties in one entry" msgstr "Невозможно применить налог на источнике дохода к нескольким контрагентам в одной записи" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "Не может быть элементом фиксированного актива, так как создается складская книга." @@ -9529,7 +9536,7 @@ msgstr "Невозможно отменить эту запись о произ msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "Отменить этот документ невозможно, так как он связан с отправленной корректировкой стоимости активов {0}. Пожалуйста, отмените корректировку стоимости активов, чтобы продолжить." -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "Невозможно отменить этот документ, поскольку он связан с отправленным объектом {asset_link}. Пожалуйста, отмените его, чтобы продолжить." @@ -9537,7 +9544,7 @@ msgstr "Невозможно отменить этот документ, пос msgid "Cannot cancel transaction for Completed Work Order." msgstr "Невозможно отменить транзакцию для выполненного рабочего заказа." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "Невозможно изменить атрибуты после транзакции с акциями. Сделайте новый предмет и переведите запас на новый элемент" @@ -9549,7 +9556,7 @@ msgstr "Невозможно изменить тип справочного до msgid "Cannot change Service Stop Date for item in row {0}" msgstr "Невозможно изменить дату остановки службы для элемента в строке {0}" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "Невозможно изменить свойства Variant после транзакции с акциями. Вам нужно будет сделать новый элемент для этого." @@ -9577,11 +9584,11 @@ msgstr "Преобразование в группу невозможно из- msgid "Cannot covert to Group because Account Type is selected." msgstr "Не можете скрытой в группу, потому что выбран Тип аккаунта." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "Невозможно создать записи о резервировании запасов для квитанций о покупке с будущей датой." -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "Невозможно создать список сборки для заказа на продажу {0}, так как имеется зарезервированный товар. Пожалуйста, снимите резервирование с товара, чтобы создать список сборки." @@ -9607,7 +9614,7 @@ msgstr "Нельзя установить Отказ, потому что был msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "Не можете вычесть, когда категория для \"Оценка\" или \"Оценка и Всего\"" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "Невозможно удалить строку «Прибыль/убыток по обмену»" @@ -9644,7 +9651,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "Невозможно разобрать больше, чем произведено." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9652,8 +9659,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "Невозможно включить инвентарный счет по позициям, поскольку для компании {0} существуют записи в Книге учета запасов с инвентарным счетом по складам. Пожалуйста, сначала отмените операции с запасами и попробуйте снова." -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "Невозможно обеспечить доставку по серийному номеру, так как товар {0} добавлен с и без обеспечения доставки по серийному номеру." @@ -9697,7 +9704,7 @@ msgstr "Невозможно получить оплату от клиента msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "Уменьшить количество по сравнению с заказанным или приобретенным количеством невозможно" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9715,8 +9722,8 @@ msgstr "Невозможно получить токен ссылки. Пров msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9732,7 +9739,7 @@ msgstr "Невозможно установить Отказ, так как со msgid "Cannot set authorization on basis of Discount for {0}" msgstr "Не удается установить разрешение на основе Скидка для {0}" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "Невозможно установить несколько параметров по умолчанию для компании." @@ -10643,7 +10650,7 @@ msgstr "Закрытие (Cr)" msgid "Closing (Dr)" msgstr "Закрытие (д-р)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "Закрытие (Открытие + Итого)" @@ -11104,7 +11111,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11386,7 +11393,7 @@ msgstr "Организация" msgid "Company Abbreviation" msgstr "Аббревиатура компании" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11399,7 +11406,7 @@ msgstr "Сокращение компании не может содержать msgid "Company Account" msgstr "Счет компании" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "Счет компании обязателен" @@ -11575,7 +11582,7 @@ msgstr "Фильтр компании не установлен!" msgid "Company is mandatory" msgstr "Компания обязательна" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "Компания является обязательной для счета компании" @@ -11846,7 +11853,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11859,7 +11866,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "Настроить сборку продукта" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11877,13 +11886,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "Настройте действие для остановки транзакции или просто для предупреждения, если та же ставка не соблюдается." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "Настройте прайс-лист по умолчанию при создании новой транзакции покупки. Цены на товары будут взяты из этого прейскуранта." @@ -12061,7 +12070,7 @@ msgstr "" msgid "Consumed" msgstr "Потребляемый" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "Израсходованное количество" @@ -12105,7 +12114,7 @@ msgstr "Стоимость потребляемых предметов" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12278,10 +12287,6 @@ msgstr "Контактное лицо не принадлежит к {0}" msgid "Contact:" msgstr "Связаться с:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Контакт: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12459,7 +12464,7 @@ msgstr "Коэффициент конверсии" msgid "Conversion Rate" msgstr "Коэффициент конверсии" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}" @@ -12731,7 +12736,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12826,7 +12831,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "МВЗ требуется в строке {0} в виде налогов таблицы для типа {1}" @@ -13164,7 +13169,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "Создать сгруппированный актив" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "Создать межфирменный журнал" @@ -13537,7 +13542,7 @@ msgstr "Создать {0} {1}?" msgid "Created By Migration" msgstr "Создано в результате миграции" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "Создано {0} оценочных листов для {1} в период:" @@ -13680,15 +13685,15 @@ msgstr "Создание {0} частично успешно.\n" msgid "Credit" msgstr "Кредит" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "Кредит (транзакция)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "Кредит ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "Кредитный счет" @@ -13883,7 +13888,7 @@ msgstr "Коэффициент оборачиваемости кредиторо msgid "Creditors" msgstr "Кредиторы" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14181,7 +14186,7 @@ msgstr "Текущий серийный / партийный набор" msgid "Current Serial No" msgstr "Текущий серийный номер" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14382,7 +14387,7 @@ msgstr "Пользовательские разделители" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15155,7 +15160,7 @@ msgstr "Даты обработки" msgid "Day Of Week" msgstr "День недели" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15271,11 +15276,11 @@ msgstr "Посредник" msgid "Debit" msgstr "Дебет" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "Дебет (транзакция)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "Дебет ({0})" @@ -15285,7 +15290,7 @@ msgstr "Дебет ({0})" msgid "Debit / Credit Note Posting Date" msgstr "Дата публикации дебетовой/кредитовой ноты" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "Дебетовый счет" @@ -15396,7 +15401,7 @@ msgstr "Несоответствие дебета и кредита" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15538,7 +15543,7 @@ msgstr "Диапазон старения по умолчанию" msgid "Default BOM" msgstr "Спецификации по умолчанию" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "По умолчанию ВМ ({0}) должна быть активной для данного продукта или в шаблоне" @@ -15895,15 +15900,15 @@ msgstr "Территория по умолчанию" msgid "Default Unit of Measure" msgstr "Единица измерения по умолчанию" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "Единицу измерения по умолчанию для товара {0} нельзя изменить напрямую, так как с этим товаром уже проводились транзакции с другой единицей измерения. Вам необходимо либо отменить связанные документы, либо создать новый товар." -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "По умолчанию Единица измерения для п {0} не может быть изменен непосредственно, потому что вы уже сделали некоторые сделки (сделок) с другим UOM. Вам нужно будет создать новый пункт для использования другого умолчанию единица измерения." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "По умолчанию Единица измерения для варианта '{0}' должно быть такой же, как в шаблоне '{1}'" @@ -16204,7 +16209,7 @@ msgstr "" msgid "Delivered" msgstr "Доставлено" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Доставленное количество" @@ -16254,8 +16259,8 @@ msgstr "Поставленные товары, на которые нужно в #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16266,11 +16271,11 @@ msgstr "Поставляемое кол-во" msgid "Delivered Qty (in Stock UOM)" msgstr "Поставленное количество (в единицах учета на складе)" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16359,7 +16364,7 @@ msgstr "Менеджер по доставке" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16884,7 +16889,7 @@ msgstr "Счет разницы в таблице позиций" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "Счет разницы должен быть счетом типа «Актив/Пассив» (временное открытие), поскольку эта запись о запасах является начальной записью." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "Разница аккаунт должен быть тип счета активов / пассивов, так как это со Примирение запись Открытие" @@ -17048,11 +17053,9 @@ msgstr "Отключить накопительный порог" msgid "Disable In Words" msgstr "Отключить сумму прописью" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "Отключить последнюю цену покупки" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17093,6 +17096,12 @@ msgstr "Отключить выбор серийного номера и пар msgid "Disable Transaction Threshold" msgstr "Отключить порог транзакций" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17149,7 +17158,7 @@ msgstr "Разобрать" msgid "Disassemble Order" msgstr "Заказ на разборку" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "Количество для разборки не может быть меньше или равно 0." @@ -17674,6 +17683,12 @@ msgstr "Не использовать оценку по партиям" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17764,9 +17779,12 @@ msgstr "Поиск документов" msgid "Document Count" msgstr "Количество документов" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17784,6 +17802,10 @@ msgstr "Тип документа " msgid "Document Type already used as a dimension" msgstr "Тип документа уже используется как измерение" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "Документация" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18088,7 +18110,7 @@ msgstr "Дублировать проект с задачами" msgid "Duplicate Sales Invoices found" msgstr "Найдены дублирующиеся счета по продажам" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "Ошибка дублирования серийного номера" @@ -18208,8 +18230,8 @@ msgstr "ERPСNext идентификатор пользователя" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18432,7 +18454,7 @@ msgstr "Квитанция по электронной почте" msgid "Email Sent to Supplier {0}" msgstr "Электронное письмо отправлено поставщику {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18622,7 +18644,7 @@ msgstr "Идентификатор пользователя сотрудника msgid "Employee cannot report to himself." msgstr "Сотрудник не может сообщить самому себе." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18630,7 +18652,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "Требуется сотрудник при выдаче актива {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18643,7 +18665,7 @@ msgstr "Сотрудник {0} не принадлежит компании {1}" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "Сотрудник {0} в настоящее время работает на другом рабочем месте. Пожалуйста, назначьте другого сотрудника." -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18686,7 +18708,7 @@ msgstr "Включить планирование встреч" msgid "Enable Auto Email" msgstr "Включить автоматическую отправку электронной почты" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "Включить автоматический повторный заказ" @@ -19287,7 +19309,7 @@ msgstr "Ошибка: для этого актива уже учтено {0} п "\t\t\t\t\tДата «начала амортизации» должна быть не менее чем на {1} периодов позже даты «доступен для использования».\n" "\t\t\t\t\tПожалуйста, исправьте даты соответствующим образом." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "Ошибка: {0} является обязательным полем" @@ -19333,7 +19355,7 @@ msgstr "Поставка с места нахождения продавца" msgid "Example URL" msgstr "Пример URL-адреса" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "Пример связанного документа: {0}" @@ -19363,7 +19385,7 @@ msgstr "Пример: серийный номер {0} зарезервирова msgid "Exception Budget Approver Role" msgstr "Роль утверждающего исключительные расходы бюджета" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19722,7 +19744,7 @@ msgstr "Ожидаемая стоимость после окончания ср msgid "Expense" msgstr "Расходы" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "Счет расходов / разницы ({0}) должен быть счетом \"Прибыль или убыток\"" @@ -19770,7 +19792,7 @@ msgstr "Счет расходов / разницы ({0}) должен быть msgid "Expense Account" msgstr "Расходов счета" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "Счет расходов отсутствует" @@ -20233,7 +20255,7 @@ msgstr "Фильтровать Total Zero Qty" msgid "Filter by Reference Date" msgstr "Фильтр по дате ссылки" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20563,7 +20585,7 @@ msgstr "Склад готовой продукции" msgid "Finished Goods based Operating Cost" msgstr "Затраты на производство готовой продукции" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "Готовый товар {0} не соответствует заказу на работу {1}" @@ -20658,7 +20680,7 @@ msgstr "Фискальный режим является обязательны msgid "Fiscal Year" msgstr "Отчетный год" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20722,7 +20744,7 @@ msgstr "Счет основных средств" msgid "Fixed Asset Defaults" msgstr "Настройки по умолчанию для основных средств" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "Элемент основных средств не может быть элементом запасов." @@ -20872,7 +20894,7 @@ msgstr "Для компании" msgid "For Item" msgstr "Для товара" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "Для товара {0} нельзя получить больше, чем {1} против {2} {3}" @@ -20903,7 +20925,7 @@ msgstr "Для прайс-листа" msgid "For Production" msgstr "Для производства" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "Для Количество (Изготовитель Количество) является обязательным" @@ -20987,6 +21009,12 @@ msgstr "Для товара {0}, только {1} активы б msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "Для элемента {0} ставка должна быть положительным числом. Чтобы разрешить отрицательные ставки, включите {1} в {2}" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "Для операции {0} в строке {1} добавьте сырье или создайте спецификацию материалов для нее." @@ -21008,7 +21036,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "Для прогнозируемых и планируемых количеств система будет учитывать все дочерние склады, входящие в выбранный родительский склад" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "Для количества {0} не должно быть больше допустимого количества {1}" @@ -21017,7 +21045,7 @@ msgstr "Для количества {0} не должно быть больше msgid "For reference" msgstr "Для справки" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "Для ряда {0} {1}. Чтобы включить {2} в размере Item ряды также должны быть включены {3}" @@ -21041,7 +21069,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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "Для изделия {0} количество потребленного материала должно быть {1} согласно спецификации материалов {2}." @@ -21050,7 +21078,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 "Чтобы новый {0} вступил в силу, хотите ли Вы очистить текущий {1}?" -#: erpnext/controllers/stock_controller.py:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "Для {0} нет запасов, доступных для возврата на склад {1}." @@ -21663,7 +21691,7 @@ msgstr "G - D" msgid "GENERAL LEDGER" msgstr "ГЛАВНАЯ КНИГА" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21675,7 +21703,7 @@ msgstr "Баланс по книге учета" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "БК запись" @@ -22190,7 +22218,7 @@ msgstr "Товары в пути" msgid "Goods Transferred" msgstr "Товар передан" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "Товар уже получен против выездной записи {0}" @@ -22373,7 +22401,7 @@ msgstr "" msgid "Grant Commission" msgstr "Комиссия по грантам" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "Больше, чем сумма" @@ -23014,11 +23042,11 @@ msgstr "Насколько часто?" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" -msgstr "С какой периодичностью следует обновлять проект по общей стоимости закупок?" +msgid "How often should project be updated of Total Purchase Cost ?" +msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling #. Settings' @@ -23173,7 +23201,7 @@ msgstr "Если операция разделена на подоперации msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "Если оставлено пустым, в транзакциях будет учитываться основной счет склада или стандартный счет компании" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23356,7 +23384,7 @@ msgstr "Если включено, система позволит выбира msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "Если эта опция включена, система позволит пользователям редактировать сырье и его количество в рабочем заказе. Система не будет сбрасывать количество согласно спецификации, если пользователь изменил его." -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23528,11 +23556,11 @@ msgstr "Если это нежелательно, пожалуйста, отме msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "Если у этого товара есть варианты, то его нельзя выбрать в заказах на продажу и т. д." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "Если для этого параметра установлено «Да», ERPNext не позволит вам создать счет-фактуру или квитанцию на покупку без предварительного создания заказа на покупку. Эту конфигурацию можно изменить для конкретного поставщика, установив флажок «Разрешить создание счета-фактуры без заказа на покупку» в основной записи «Поставщик»." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "Если для этого параметра установлено «Да», ERPNext не позволит вам создать счет-фактуру без предварительного создания квитанции о покупке. Эта конфигурация может быть изменена для конкретного поставщика, установив флажок «Разрешить создание счета-фактуры без квитанции о покупке» в основной записи поставщика." @@ -23648,7 +23676,7 @@ msgstr "Игнорировать пустой запас" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "Игнорировать журналы переоценки обменного курса и прибылей/убытков" @@ -23700,7 +23728,7 @@ msgstr "Включено правило игнорирования ценооб #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "Игнорировать автоматически созданные кредетовые/дебетовые записи" @@ -23743,7 +23771,7 @@ msgstr "Игнорировать пересечение времени испо msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "Игнорирует устаревшее поле «Открытие» в записи GL, которое позволяет добавлять начальный баланс после того, как система используется при формировании отчетов." -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23757,6 +23785,7 @@ msgid "Implementation Partner" msgstr "Партнер по внедрению" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24110,7 +24139,7 @@ msgstr "Включить активы FB по умолчанию" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24364,7 +24393,7 @@ msgstr "Некорректное количество остатка после msgid "Incorrect Batch Consumed" msgstr "Использована неверная партия" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "Неправильная регистрация склада (группы) для повторного заказа" @@ -24372,7 +24401,7 @@ msgstr "Неправильная регистрация склада (групп msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "Неправильное количество компонентов" @@ -24582,14 +24611,14 @@ msgstr "По инициативе" msgid "Inspected By" msgstr "Проверено" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "Проверка отклонена" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "Инспекция Обязательные" @@ -24606,7 +24635,7 @@ msgstr "Перед доставкой требуется проверка" msgid "Inspection Required before Purchase" msgstr "Необходима проверка перед покупкой" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "Подача отчёта о проверке" @@ -24688,8 +24717,8 @@ msgstr "Недостаточно разрешений" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "Недостаточный запас" @@ -24909,7 +24938,7 @@ msgstr "Внутренние переводы" msgid "Internal Work History" msgstr "Внутренняя история работы" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "Внутренние переводы могут осуществляться только в валюте компании по умолчанию" @@ -25002,7 +25031,7 @@ msgstr "Неверная дата доставки" msgid "Invalid Discount" msgstr "Недействительная скидка" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "Неверная сумма скидки" @@ -25032,7 +25061,7 @@ msgstr "Неверная группировка" msgid "Invalid Item" msgstr "Недействительный товар" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "Неверные значения по умолчанию для товаров" @@ -25118,12 +25147,12 @@ msgstr "Неверное расписание" msgid "Invalid Selling Price" msgstr "Недействительная цена продажи" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "Некорректная комбинация серийных номеров и партий" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "Неверный исходный и целевой склад" @@ -25160,7 +25189,7 @@ msgstr "Неверная формула фильтра. Проверьте си msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "Недопустимая потерянная причина {0}, создайте новую потерянную причину" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Недопустимая серия имен (. Отсутствует) для {0}" @@ -25289,7 +25318,6 @@ msgstr "Аннулирование счета-фактуры" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "Дата счета-фактуры" @@ -25310,10 +25338,6 @@ msgstr "Ошибка выбора типа документа счет-факт msgid "Invoice Grand Total" msgstr "Общая сумма счета" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "Номер счёта" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25835,13 +25859,13 @@ msgstr "Фантомный предмет" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "Требуется ли заказ на покупку для создания счета-фактуры и квитанции на покупку?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "Требуется ли товарный чек для создания счета-фактуры?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -26113,7 +26137,7 @@ msgstr "Вопросы" msgid "Issuing Date" msgstr "Дата выдачи" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "После объединения позиций может потребоваться несколько часов, чтобы увидеть точные значения запасов." @@ -26183,7 +26207,7 @@ msgstr "Курсивный текст для промежуточных итог #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26230,6 +26254,7 @@ msgstr "Курсивный текст для промежуточных итог #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26245,7 +26270,6 @@ msgstr "Курсивный текст для промежуточных итог #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -27009,6 +27033,7 @@ msgstr "Производитель товара" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -27019,7 +27044,6 @@ msgstr "Производитель товара" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27279,11 +27303,11 @@ msgstr "Параметры модификации продукта" msgid "Item Variant {0} already exists with same attributes" msgstr "Модификация продукта {0} с этими атрибутами уже существует" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "Обновлены варианты предметов" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "Включена возможность повторной публикации на складе товаров." @@ -27322,6 +27346,15 @@ msgstr "Описание продукта для сайта" msgid "Item Weight Details" msgstr "Подробности о весе товара" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27351,7 +27384,7 @@ msgstr "Детали налога на товар" msgid "Item Wise Tax Details" msgstr "Налоговая информация по товарам" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "Налоговые данные по позициям не совпадают с налогами и сборами в следующих строках:" @@ -27371,11 +27404,11 @@ msgstr "Товар и склад" msgid "Item and Warranty Details" msgstr "Подробности товара и гарантии" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "Элемент для строки {0} не соответствует запросу материала" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "Продукт имеет модификации" @@ -27405,7 +27438,7 @@ msgstr "Операция с товаром" msgid "Item qty can not be updated as raw materials are already processed." msgstr "Количество товара не может быть обновлено, так как сырье уже обработано." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "Ставка товара обновлена до нуля, так как для товара {0} установлена опция \"Разрешить нулевую ставку оценки\"" @@ -27424,10 +27457,14 @@ msgstr "Ставка оценки товара пересчитывается с msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "Перепроведение оценки товара в процессе. Отчёт может показывать некорректную оценку товара." -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "Вариант продукта {0} с этими атрибутами уже существует" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "Элемент {0} добавлен несколько раз под одним и тем же родительским элементом {1} в строках {2} и {3}" @@ -27441,7 +27478,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "Товар {0} не может быть заказан больше, чем {1} по общему заказу {2}." #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "Продукт {0} не существует" @@ -27449,7 +27486,7 @@ msgstr "Продукт {0} не существует" msgid "Item {0} does not exist in the system or has expired" msgstr "Продукт {0} не существует или просрочен" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "Товар {0} не существует." @@ -27465,15 +27502,15 @@ msgstr "Продукт {0} уже возвращен" msgid "Item {0} has been disabled" msgstr "Продукт {0} не годен" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "Товар {0} не имеет серийного номера. Только товары с серийным номером могут иметь доставку на основе серийного номера" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "Продукт {0} достигокончания срока годности на {1}" @@ -27485,19 +27522,23 @@ msgstr "Продукт {0} игнорируется, так как это не msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "Товар {0} уже зарезервирован/доставлен по заказу на продажу {1}." -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "Продукт {0} отменен" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "Продукт {0} отключен" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "Продукт {0} не сериализованным продуктом" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "Продукта {0} нет на складе" @@ -27505,7 +27546,11 @@ msgstr "Продукта {0} нет на складе" msgid "Item {0} is not a subcontracted item" msgstr "Элемент {0} не является субподрядным элементом" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "Продукт {0} не активен или истек срок годности" @@ -27521,7 +27566,7 @@ msgstr "Товар {0} должен быть нескладским товаро msgid "Item {0} must be a non-stock item" msgstr "Продукт {0} должен отсутствовать на складе" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "Товар {0} не найден в таблице «Поставляемое сырье» в {1} {2}" @@ -27537,7 +27582,7 @@ msgstr "Пункт {0}: Заказал Кол-во {1} не может быть msgid "Item {0}: {1} qty produced. " msgstr "Элемент {0}: произведено {1} кол-во. " -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "Товар {} не существует." @@ -27647,7 +27692,7 @@ msgstr "Товары для запроса сырья" msgid "Items not found." msgstr "Элементы не найдены." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "Ставка по предметам обновлена до нуля, так как опция «Разрешить нулевую ставку оценки» отмечена для следующих предметов: {0}" @@ -28280,7 +28325,7 @@ msgstr "Последний отсканированный склад" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "Последняя складская операция для товара {0} на складе {1} была произведена {2}." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28559,7 +28604,7 @@ msgstr "Пояснение" msgid "Length (cm)" msgstr "Длина (см)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "Меньше чем сумма" @@ -28700,7 +28745,7 @@ msgstr "Связанные счета-фактуры" msgid "Linked Location" msgstr "Связанное местоположение" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "Связано с отправленными документами" @@ -29095,11 +29140,6 @@ msgstr "Обслуживание актива" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "Поддерживать одинаковую ставку на протяжении всей внутренней транзакции" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "Поддерживать одинаковую ставку на протяжении всего цикла покупки" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29111,6 +29151,11 @@ msgstr "Поддерживать запасы" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29307,7 +29352,7 @@ msgid "Major/Optional Subjects" msgstr "Основные/Дополнительные предметы" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29476,8 +29521,8 @@ msgstr "Обязательный раздел" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29536,8 +29581,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29686,7 +29731,7 @@ msgstr "Дата изготовления" msgid "Manufacturing Manager" msgstr "Менеджер производства" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "Производство Количество является обязательным" @@ -29962,7 +30007,7 @@ msgstr "Расход материала" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "Потребление материалов для производства" @@ -30033,6 +30078,7 @@ msgstr "Материал Поступление" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30139,11 +30185,11 @@ msgstr "Позиция плана запроса материала" msgid "Material Request Type" msgstr "Тип запросов на материалы" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "Запрос материала не создан, так как количество сырья уже доступно." @@ -30258,7 +30304,7 @@ msgstr "Материал передан для производства" msgid "Material Transferred for Manufacturing" msgstr "Материал передан для производства" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30387,11 +30433,11 @@ msgstr "Максимальная сумма платежа" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "Максимальные образцы - {0} могут сохраняться для Batch {1} и Item {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "Максимальные образцы - {0} уже сохранены для Batch {1} и Item {2} в пакете {3}." @@ -30835,11 +30881,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "Прочие расходы" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "Несоответствие" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "Отсутствует" @@ -30877,7 +30923,7 @@ msgstr "Отсутствуют фильтры" msgid "Missing Finance Book" msgstr "Отсутствует финансовая книга" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "Отсутствующая готовая продукция" @@ -30885,11 +30931,11 @@ msgstr "Отсутствующая готовая продукция" msgid "Missing Formula" msgstr "Отсутствует формула" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "Отсутствующие предметы" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30933,10 +30979,6 @@ msgstr "Отсутствующие значение" msgid "Mixed Conditions" msgstr "Смешанные условия" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "Мобильный: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31205,7 +31247,7 @@ msgstr "" msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "Несколько финансовых лет существуют на дату {0}. Пожалуйста, установите компанию в финансовый год" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "Нельзя отметить несколько товаров как готовую продукцию" @@ -31284,27 +31326,20 @@ msgstr "Названное место" msgid "Naming Series Prefix" msgstr "Префикс серии именования" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "Именование серий и настройки цены по умолчанию" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "Обязательная серия именования" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31352,16 +31387,16 @@ msgstr "Анализ потребностей" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "Отрицательное количество недопустимо" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "Отрицательная ошибка запаса" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "Отрицательный Оценка курс не допускается" @@ -31975,7 +32010,7 @@ msgstr "Не найден профиль POS. Сначала создайте н #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "Нет разрешения" @@ -31988,7 +32023,7 @@ msgstr "Заказы на закупку не были созданы" msgid "No Records for these settings." msgstr "Нет записей для этих настроек." -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "Ничего не выбрано" @@ -32033,7 +32068,7 @@ msgstr "Для этого контрагента не найдено несог msgid "No Work Orders were created" msgstr "Заказы на работы не созданы" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "Нет учетной записи для следующих складов" @@ -32046,7 +32081,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "Для элемента {0} не найдено активной спецификации. Доставка по серийному номеру не может быть гарантирована" @@ -32058,7 +32093,7 @@ msgstr "Нет доступных дополнительных полей" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "Нет доступного количества для резервирования товара {0} на складе {1}" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -32066,7 +32101,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32160,7 +32195,7 @@ msgstr "Нет больше дочерних элементов слева" msgid "No more children on Right" msgstr "Нет больше дочерних элементов справа" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32335,7 +32370,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "Записи в журнале складского учёта не созданы. Пожалуйста, правильно укажите количество или оценочную стоимость товаров и попробуйте снова." @@ -32427,7 +32462,7 @@ msgstr "Ненулевые числа" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "Ни одному продукту не изменено количество или объём." @@ -32531,7 +32566,7 @@ msgstr "Не авторизовано, так как {0} превышает ли msgid "Not authorized to edit frozen Account {0}" msgstr "Не разрешается редактировать замороженный счет {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32577,7 +32612,7 @@ msgstr "Примечание: Оплата Вступление не будет msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "Примечание: Эта МВЗ является Группа. Невозможно сделать бухгалтерские проводки против групп." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "Примечание: Для объединения товаров создайте отдельную сверку остатков для старого товара {0}" @@ -33054,7 +33089,7 @@ msgstr "При применении ненулевой комиссии не д msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "Для заказа на работу {1} можно создать только одну запись {0}" @@ -33206,7 +33241,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "Открытие" @@ -33365,16 +33400,16 @@ msgstr "Созданы начальные счета-фактуры продаж #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Начальный запас" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33731,7 +33766,7 @@ msgstr "Факультативно. Эта установка будет исп msgid "Optional. Used with Financial Report Template" msgstr "Необязательно. Используется с шаблоном финансового отчёта." -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33865,7 +33900,7 @@ msgstr "Заказанное количество" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "Заказы" @@ -34073,7 +34108,7 @@ msgstr "Остаток (в валюте компании)" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34131,7 +34166,7 @@ msgstr "Исходящий заказ" msgid "Over Billing Allowance (%)" msgstr "Допустимый перерасход (%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "Допустимое превышение суммы по счёту-фактуре превышено для позиции Приходной накладной {0} ({1}) на {2}%" @@ -34149,7 +34184,7 @@ msgstr "Допустимое превышение поставки/приема msgid "Over Picking Allowance" msgstr "Допустимое превышение при подборе" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "Превышение по получению" @@ -34392,7 +34427,6 @@ msgstr "Поле точки продаж" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "Счет точки продаж" @@ -34663,7 +34697,7 @@ msgstr "Упаковано" msgid "Packed Items" msgstr "Упакованные товары" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "Упакованные товары не могут быть внутренне перемещены" @@ -35111,7 +35145,7 @@ msgstr "Частично получено" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35247,7 +35281,7 @@ msgstr "Частей на миллион" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35373,7 +35407,7 @@ msgstr "Несоответствие контрагент" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35459,7 +35493,7 @@ msgstr "Товар, привязанный к контрагенту" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35762,7 +35796,6 @@ msgstr "Записи оплаты {0} ип-сшитый" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -36020,7 +36053,7 @@ msgstr "Ссылки на платежи" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36099,10 +36132,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "Статус оплаты" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37123,7 +37152,7 @@ msgstr "Пожалуйста, установите приоритет" msgid "Please Set Supplier Group in Buying Settings." msgstr "Установите группу поставщиков в разделе «Настройки покупок»." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "Пожалуйста, укажите счет" @@ -37155,11 +37184,11 @@ msgstr "Пожалуйста, добавьте временный вступит msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "Пожалуйста, добавьте хотя бы один серийный номер/номер партии" @@ -37179,7 +37208,7 @@ msgstr "Пожалуйста, добавьте аккаунт в компани msgid "Please add {1} role to user {0}." msgstr "Пожалуйста, добавьте роль {1} пользователю {0}." -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "Пожалуйста, измените количество или отредактируйте {0}, чтобы продолжить." @@ -37286,7 +37315,7 @@ msgstr "Пожалуйста, создайте покупку из внутре msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "Создайте квитанцию о покупке или фактуру покупки для товара {0}" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "Пожалуйста, удалите комплект товаров {0} перед объединением {1} в {2}" @@ -37355,11 +37384,11 @@ msgstr "Пожалуйста, введите счет для изменения msgid "Please enter Approving Role or Approving User" msgstr "Пожалуйста, введите утверждении роли или утверждении Пользователь" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "Пожалуйста, введите номер партии" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "Пожалуйста, введите МВЗ" @@ -37371,7 +37400,7 @@ msgstr "Укажите дату поставки" msgid "Please enter Employee Id of this sales person" msgstr "Пожалуйста, введите идентификатор сотрудника этого продавца" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "Пожалуйста, введите Expense счет" @@ -37416,7 +37445,7 @@ msgstr "Пожалуйста, введите дату Ссылка" msgid "Please enter Root Type for account- {0}" msgstr "Пожалуйста, укажите корневой тип для счёта {0}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "Пожалуйста, введите серийный номер" @@ -37493,7 +37522,7 @@ msgstr "Введите дату первой поставки" msgid "Please enter the phone number first" msgstr "Пожалуйста, сначала введите номер телефона" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "Пожалуйста, введите {schedule_date}." @@ -37607,12 +37636,12 @@ msgstr "Пожалуйста, сохраните Заказ на продажу, msgid "Please select Template Type to download template" msgstr "Пожалуйста, выберите Тип шаблона, чтобы скачать шаблон" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "Пожалуйста, выберите Применить скидки на" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "Выберите спецификацию для продукта {0}" @@ -37628,13 +37657,13 @@ msgstr "Пожалуйста, выберите банковский счет" msgid "Please select Category first" msgstr "Пожалуйста, выберите категорию первый" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "Пожалуйста, выберите Charge Тип первый" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "Пожалуйста, выберите компанию" @@ -37643,7 +37672,7 @@ msgstr "Пожалуйста, выберите компанию" msgid "Please select Company and Posting Date to getting entries" msgstr "Выберите компанию и дату проводки для получения записей" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "Пожалуйста, выберите первую компанию" @@ -37692,7 +37721,7 @@ msgstr "Выберите счёт для разниц в периодическ msgid "Please select Posting Date before selecting Party" msgstr "Пожалуйста, выберите Дата публикации, прежде чем выбрать партию" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "Пожалуйста, выберите проводки Дата первого" @@ -37700,11 +37729,11 @@ msgstr "Пожалуйста, выберите проводки Дата пер msgid "Please select Price List" msgstr "Пожалуйста, выберите прайс-лист" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "Пожалуйста, выберите количество продуктов {0}" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "Сначала выберите «Хранилище хранения образцов» в разделе «Настройки запаса»" @@ -37757,7 +37786,7 @@ msgstr "Пожалуйста, выберите заказ на субподря msgid "Please select a Supplier" msgstr "Пожалуйста, выберите поставщика" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "Пожалуйста, выберите склад" @@ -37818,7 +37847,7 @@ msgstr "Пожалуйста, выберите строку для создан msgid "Please select a supplier for fetching payments." msgstr "Пожалуйста, выберите поставщика для получения платежей." -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37838,7 +37867,7 @@ msgstr "Пожалуйста, выберите код товара перед н msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "Выберите хотя бы один фильтр: код товара, партия или серийный номер." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37945,7 +37974,7 @@ msgstr "Пожалуйста, выберите допустимый тип до msgid "Please select weekly off day" msgstr "Пожалуйста, выберите в неделю выходной" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "Пожалуйста, выберите {0} первый" @@ -38085,7 +38114,7 @@ msgstr "Пожалуйста, установите фактический спр msgid "Please set an Address on the Company '%s'" msgstr "Пожалуйста, укажите адрес компании '%s'" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "Пожалуйста, установите счет расходов в таблице товаров" @@ -38129,7 +38158,7 @@ msgstr "Пожалуйста, установите счет расходов п msgid "Please set default UOM in Stock Settings" msgstr "Пожалуйста, установите UOM по умолчанию в настройках акций" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "Пожалуйста, установите счет затрат на проданные товары в компании {0} для учета прибыли и убытка от округления при перемещении запасов" @@ -38248,7 +38277,7 @@ msgstr "Пожалуйста, сначала введите {0}." msgid "Please specify at least one attribute in the Attributes table" msgstr "Пожалуйста, укажите как минимум один атрибут в таблице атрибутов" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "Пожалуйста, сформулируйте либо Количество или оценка Оценить или оба" @@ -38419,7 +38448,7 @@ msgstr "Опубликовано" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38444,7 +38473,7 @@ msgstr "Опубликовано" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38559,7 +38588,7 @@ msgstr "Дата и время публикации" msgid "Posting Time" msgstr "Время публикации" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "Дата публикации и размещения время является обязательным" @@ -38738,6 +38767,12 @@ msgstr "Профилактическое обслуживание" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39031,7 +39066,9 @@ msgstr "Требуется цена или скидка на продукцию" msgid "Price per Unit (Stock UOM)" msgstr "Цена за единицу (складские единицы измерения)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40386,6 +40423,7 @@ msgstr "Расходы на закупку для товара {0}" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40422,6 +40460,12 @@ msgstr "Авансовый счет на покупку" msgid "Purchase Invoice Item" msgstr "Счет на покупку продукта" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40473,6 +40517,7 @@ msgstr "Счета на покупку" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40482,7 +40527,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40599,7 +40644,7 @@ msgstr "Создан заказ на закупку {0}" msgid "Purchase Order {0} is not submitted" msgstr "Заказ на закупку {0} не проведен" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "Заказы" @@ -40662,6 +40707,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40676,7 +40722,7 @@ msgstr "Прайс-лист закупки" msgid "Purchase Receipt" msgstr "Квитанция о покупке" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40942,7 +40988,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41530,7 +41575,7 @@ msgstr "Обзор качества" msgid "Quality Review Objective" msgstr "Цель проверки качества" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41591,7 +41636,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41785,7 +41830,7 @@ msgstr "Строка маршрута запроса" msgid "Queue Size should be between 5 and 100" msgstr "Размер очереди должен быть между 5 и 100" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "Быстрый журнал запись" @@ -41840,7 +41885,7 @@ msgstr "Предложения/Лиды %" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -42003,7 +42048,6 @@ msgstr "Инициировано (Электронная почта)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42413,8 +42457,8 @@ msgstr "Отгрузка сырья клиенту" msgid "Raw SQL" msgstr "Чистый SQL" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "Количество потребляемого сырья будет проверяться на основе требуемого количества FG BOM" @@ -42822,11 +42866,10 @@ msgstr "Сверить банковскую транзакцию" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43350,7 +43393,7 @@ msgstr "Отклоненный пакет серийных номеров и п msgid "Rejected Warehouse" msgstr "Склад брака" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "Склад отклоненных товаров и склад принятых товаров не могут быть одним и тем же." @@ -43400,7 +43443,7 @@ msgid "Remaining Balance" msgstr "Остаток средств" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43454,7 +43497,7 @@ msgstr "Примечание" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43493,7 +43536,7 @@ msgstr "Удалить нулевые значения" msgid "Remove item if charges is not applicable to that item" msgstr "Удалить товар, если к нему не применимы сборы" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "Удалены пункты без изменения в количестве или стоимости." @@ -43898,6 +43941,7 @@ msgstr "Запрос информации" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44171,7 +44215,7 @@ msgstr "Резерв для сборочной единицы" msgid "Reserved" msgstr "Зарезервировано" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "Конфликт зарезервированной партии" @@ -44784,7 +44828,7 @@ msgstr "" msgid "Reversal Of" msgstr "Возврат" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "Обратная запись журнала" @@ -44933,10 +44977,7 @@ msgstr "Роль, разрешающая превышение по достав #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "Роль, разрешающая обойти остановку действий" @@ -44951,8 +44992,11 @@ msgstr "Роль, разрешающая обойти кредитный лим msgid "Role allowed to bypass period restrictions." msgstr "Роль позволяет обходить ограничения по срокам." +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45153,8 +45197,8 @@ msgstr "Резерв на потери от округлений" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "Резерв на потери от округлений должен быть в пределах от 0 до 1" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "Запись о прибыли/убытке от округления при передаче запасов" @@ -45181,11 +45225,11 @@ msgstr "Название маршрута" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "Строка # {0}: Невозможно вернуть более {1} для {2}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "Строка # {0}: Добавьте пакет серийного и партионного учёта для товара {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "Строка # {0}: Укажите количество для товара {1}, так как оно не равно нулю." @@ -45211,7 +45255,7 @@ msgstr "Строка #{0} (таблица платежей): сумма долж msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "Строка #{0} (таблица платежей): сумма должна быть положительной" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "Строка #{0}: Запись о заказе на пополнение уже существует для склада {1} с типом пополнения {2}." @@ -45412,7 +45456,7 @@ msgstr "Строка #{0}: Дублирующая запись в ссылках msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "Строка #{0}: ожидаемая дата поставки не может быть до даты заказа на поставку" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "Строка #{0}: Счет расходов не установлен для товара {1}. {2}" @@ -45472,7 +45516,7 @@ msgstr "Строка #{0}: Необходимо указать поля врем msgid "Row #{0}: Item added" msgstr "Строка #{0}: пункт добавлен" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "Строка #{0}: Товар {1} нельзя перенести более чем в количестве {2} против {3} {4}" @@ -45500,7 +45544,7 @@ msgstr "Строка #{0}: Товар {1} на складе {2}: Доступн msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "Строка #{0}: Позиция {1} должна быть субподрядной." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "Строка #{0}: элемент {1} не является сериализованным / пакетным элементом. Он не может иметь серийный номер / пакетный номер против него." @@ -45553,7 +45597,7 @@ msgstr "Строка #{0}: Только {1} доступно для резерв msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "Строка #{0}: Начисленная амортизация на начало периода должна быть меньше или равна {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "Строка #{0}: операция {1} не завершена для {2} количества готовой продукции в рабочем задании {3}. Пожалуйста, обновите статус операции с помощью Карточки работ {4}." @@ -45578,7 +45622,7 @@ msgstr "Строка #{0}: выберите готовый товар, для к msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Строка #{0}: Выберите склад узлов сборки" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "Строка #{0}: Пожалуйста, укажите количество повторных заказов" @@ -45604,15 +45648,15 @@ msgstr "Строка #{0}: Количество должно быть полож msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "Строка #{0}: Количество должно быть меньше или равно Доступному количеству для резервирования (Фактическое количество - Зарезервированное количество) {1} для товара {2} для партии {3} на складе {4}." -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "Строка #{0}: Для предмета {1} требуется проверка качества" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "Строка #{0}: Проверка качества {1} не проведена для позиции: {2}" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "Строка #{0}: Проверка качества {1} была отклонена для предмета {2}" @@ -45643,11 +45687,11 @@ msgstr "Строка #{0}: Количество для резервирован msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "Строка #{0}: Ставка должна быть такой же, как у {1}: {2} ({3} / {4})" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "Строка #{0}: Тип справочного документа должен быть одним из следующих: Заказ на покупку, Счет-фактура на покупку или Запись в журнале" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "Строка #{0}: Тип ссылочного документа должен быть одним из следующих: Заказ на продажу, Счет-фактура, Запись в журнале или Напоминание." @@ -45693,7 +45737,7 @@ msgstr "Строка #{0}: Продажный курс для товара {1} msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "Строка #{0}: Идентификатор последовательности должен быть {1} или {2} для операции {3}." -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "Строка #{0}: серийный номер {1} не принадлежит партии {2}" @@ -45741,11 +45785,11 @@ msgstr "Строка #{0}: Исходный склад {1} для товара { msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "Строка #{0}: Исходный склад {1} для элемента {2} должен совпадать с исходным складом {3} в рабочем заказе." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "Строка #{0}: Исходный и целевой склады не могут совпадать для передачи материалов." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "Строка #{0}: Размеры исходного, целевого склада и инвентарного запаса не могут быть абсолютно одинаковыми при переносе материала" @@ -45798,11 +45842,11 @@ msgstr "Строка #{0}: Количество на складе {1} ({2}) дл msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "Строка #{0}: целевой склад должен совпадать со складом клиента {1} из связанного внутреннего заказа субподряда." -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "Строка #{0}: срок действия пакета {1} уже истек." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "Строка #{0}: Склад {1} не является дочерним складом группового склада {2}" @@ -45830,7 +45874,7 @@ msgstr "Строка #{0}: Сумма удержания {1} не соответ msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "Строка #{0}: Заказ на работу существует для полного или частичного количества товара {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "Строка #{0}: Нельзя использовать размерность учета '{1}' в документе «Сверка остатков» для изменения количества или оценочной стоимости. Сверка остатков с размерностями предназначена исключительно для ввода начальных остатков." @@ -45866,23 +45910,23 @@ msgstr "Строка #{1}: Склад является обязательным msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "Строка #{idx}: невозможно выбрать склад поставщика при подаче сырья субподрядчику." -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "Строка #{idx}: Стоимость товара была обновлена в соответствии с оценочной ставкой, поскольку это внутреннее перемещение запасов." -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "Строка #{idx}: Укажите местоположение для ОС {item_code}." -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "Строка #{idx}: Полученное количество должно быть равно принятому + отклоненному количеству для товара {item_code}." -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "Строка #{idx}: {field_label} не может быть отрицательным для {item_code}." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "Строка #{idx}: {field_label} обязательна." @@ -45890,7 +45934,7 @@ msgstr "Строка #{idx}: {field_label} обязательна." msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "Строка #{idx}: {from_warehouse_field} и {to_warehouse_field} не могут быть одинаковыми." -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "Строка #{idx}: {schedule_date} не может быть раньше {transaction_date}." @@ -45955,7 +45999,7 @@ msgstr "Строка #{}: {}" msgid "Row #{}: {} {} does not exist." msgstr "Строка № {}: {} {} не существует." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "Строка №{}: {} {} не принадлежит компании {}. Выберите допустимый {}." @@ -45971,7 +46015,7 @@ msgstr "Строка {0}: требуется операция против эл msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "В строке {0} выбранное количество меньше требуемого, требуется дополнительно {1} {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "Строка {0}# Товар {1} не найден в таблице 'Поставленное сырье' в {2} {3}" @@ -46003,7 +46047,7 @@ msgstr "Строка {0}: Выделенная сумма {1} должна бы msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "Строка {0}: Выделенная сумма {1} должна быть меньше или равна оставшейся сумме платежа {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "Строка {0}: Поскольку {1} включен, сырье не может быть добавлено в запись {2}. Используйте запись {3} для расходования сырья." @@ -46062,7 +46106,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "Строка {0}: Обязательно укажите либо товар накладной, либо ссылку на упакованный товар." #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "Строка {0}: Курс является обязательным" @@ -46103,7 +46147,7 @@ msgstr "Строка {0}: От времени и времени является msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "Строка {0}: От времени и времени {1} перекрывается с {2}" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "Строка {0}: Склад отправления обязателен для внутренних перемещений" @@ -46227,7 +46271,7 @@ msgstr "Строка {0}: Количество должно быть больш msgid "Row {0}: Quantity cannot be negative." msgstr "Строка {0}: Количество не может быть отрицательным." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "Строка {0}: количество недоступно для {4} на складе {1} во время проводки записи ({2} {3})" @@ -46239,11 +46283,11 @@ msgstr "Строка {0}: Счет-фактура {1} уже создана дл msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "Строка {0}: Смена не может быть изменена, так как амортизация уже обработана" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "Строка {0}: Субподрядный элемент является обязательным для сырья {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "Строка {0}: Целевой склад обязателен для внутренних переводов" @@ -46267,7 +46311,7 @@ msgstr "Строка {0}: Счет {3} {1} не принадлежит комп msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "Строка {0}: Чтобы задать периодичность {1}, разница между датами «от» и «по» должна быть больше или равна {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "Строка {0}: Передаваемое количество не может превышать запрошенное количество." @@ -46320,7 +46364,7 @@ msgstr "Строка {0}: {2} Товар {1} не существует в {2} {3 msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "Строка {1}: Количество ({0}) не может быть дробью. Чтобы разрешить это, отключите «{2}» в единице измерения {3}." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "Строка №{idx}: Серия наименования ОС обязательна для автосоздания ОС для позиции {item_code}." @@ -46350,7 +46394,7 @@ msgstr "Строки с одинаковыми заголовками счето msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "Были найдены строки с повторяющимися датами в других строках: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "В строках {0} указан тип ссылки 'Платежная операция'. Этот параметр не должен задаваться вручную." @@ -46416,7 +46460,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46713,7 +46757,7 @@ msgstr "Входящая цена продажи" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46887,7 +46931,7 @@ msgstr "Возможности продаж по источникам" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -47010,8 +47054,8 @@ msgstr "Сделка требуется для Продукта {0}" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "Заказ на продажу {0} уже существует для заказа на покупку клиента {1}. Чтобы разрешить несколько заказов на продажу, включите {2} в {3}" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47422,7 +47466,7 @@ msgstr "Тот же товар" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "Такая же комбинация товара и склада уже введена." @@ -47459,7 +47503,7 @@ msgstr "Склад для хранения образцов" msgid "Sample Size" msgstr "Размер образца" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "Количество образцов {0} не может быть больше, чем полученное количество {1}" @@ -47748,7 +47792,7 @@ msgstr "Поиск по коду товара, серийному номеру msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47893,7 +47937,7 @@ msgstr "Выберите бренд..." msgid "Select Columns and Filters" msgstr "Выберите столбцы и фильтры" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "Выберите компанию" @@ -48589,7 +48633,7 @@ msgstr "Диапазон серийных номеров" msgid "Serial No Reserved" msgstr "Серийный номер зарезервирован" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "Серийный без наложения серий" @@ -48650,7 +48694,7 @@ msgstr "Серийный номер обязателен" msgid "Serial No is mandatory for Item {0}" msgstr "Серийный номер является обязательным для продукта {0}" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "Серийный номер {0} уже существует" @@ -48936,7 +48980,7 @@ msgstr "Серийные номера для товара {0} на складе #: 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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48962,7 +49006,7 @@ msgstr "Серийные номера для товара {0} на складе #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49360,12 +49404,6 @@ msgstr "Установить целевой склад" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "Установить ставку оценки на основе исходного склада" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "Установить оценочную стоимость для отклоненных материалов" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "Установить склад" @@ -49471,6 +49509,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "Установить {0} в категории активов {1} для компании {2}" @@ -49969,7 +50013,7 @@ msgstr "Показать остатки в плане счетов" msgid "Show Barcode Field in Stock Transactions" msgstr "Показать поле штрих-кода в операциях с запасами" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "Показать отмененные записи" @@ -49977,7 +50021,7 @@ msgstr "Показать отмененные записи" msgid "Show Completed" msgstr "Показать завершенные" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "Показывать Кредит/Дебет в валюте компании" @@ -50060,7 +50104,7 @@ msgstr "Показать связанные заметки о доставке" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "Показать чистые суммы в счете контрагента" @@ -50072,7 +50116,7 @@ msgstr "" msgid "Show Open" msgstr "Показать открытые" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "Показать вступительные записи" @@ -50085,11 +50129,6 @@ msgstr "Показать начальный и конечный баланс" msgid "Show Operations" msgstr "Показать операции" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "Показать кнопку «Оплатить» на портале заказов на покупку" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "Показать данные платежа" @@ -50105,7 +50144,7 @@ msgstr "Показать график платежей в печатном ви #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "Показать замечания" @@ -50172,6 +50211,11 @@ msgstr "Показать только точки продаж" msgid "Show only the Immediate Upcoming Term" msgstr "Показать только ближайший предстоящий срок" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "Показать записи, находящиеся в ожидании" @@ -50460,11 +50504,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50530,7 +50574,7 @@ msgstr "Исходный склад {0} должен совпадать со с msgid "Source and Target Location cannot be same" msgstr "Источник и целевое местоположение не могут быть одинаковыми" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "Источник и цель склад не может быть одинаковым для ряда {0}" @@ -50544,8 +50588,8 @@ msgid "Source of Funds (Liabilities)" msgstr "Источник финансирования (обязательства)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "Источник склад является обязательным для ряда {0}" @@ -50710,8 +50754,8 @@ msgstr "Расходы по стандартным тарифам" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "Стандартный Продажа" @@ -51044,7 +51088,7 @@ msgstr "Журнал закрытия торгов" msgid "Stock Details" msgstr "Подробности о запасах" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "Записи по запасам уже созданы для заказа на работу {0}: {1}" @@ -51315,7 +51359,7 @@ msgstr "Запас получен, но не выписан счет" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51327,7 +51371,7 @@ msgstr "Инвентаризация запасов" msgid "Stock Reconciliation Item" msgstr "Товар с Сверки Запасов" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "Сверка запасов" @@ -51365,7 +51409,7 @@ msgstr "Настройки пересоздания записей по запа #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51393,7 +51437,7 @@ msgstr "Записи о резервировании запасов отмене #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "Записи о резервировании запасов созданы" @@ -51775,7 +51819,7 @@ msgstr "Прекращенный рабочий заказ не может бы #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "Магазины" @@ -51853,10 +51897,6 @@ msgstr "Вспомогательные операции" msgid "Sub Procedure" msgstr "Вспомогательная процедура" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "Итого" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "Отсутствуют ссылки на элементы узлов. Пожалуйста, повторно заберите узлы и сырье." @@ -52073,7 +52113,7 @@ msgstr "Субподрядная услуга по внутреннему зак msgid "Subcontracting Order" msgstr "Заказ на субподряд" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52099,7 +52139,7 @@ msgstr "Пункт обслуживания заказа на субподряд msgid "Subcontracting Order Supplied Item" msgstr "Поставляемая позиция по субподрядному заказу" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "Заказ на субподряд {0} создан." @@ -52188,7 +52228,7 @@ msgstr "" msgid "Subdivision" msgstr "Подразделение" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "Не удалось выполнить действие" @@ -52363,7 +52403,7 @@ msgstr "Успешно согласовано" msgid "Successfully Set Supplier" msgstr "Поставщик успешно установлен" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "Единица измерения запаса успешно изменена, пожалуйста, переопределите коэффициенты пересчета для новой единицы измерения." @@ -52519,6 +52559,7 @@ msgstr "Поставляемое кол-во" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52560,8 +52601,8 @@ msgstr "Поставляемое кол-во" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52609,6 +52650,12 @@ msgstr "Адреса и контакты поставщика" msgid "Supplier Contact" msgstr "Контакты поставщика" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52703,7 +52750,7 @@ msgstr "Дата выставления счета поставщиком" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "Поставщик Счет №" @@ -52983,19 +53030,10 @@ msgstr "Поставщик товаров или услуг." msgid "Supplier {0} not found in {1}" msgstr "Поставщик {0} не найден в {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Поставщик(и)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "Аналитика продаж в разрезе поставщиков" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53057,7 +53095,7 @@ msgstr "Отдел тех. поддержки" msgid "Support Tickets" msgstr "Заявки на поддержку" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53316,8 +53354,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "Целевой склад {0} должен совпадать со складом доставки {1} в позиции внутреннего заказа субподряда." #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "Целевая склад является обязательным для ряда {0}" @@ -53785,7 +53823,7 @@ msgstr "Налог удерживается только с суммы, прев #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "Налогооблагаемая сумма" @@ -53946,7 +53984,7 @@ msgstr "Налоги и сборы вычтенные" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "Налоги и сборы вычтенные (валюта компании)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "Строка налогов #{0}: {1} не может быть меньше {2}" @@ -54136,7 +54174,6 @@ msgstr "Шаблон условий" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54328,7 +54365,7 @@ msgstr "Доступ к запросу коммерческого предлож msgid "The BOM which will be replaced" msgstr "Спецификация, которая будет заменена" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "В партии {0} отрицательное количество партии {1}. Чтобы исправить это, перейдите к партии и нажмите «Пересчитать количество партии». Если проблема не устранена, создайте входящую запись." @@ -54372,7 +54409,7 @@ msgstr "Условие платежа в строке {0}, возможно, я 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:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "Количество потерь в процессе было сброшено в соответствии с количеством потерь в карточках рабочих заданий" @@ -54388,7 +54425,7 @@ msgstr "Серийный номер в строке #{0}: {1} отсутству msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "Серийный номер {0} зарезервирован для {1} {2} и не может быть использован для какой-либо другой транзакции." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "Набор серийных номеров и партий {0} недействителен для этой операции. Тип операции должен быть \"Исходящий\" вместо \"Входящий\" в наборе серийных номеров и партий {0}" @@ -54424,7 +54461,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "Пакет {0} уже зарезервирован в {1} {2}, поэтому невозможно продолжить работу с {3} {4}, который создан для {5} {6}." @@ -54530,7 +54567,7 @@ msgstr "Срок годности следующих партий истек, п msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "Существуют следующие отмененные записи о репостах для {0}:

{1}

Пожалуйста, удалите эти записи перед продолжением." -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "Следующие удаленные атрибуты существуют в вариантах, но не в шаблоне. Вы можете удалить варианты или оставить атрибут (ы) в шаблоне." @@ -54574,15 +54611,15 @@ msgstr "Праздник на {0} не между From Date и To Date" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "Элемент {item} не отмечен как элемент {type_of} . Вы можете включить его как элемент {type_of} в его мастере элементов." -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "Товары {0} и {1} присутствуют в следующем {2}:" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "Предметы {items} не отмечены как предметы {type_of} . Вы можете включить их как предметы {type_of} в их мастер-классах." @@ -54738,7 +54775,7 @@ msgstr "Акций не существует с {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "Запас товара {0} на складе {1} был отрицательным на {2}. Вам нужно создать положительную запись {3} до даты {4} и времени {5}, чтобы корректно зафиксировать стоимость. Для получения подробной информации, пожалуйста, прочитайте документацию." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "Запасы зарезервированы для следующих товаров и складов, снимите резерв с {0} сверки запасов:

{1}" @@ -54760,11 +54797,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "Задача была поставлена в качестве фонового задания. В случае возникновения каких-либо проблем с обработкой в фоновом режиме система добавит комментарий об ошибке в этой сверке запасов и вернется к этапу черновика" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "Задача поставлена в очередь как фоновое задание. В случае возникновения проблем при обработке в фоновом режиме система добавит комментарий об ошибке в этой сверке запасов и вернется к этапу «Отправлено»" @@ -54836,7 +54873,7 @@ msgstr "{0} ({1}) должен быть равен {2} ({3})" msgid "The {0} contains Unit Price Items." msgstr "{0} Содержит товары с ценой за единицу." -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "Префикс {0} '{1}' уже существует. Пожалуйста, измените серию серийного номера, иначе Вы получите ошибку Duplicate Entry." @@ -54889,7 +54926,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "Нет доступных слотов на эту дату" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54933,7 +54970,7 @@ msgstr "Не найдено ни одной партии для {0}: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "В этой записи о движении товаров должно быть хотя бы одно готовое изделие" @@ -54989,11 +55026,11 @@ msgstr "Этот продукт является вариантом {0} (Шаб msgid "This Month's Summary" msgstr "Резюме этого месяца" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "Данный заказ на поставку был полностью передан субподрядчику." -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "Данный заказ на продажу был полностью передан субподрядчику." @@ -55794,7 +55831,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "Для учета налога в строке {0} в размере Item, налоги в строках должны быть также включены {1}" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов" @@ -55829,7 +55866,7 @@ msgstr "Чтобы использовать другую финансовую к #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "Чтобы использовать другую финансовую книгу, снимите галочку с параметра \"Включать записи по умолчанию для финансовой книги\"" @@ -55980,7 +56017,7 @@ msgstr "Всего выделено" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Общая сумма" @@ -56403,7 +56440,7 @@ msgstr "Общая сумма запроса платежа не может пр msgid "Total Payments" msgstr "Всего платежей" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "Общее количество подобранных товаров {0} больше заказанного количества {1}. Вы можете установить допуск на подбор сверх нормы в настройках запаса." @@ -56435,7 +56472,7 @@ msgstr "Общая стоимость покупки (по счету-факту #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Общее количество" @@ -56821,7 +56858,7 @@ msgstr "URL отслеживания" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56832,7 +56869,7 @@ msgstr "Транзакция" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "Валюта транзакции" @@ -57504,11 +57541,11 @@ msgstr "Настройки НДС в ОАЭ" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57580,7 +57617,7 @@ msgstr "Фактор Единица измерения преобразован msgid "UOM Name" msgstr "Название единицы измерения" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "Требуется коэффициент преобразования для единицы измерения: {0} в товаре: {1}" @@ -57656,7 +57693,7 @@ msgstr "Не удалось найти результат, начинающий msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "Не удалось найти временной интервал в ближайшие {0} дней для операции {1}. Пожалуйста, увеличьте «Планирование мощности на (дней)» в {2}." -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "Не удалось найти переменную:" @@ -57775,7 +57812,7 @@ msgstr "Единица измерения" msgid "Unit of Measure (UOM)" msgstr "Единица измерения (ЕИ)" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor" @@ -57895,10 +57932,9 @@ msgid "Unreconcile Transaction" msgstr "Несогласованная транзакция" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "Несверенный" @@ -57921,10 +57957,6 @@ msgstr "Несогласованные записи" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57970,7 +58002,7 @@ msgstr "Незапланированный" msgid "Unsecured Loans" msgstr "Необеспеченных кредитов" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "Отменить привязку платежной записи и запроса на оплату" @@ -58185,12 +58217,6 @@ msgstr "Обновить запасы" msgid "Update Type" msgstr "Обновить тип" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "Частота обновления проекта" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58231,7 +58257,7 @@ msgstr "Обновлены {0} строки финансового отчета msgid "Updating Costing and Billing fields against this Project..." msgstr "Обновление полей себестоимости и выставления счетов по этому проекту..." -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "Обновление вариантов..." @@ -58689,12 +58715,6 @@ msgstr "Проверить примененное правило" msgid "Validate Components and Quantities Per BOM" msgstr "Проверка компонентов и количества по спецификации" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "Проверить потребленное количество (согласно спецификации)" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58718,6 +58738,12 @@ msgstr "Проверить правило ценообразования" msgid "Validate Stock on Save" msgstr "Проверить наличие товара на складе при сохранении" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58824,11 +58850,11 @@ msgstr "Оценка ставки отсутствует" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "Курс оценки для Предмета {0}, необходим для ведения бухгалтерских записей для {1} {2}." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "Ставка оценки является обязательной, если введен начальный запас" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "Коэффициент оценки требуется для позиции {0} в строке {1}" @@ -58838,7 +58864,7 @@ msgstr "Коэффициент оценки требуется для позиц msgid "Valuation and Total" msgstr "Оценка и итог" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "Оценочная стоимость для товаров, предоставленных клиентами, установлена на уровне нуля." @@ -58988,7 +59014,7 @@ msgstr "Дисперсия ({})" msgid "Variant" msgstr "Вариант" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "Ошибка атрибута варианта" @@ -59007,7 +59033,7 @@ msgstr "Вариант спецификации" msgid "Variant Based On" msgstr "Вариант на основе" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "Вариант на основе не может быть изменен" @@ -59025,7 +59051,7 @@ msgstr "Поле вариантов" msgid "Variant Item" msgstr "Вариант товара" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "Варианты предметов" @@ -59406,7 +59432,7 @@ msgstr "Наименование документа" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59446,7 +59472,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "Подтип документа" @@ -59478,7 +59504,7 @@ msgstr "Подтип документа" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59713,7 +59739,7 @@ msgstr "Склад {0} не существует" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "Склад {0} не допускается для заказа на продажу {1}, он должен быть {2}" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "Склад {0} не привязан ни к одному счету, пожалуйста, укажите счет в записи склада или установите счет инвентаризации по умолчанию в компании {1}." @@ -59760,7 +59786,7 @@ msgstr "Склады с существующей транзакции не мо #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59816,6 +59842,12 @@ msgstr "Предупреждение о новом запросе на пред msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "Предупреждение — Строка {0}: Количество часов для выставления счета больше фактически затраченных часов" @@ -59999,7 +60031,7 @@ msgstr "Технические характеристики вебсайта" msgid "Website:" msgstr "Сайт:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60373,7 +60405,7 @@ msgstr "Использованные материалы по заказу на msgid "Work Order Item" msgstr "Продукт под заказ" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60435,11 +60467,11 @@ msgstr "Рабочий заказ не создан" msgid "Work Order {0} created" msgstr "Производственный заказ {0} создан" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "Заказ на работу {0}: карточка задания не найдена для операции {1}" @@ -60755,11 +60787,11 @@ msgstr "Название года" msgid "Year Start Date" msgstr "Дата начала года" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60812,7 +60844,7 @@ msgstr "Вы также можете скопировать и вставить msgid "You can also set default CWIP account in Company {}" msgstr "Вы также можете установить учетную запись CWIP по умолчанию в Company {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60966,6 +60998,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60994,7 +61030,7 @@ msgstr "Вы включили {0} и {1} в {2}. Это может привес msgid "You have entered a duplicate Delivery Note on Row" msgstr "Вы ввели дубликат транспортной накладной в строке" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -61002,7 +61038,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "Вы должны включить автоматический повторный заказ в настройках запаса, чтобы поддерживать уровни повторного заказа." @@ -61073,8 +61109,11 @@ msgstr "Нулевая ставка" msgid "Zero quantity" msgstr "Нулевое количество" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61186,7 +61225,7 @@ msgstr "exchangerate.host" msgid "fieldname" msgstr "имя поля" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61404,6 +61443,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "уникальный код, например SAVE20, для получения скидки" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "отклонение" @@ -61462,7 +61505,8 @@ msgstr "Использован {0} купон: {1}. Допустимое кол msgid "{0} Digest" msgstr "{0} Дайджест" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61482,7 +61526,7 @@ msgstr "{0} Операции: {1}" msgid "{0} Request for {1}" msgstr "{0} Запрос на {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} Сохранение образца основано на партии, пожалуйста, проверьте «Hes Batch No», чтобы сохранить образец товара" @@ -61595,7 +61639,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} введен дважды в налог продукта" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "{0} введено дважды {1} в Налоги на товары" @@ -61763,7 +61807,7 @@ msgstr "Недопустимый параметр {0}" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} записи оплаты не могут быть отфильтрованы по {1}" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "{0} количество товара {1} поступает на склад {2} вместимостью {3}." @@ -61776,7 +61820,7 @@ msgstr "{0} до {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "{0} единиц зарезервировано для товара {1} на складе {2}, пожалуйста, снимите резервирование с {3} для сверки запасов." @@ -61978,7 +62022,7 @@ msgstr "{0} {1}: Счет {2} неактивен" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: Бухгалтерская запись для {2} может быть сделана только в валюте: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: Центр затрат является обязательным для элемента {2}" @@ -62064,23 +62108,23 @@ msgstr "{0}: {1} не существует" msgid "{0}: {1} is a group account." msgstr "{0}: {1} — групповая учетная запись." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} должно быть меньше {2}" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "Создано {count} ОС для {item_code}" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} отменено или закрыто." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "Размер выборки {item_name}({sample_size}) не может быть больше, чем допустимое количество ({accepted_quantity})" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "{ref_doctype} {ref_name} имеет статус {status}." diff --git a/erpnext/locale/sl.po b/erpnext/locale/sl.po index 30f6441601b..76984a6d35f 100644 --- a/erpnext/locale/sl.po +++ b/erpnext/locale/sl.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:21\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:21\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Slovenian\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr " Podsestav" msgid " Summary" msgstr " Povzetek" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"Artikel, ki ga zagotovi stranka\" ne more biti tudi predmet nakupa" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "»Artikel, ki ga zagotovi stranka« ne more imeti Stopnje Vrednotenja" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "»Je Osnovno Sredstvo« ni mogoče odznačiti, ker za element obstaja zapis sredstva" @@ -302,7 +302,7 @@ msgstr "\"Od Datuma\" je obvezno" msgid "'From Date' must be after 'To Date'" msgstr "\"Od Datuma\" mora biti za \"Do Datuma\"" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "\"Ima serijsko številko\" ne more biti \"Da\" za artikel, ki ni na zalogi" @@ -338,7 +338,7 @@ msgstr "\"Posodobi zaloge\" ni mogoče preveriti, ker izdelki niso dostavljeni p msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "\"Posodobi zalogo\" ni mogoče označiti za prodajo osnovnih sredstev" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "'{0}' račun že uporablja {1}. Uporabite drug račun." @@ -1091,7 +1091,7 @@ msgstr "" msgid "A logical Warehouse against which stock entries are made." msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1303,7 +1303,7 @@ msgstr "" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "V skladu s CEFACT/ICG/2010/IC013 ali CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "V skladu s Kosovnico {0} v vnosu zaloge manjka postavka '{1}'." @@ -1973,8 +1973,8 @@ msgstr "Računovodski Vnosi" msgid "Accounting Entry for Asset" msgstr "Računovodski Vnos za Sredstvo" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1982,7 +1982,7 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Računovodski Vnos za Storitev" @@ -1995,16 +1995,16 @@ msgstr "Računovodski Vnos za Storitev" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Računovodski Vnos za Zalogo" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "Računovodski Vnos za {0}" @@ -2302,12 +2302,6 @@ msgstr "" msgid "Action If Quality Inspection Is Rejected" msgstr "" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "Dejanje Inicializirano" @@ -2366,6 +2360,12 @@ msgstr "" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2633,7 +2633,7 @@ msgstr "Dejanski Čas v Urah (prek Časovnega Lista)" msgid "Actual qty in stock" msgstr "Dejanska količina na zalogi" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "" @@ -2647,7 +2647,7 @@ msgstr "Namen Količina" msgid "Add / Edit Prices" msgstr "Dodaj/Uredi Cene" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "Dodaj stolpce v valuti transakcije" @@ -2801,7 +2801,7 @@ msgstr "Dodaj Serijsko/Šaržno Številko" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "Dodaj Serijsko/ Šaržno Številko (Zavrnjena Količina)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -3046,7 +3046,7 @@ msgstr "Dodatni Znesek Popusta" msgid "Additional Discount Amount (Company Currency)" msgstr "Dodatni Znesek Popusta (Valuta Podjetja)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "Dodatni Znesek Popusta ({discount_amount}) ne sme presegati skupnega zneska pred takim popustom ({total_before_discount})" @@ -3331,7 +3331,7 @@ msgstr "Prilagodi Količino" msgid "Adjustment Against" msgstr "Prilagoditev proti" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "" @@ -3444,7 +3444,7 @@ msgstr "" msgid "Advance amount" msgstr "Znesek Predplačila" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "" @@ -3513,7 +3513,7 @@ msgstr "Proti" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Proti Računu" @@ -3631,7 +3631,7 @@ msgstr "" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "" @@ -3655,7 +3655,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "" @@ -3936,7 +3936,7 @@ msgstr "" msgid "All items are already requested" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "" @@ -3944,7 +3944,7 @@ msgstr "" msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "" @@ -3993,7 +3993,7 @@ msgstr "Dodeli" msgid "Allocate Advances Automatically (FIFO)" msgstr "Samodejna Dodelitev Predplačil (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Dodeli Znesek Plačila" @@ -4003,7 +4003,7 @@ msgstr "Dodeli Znesek Plačila" msgid "Allocate Payment Based On Payment Terms" msgstr "Dodeli Plačilo na podlagi Plačilnih Pogojev" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "" @@ -4033,7 +4033,7 @@ msgstr "Dodeljeno" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4154,15 +4154,15 @@ msgstr "Dovoli Vračila" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4191,12 +4191,6 @@ msgstr "Dovoli Negativno Zalogo" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "Dovoli negativne cene za artikle" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4409,8 +4403,11 @@ msgstr "" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4502,7 +4499,7 @@ msgstr "" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4699,7 +4696,7 @@ msgstr "Vedno Vprašaj" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4729,7 +4726,6 @@ msgstr "Vedno Vprašaj" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4899,10 +4895,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "Znesek v valuti računa" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "Znesek v Besedah" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5522,7 +5514,7 @@ msgstr "" msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "" -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "" @@ -5672,7 +5664,7 @@ msgstr "Račun Kategorije Sredstev" msgid "Asset Category Name" msgstr "Ime Kategorije Sredstva" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "" @@ -6068,7 +6060,7 @@ msgstr "" msgid "Asset {0} must be submitted" msgstr "" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6106,11 +6098,11 @@ msgstr "Sredstva" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "" -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "" @@ -6183,7 +6175,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "" @@ -6215,7 +6207,7 @@ msgstr "V vrstici {0}: Količina je obvezna za šaržo {1}" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "V vrstici {0}: Za artikel {1}je obvezna številka šarže." -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "" @@ -6279,7 +6271,11 @@ msgstr "Ime Atributa" msgid "Attribute Value" msgstr "Vrednost Atributa" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "Tabela Atributov je obvezna" @@ -6287,11 +6283,19 @@ msgstr "Tabela Atributov je obvezna" msgid "Attribute value: {0} must appear only once" msgstr "" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Atributi" @@ -6351,24 +6355,12 @@ msgstr "" msgid "Auto Create Exchange Rate Revaluation" msgstr "" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6487,6 +6479,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6704,7 +6708,7 @@ msgstr "" msgid "Available for use date is required" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "" @@ -6803,7 +6807,7 @@ msgstr "" msgid "BIN Qty" msgstr "Skladiščna Količina" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7076,7 +7080,7 @@ msgstr "Artikel Spletnega Mesta Kosovnice" msgid "BOM Website Operation" msgstr "Delovanje spletne strani Kosovnice" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7167,8 +7171,8 @@ msgstr "Retroaktivno Pridobi Material iz zaloge nedokončane proizvodnje" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "Retroaktivno Pridobi Material podizvajalske pogodbe na podlagi" +msgid "Backflush raw materials of subcontract based on" +msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7188,7 +7192,7 @@ msgstr "Stanje" msgid "Balance (Dr - Cr)" msgstr "Stanje (Dr - Cr)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Stanje ({0})" @@ -7719,11 +7723,11 @@ msgstr "Bančništvo" msgid "Barcode Type" msgstr "Tip Črtne Kode" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "Črtna koda {0} je že uporabljena v artiklu {1}" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "Črtna koda {0} ni veljavna koda {1}" @@ -8090,12 +8094,12 @@ msgstr "Šarža {0} in Skladišče" msgid "Batch {0} is not available in warehouse {1}" msgstr "Šarža {0} ni na voljo v skladišču {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "Šarža {0} artikla {1} je potekla." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "Šarža {0} artikla {1} je onemogočena." @@ -8168,7 +8172,7 @@ msgstr "Številka Fakture" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" +msgid "Bill for rejected quantity in Purchase Invoice" msgstr "" #. Label of a Card Break in the Manufacturing Workspace @@ -8509,8 +8513,11 @@ msgstr "Artikel Naročila Pogodbe" msgid "Blanket Order Rate" msgstr "Cena Naročila Pogodbe" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -9025,7 +9032,7 @@ msgstr "Nakup in Prodaja" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "Privzeto je ime dobavitelja nastavljeno kot vneseno ime dobavitelja. Če želite, da se dobavitelji poimenujejo po seriji poimenovanj, izberite možnost \"Serija poimenovanj\"." @@ -9390,7 +9397,7 @@ msgstr "" msgid "Can only make payment against unbilled {0}" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9446,9 +9453,9 @@ msgstr "" msgid "Cannot Create Return" msgstr "" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "" @@ -9476,7 +9483,7 @@ msgstr "" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "" @@ -9512,7 +9519,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9520,7 +9527,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "" -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "" @@ -9532,7 +9539,7 @@ msgstr "" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "" @@ -9560,11 +9567,11 @@ msgstr "" msgid "Cannot covert to Group because Account Type is selected." msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9590,7 +9597,7 @@ msgstr "" msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "" @@ -9627,7 +9634,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9635,8 +9642,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "" @@ -9680,7 +9687,7 @@ msgstr "" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9698,8 +9705,8 @@ msgstr "" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9715,7 +9722,7 @@ msgstr "" msgid "Cannot set authorization on basis of Discount for {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "" @@ -10626,7 +10633,7 @@ msgstr "" msgid "Closing (Dr)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "" @@ -11087,7 +11094,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11369,7 +11376,7 @@ msgstr "Podjetje" msgid "Company Abbreviation" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11382,7 +11389,7 @@ msgstr "" msgid "Company Account" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "" @@ -11558,7 +11565,7 @@ msgstr "" msgid "Company is mandatory" msgstr "" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "" @@ -11829,7 +11836,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11842,7 +11849,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11860,13 +11869,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "" @@ -12044,7 +12053,7 @@ msgstr "" msgid "Consumed" msgstr "Porabljeno" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "" @@ -12088,7 +12097,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12261,10 +12270,6 @@ msgstr "" msgid "Contact:" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Kontakt: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12442,7 +12447,7 @@ msgstr "Pretvorbeni Faktor" msgid "Conversion Rate" msgstr "" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "" @@ -12714,7 +12719,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12809,7 +12814,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "" @@ -13147,7 +13152,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "" @@ -13520,7 +13525,7 @@ msgstr "" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "" @@ -13661,15 +13666,15 @@ msgstr "" msgid "Credit" msgstr "Kredit" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "" @@ -13864,7 +13869,7 @@ msgstr "" msgid "Creditors" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14162,7 +14167,7 @@ msgstr "" msgid "Current Serial No" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14363,7 +14368,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15136,7 +15141,7 @@ msgstr "" msgid "Day Of Week" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15252,11 +15257,11 @@ msgstr "" msgid "Debit" msgstr "Debit" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "" @@ -15266,7 +15271,7 @@ msgstr "" msgid "Debit / Credit Note Posting Date" msgstr "Datum Knjiženja Debetne/Kreditne Fakture" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "" @@ -15377,7 +15382,7 @@ msgstr "" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15519,7 +15524,7 @@ msgstr "" msgid "Default BOM" msgstr "Privzeta Kosovnica" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "Privzeta Kosovnica({0}) mora biti aktivna za ta artikel ali njegovo predlogo" @@ -15876,15 +15881,15 @@ msgstr "" msgid "Default Unit of Measure" msgstr "" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "" -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "" @@ -16185,7 +16190,7 @@ msgstr "" msgid "Delivered" msgstr "Dostavljeno" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Dostavljeni Znesek" @@ -16235,8 +16240,8 @@ msgstr "Dostavljeni Artikli za Fakturiranje" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16247,11 +16252,11 @@ msgstr "Dostavljena Količina" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16340,7 +16345,7 @@ msgstr "Vodja Dostave" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16865,7 +16870,7 @@ msgstr "" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "" @@ -17029,10 +17034,8 @@ msgstr "" msgid "Disable In Words" msgstr "" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' @@ -17074,6 +17077,12 @@ msgstr "" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17130,7 +17139,7 @@ msgstr "" msgid "Disassemble Order" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17655,6 +17664,12 @@ msgstr "" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17745,9 +17760,12 @@ msgstr "" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17765,6 +17783,10 @@ msgstr "" msgid "Document Type already used as a dimension" msgstr "" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18069,7 +18091,7 @@ msgstr "" msgid "Duplicate Sales Invoices found" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18189,8 +18211,8 @@ msgstr "" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18413,7 +18435,7 @@ msgstr "" msgid "Email Sent to Supplier {0}" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18603,7 +18625,7 @@ msgstr "Id Uporabnika" msgid "Employee cannot report to himself." msgstr "Osebje ne more poročati sam sebi." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18611,7 +18633,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "Osebje je obvezano pri izdaji sredstva {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18624,7 +18646,7 @@ msgstr "" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18667,7 +18689,7 @@ msgstr "" msgid "Enable Auto Email" msgstr "" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "" @@ -19265,7 +19287,7 @@ msgid "Error: This asset already has {0} depreciation periods booked.\n" "\t\t\t\t\tPlease correct the dates accordingly." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "" @@ -19311,7 +19333,7 @@ msgstr "" msgid "Example URL" msgstr "" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "" @@ -19340,7 +19362,7 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19699,7 +19721,7 @@ msgstr "" msgid "Expense" msgstr "" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "" @@ -19747,7 +19769,7 @@ msgstr "" msgid "Expense Account" msgstr "" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "" @@ -20210,7 +20232,7 @@ msgstr "" msgid "Filter by Reference Date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20540,7 +20562,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20635,7 +20657,7 @@ msgstr "" msgid "Fiscal Year" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20699,7 +20721,7 @@ msgstr "" msgid "Fixed Asset Defaults" msgstr "" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "" @@ -20849,7 +20871,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20880,7 +20902,7 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "" @@ -20964,6 +20986,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20985,7 +21013,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -20994,7 +21022,7 @@ msgstr "" msgid "For reference" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" @@ -21018,7 +21046,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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -21027,7 +21055,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "" @@ -21640,7 +21668,7 @@ msgstr "" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21652,7 +21680,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "" @@ -22167,7 +22195,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -22350,7 +22378,7 @@ msgstr "" msgid "Grant Commission" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "" @@ -22991,10 +23019,10 @@ msgstr "" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" +msgid "How often should project be updated of Total Purchase Cost ?" msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling @@ -23149,7 +23177,7 @@ msgstr "" msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23331,7 +23359,7 @@ msgstr "" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23503,11 +23531,11 @@ msgstr "" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "" @@ -23623,7 +23651,7 @@ msgstr "" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23675,7 +23703,7 @@ msgstr "" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "Prezri sistemsko ustvarjene Kreditne/Debetne Fakture" @@ -23718,7 +23746,7 @@ msgstr "" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23732,6 +23760,7 @@ msgid "Implementation Partner" msgstr "" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24085,7 +24114,7 @@ msgstr "" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24339,7 +24368,7 @@ msgstr "" msgid "Incorrect Batch Consumed" msgstr "" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "" @@ -24347,7 +24376,7 @@ msgstr "" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "" @@ -24557,14 +24586,14 @@ msgstr "" msgid "Inspected By" msgstr "" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "" @@ -24581,7 +24610,7 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "" @@ -24663,8 +24692,8 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "" @@ -24884,7 +24913,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -24977,7 +25006,7 @@ msgstr "" msgid "Invalid Discount" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -25007,7 +25036,7 @@ msgstr "" msgid "Invalid Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "" @@ -25093,12 +25122,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25135,7 +25164,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Nepravilno poimenovanje serije (. manjka) za {0}" @@ -25264,7 +25293,6 @@ msgstr "" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "" @@ -25285,10 +25313,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25810,12 +25834,12 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' @@ -26088,7 +26112,7 @@ msgstr "" msgid "Issuing Date" msgstr "" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" @@ -26158,7 +26182,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26205,6 +26229,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26220,7 +26245,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26984,6 +27008,7 @@ msgstr "" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26994,7 +27019,6 @@ msgstr "" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27254,11 +27278,11 @@ msgstr "" msgid "Item Variant {0} already exists with same attributes" msgstr "" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "" @@ -27297,6 +27321,15 @@ msgstr "" msgid "Item Weight Details" msgstr "Podrobnosti o Teži Artikla" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27326,7 +27359,7 @@ msgstr "" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27346,11 +27379,11 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "" @@ -27380,7 +27413,7 @@ msgstr "" msgid "Item qty can not be updated as raw materials are already processed." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27399,10 +27432,14 @@ msgstr "" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27416,7 +27453,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "Artikla {0} ni mogoče naročiti za več kot {1} v okviru Naročila Pogodbe {2}." #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "" @@ -27424,7 +27461,7 @@ msgstr "" msgid "Item {0} does not exist in the system or has expired" msgstr "" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "" @@ -27440,15 +27477,15 @@ msgstr "" msgid "Item {0} has been disabled" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "" @@ -27460,19 +27497,23 @@ msgstr "" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "" @@ -27480,7 +27521,11 @@ msgstr "" msgid "Item {0} is not a subcontracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -27496,7 +27541,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27512,7 +27557,7 @@ msgstr "" msgid "Item {0}: {1} qty produced. " msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "" @@ -27622,7 +27667,7 @@ msgstr "" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -28255,7 +28300,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28533,7 +28578,7 @@ msgstr "" msgid "Length (cm)" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "" @@ -28674,7 +28719,7 @@ msgstr "" msgid "Linked Location" msgstr "" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "" @@ -29069,11 +29114,6 @@ msgstr "" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29085,6 +29125,11 @@ msgstr "" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29281,7 +29326,7 @@ msgid "Major/Optional Subjects" msgstr "" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29450,8 +29495,8 @@ msgstr "" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29510,8 +29555,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json @@ -29660,7 +29705,7 @@ msgstr "" msgid "Manufacturing Manager" msgstr "Vodja Proizvodnje" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "Proizvodnja Količina je obvezna" @@ -29936,7 +29981,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -30007,6 +30052,7 @@ msgstr "" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30113,11 +30159,11 @@ msgstr "" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "" @@ -30232,7 +30278,7 @@ msgstr "" msgid "Material Transferred for Manufacturing" msgstr "" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30361,11 +30407,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -30809,11 +30855,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "" @@ -30851,7 +30897,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "" @@ -30859,11 +30905,11 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30907,10 +30953,6 @@ msgstr "" msgid "Mixed Conditions" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "" - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31179,7 +31221,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:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31258,27 +31300,20 @@ msgstr "" msgid "Naming Series Prefix" msgstr "Predpona Poimenovanja Serije" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "Poimenovanje Serij & Privzete Cene" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "Poimenovanje Serije je obvezno" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31326,16 +31361,16 @@ msgstr "" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "" @@ -31949,7 +31984,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "" @@ -31962,7 +31997,7 @@ msgstr "" msgid "No Records for these settings." msgstr "" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "" @@ -32007,7 +32042,7 @@ msgstr "" msgid "No Work Orders were created" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "" @@ -32020,7 +32055,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "" @@ -32032,7 +32067,7 @@ msgstr "" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -32040,7 +32075,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32134,7 +32169,7 @@ msgstr "" msgid "No more children on Right" msgstr "" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32309,7 +32344,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32401,7 +32436,7 @@ msgstr "" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "" @@ -32505,7 +32540,7 @@ msgstr "" msgid "Not authorized to edit frozen Account {0}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32551,7 +32586,7 @@ msgstr "" msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "" -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "" @@ -33028,7 +33063,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33179,7 +33214,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "" @@ -33338,16 +33373,16 @@ msgstr "" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33704,7 +33739,7 @@ msgstr "" msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33838,7 +33873,7 @@ msgstr "" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "" @@ -34046,7 +34081,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34104,7 +34139,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34122,7 +34157,7 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "" @@ -34365,7 +34400,6 @@ msgstr "" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "" @@ -34636,7 +34670,7 @@ msgstr "" msgid "Packed Items" msgstr "Pakirani Artikli" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -35084,7 +35118,7 @@ msgstr "" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35220,7 +35254,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35346,7 +35380,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35432,7 +35466,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35735,7 +35769,6 @@ msgstr "" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35993,7 +36026,7 @@ msgstr "" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36072,10 +36105,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37095,7 +37124,7 @@ msgstr "" msgid "Please Set Supplier Group in Buying Settings." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "" @@ -37127,11 +37156,11 @@ msgstr "" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "Prosimo, dodajte vsaj eno Serijsko Številko / Številko Šarže" @@ -37151,7 +37180,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -37258,7 +37287,7 @@ msgstr "" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "" @@ -37327,11 +37356,11 @@ msgstr "" msgid "Please enter Approving Role or Approving User" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "" @@ -37343,7 +37372,7 @@ msgstr "" msgid "Please enter Employee Id of this sales person" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "" @@ -37388,7 +37417,7 @@ msgstr "" msgid "Please enter Root Type for account- {0}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "" @@ -37465,7 +37494,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37579,12 +37608,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "" @@ -37600,13 +37629,13 @@ msgstr "" msgid "Please select Category first" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "" @@ -37615,7 +37644,7 @@ msgstr "" msgid "Please select Company and Posting Date to getting entries" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "" @@ -37664,7 +37693,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "" @@ -37672,11 +37701,11 @@ msgstr "" msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "" @@ -37729,7 +37758,7 @@ msgstr "" msgid "Please select a Supplier" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "" @@ -37790,7 +37819,7 @@ msgstr "" msgid "Please select a supplier for fetching payments." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37810,7 +37839,7 @@ msgstr "" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37917,7 +37946,7 @@ msgstr "" msgid "Please select weekly off day" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "" @@ -38057,7 +38086,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "" @@ -38101,7 +38130,7 @@ msgstr "" msgid "Please set default UOM in Stock Settings" msgstr "" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "" @@ -38220,7 +38249,7 @@ msgstr "" msgid "Please specify at least one attribute in the Attributes table" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "" @@ -38391,7 +38420,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38416,7 +38445,7 @@ msgstr "" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38531,7 +38560,7 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "" @@ -38710,6 +38739,12 @@ msgstr "" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39003,7 +39038,9 @@ msgstr "" msgid "Price per Unit (Stock UOM)" msgstr "Cena na Enoto (Enota Zaloga)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40358,6 +40395,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40394,6 +40432,12 @@ msgstr "" msgid "Purchase Invoice Item" msgstr "" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40445,6 +40489,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40454,7 +40499,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40571,7 +40616,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "" @@ -40634,6 +40679,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40648,7 +40694,7 @@ msgstr "" msgid "Purchase Receipt" msgstr "Potrdilo Nakupa" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40914,7 +40960,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41502,7 +41547,7 @@ msgstr "" msgid "Quality Review Objective" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41563,7 +41608,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41757,7 +41802,7 @@ msgstr "" msgid "Queue Size should be between 5 and 100" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "" @@ -41812,7 +41857,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41975,7 +42020,6 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42385,8 +42429,8 @@ msgstr "" msgid "Raw SQL" msgstr "" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42794,11 +42838,10 @@ msgstr "" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43322,7 +43365,7 @@ msgstr "" msgid "Rejected Warehouse" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "" @@ -43372,7 +43415,7 @@ msgid "Remaining Balance" msgstr "" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43426,7 +43469,7 @@ msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43465,7 +43508,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "" @@ -43869,6 +43912,7 @@ msgstr "" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44142,7 +44186,7 @@ msgstr "" msgid "Reserved" msgstr "" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44755,7 +44799,7 @@ msgstr "" msgid "Reversal Of" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "" @@ -44904,10 +44948,7 @@ msgstr "" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "" @@ -44922,8 +44963,11 @@ msgstr "" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45124,8 +45168,8 @@ msgstr "" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "" @@ -45152,11 +45196,11 @@ msgstr "" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45182,7 +45226,7 @@ msgstr "" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "" @@ -45383,7 +45427,7 @@ msgstr "" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "" @@ -45443,7 +45487,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45471,7 +45515,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "" @@ -45524,7 +45568,7 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "" @@ -45549,7 +45593,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "" @@ -45575,15 +45619,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45614,11 +45658,11 @@ msgstr "" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "" @@ -45661,7 +45705,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "" @@ -45709,11 +45753,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45766,11 +45810,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "" -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "" @@ -45798,7 +45842,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "" @@ -45834,23 +45878,23 @@ msgstr "" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45858,7 +45902,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45923,7 +45967,7 @@ msgstr "" msgid "Row #{}: {} {} does not exist." msgstr "" -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "" @@ -45939,7 +45983,7 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -45971,7 +46015,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:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" @@ -46029,7 +46073,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "" @@ -46070,7 +46114,7 @@ msgstr "" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" @@ -46194,7 +46238,7 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "" @@ -46206,11 +46250,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:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -46234,7 +46278,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:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46287,7 +46331,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:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "Vrstica {idx}: Serija Poimenovanj Sredstva je obvezna za samodejno ustvarjanje sredstev za artikel {item_code}." @@ -46317,7 +46361,7 @@ msgstr "" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" @@ -46383,7 +46427,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46680,7 +46724,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46854,7 +46898,7 @@ msgstr "" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46977,8 +47021,8 @@ msgstr "" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47389,7 +47433,7 @@ msgstr "" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "" @@ -47426,7 +47470,7 @@ msgstr "" msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -47715,7 +47759,7 @@ msgstr "" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47860,7 +47904,7 @@ msgstr "" msgid "Select Columns and Filters" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "" @@ -48555,7 +48599,7 @@ msgstr "" msgid "Serial No Reserved" msgstr "" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48616,7 +48660,7 @@ msgstr "" msgid "Serial No is mandatory for Item {0}" msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "" @@ -48902,7 +48946,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48928,7 +48972,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49326,12 +49370,6 @@ msgstr "" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "" @@ -49437,6 +49475,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "" @@ -49935,7 +49979,7 @@ msgstr "" msgid "Show Barcode Field in Stock Transactions" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "" @@ -49943,7 +49987,7 @@ msgstr "" msgid "Show Completed" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -50026,7 +50070,7 @@ msgstr "" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "" @@ -50038,7 +50082,7 @@ msgstr "" msgid "Show Open" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "" @@ -50051,11 +50095,6 @@ msgstr "" msgid "Show Operations" msgstr "" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "" @@ -50071,7 +50110,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "" @@ -50138,6 +50177,11 @@ msgstr "" msgid "Show only the Immediate Upcoming Term" msgstr "" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "" @@ -50424,11 +50468,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50494,7 +50538,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "" @@ -50508,8 +50552,8 @@ msgid "Source of Funds (Liabilities)" msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "" @@ -50674,8 +50718,8 @@ msgstr "" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "" @@ -51008,7 +51052,7 @@ msgstr "" msgid "Stock Details" msgstr "Podrobnosti o Zalogi" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "" @@ -51279,7 +51323,7 @@ msgstr "" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51291,7 +51335,7 @@ msgstr "" msgid "Stock Reconciliation Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "" @@ -51329,7 +51373,7 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51357,7 +51401,7 @@ msgstr "" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "" @@ -51739,7 +51783,7 @@ msgstr "" #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "" @@ -51817,10 +51861,6 @@ msgstr "" msgid "Sub Procedure" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -52037,7 +52077,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52063,7 +52103,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "" @@ -52152,7 +52192,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "" @@ -52327,7 +52367,7 @@ msgstr "" msgid "Successfully Set Supplier" msgstr "" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "" @@ -52483,6 +52523,7 @@ msgstr "" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52524,8 +52565,8 @@ msgstr "" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52573,6 +52614,12 @@ msgstr "Naslovi in Kontakti Dobavitelja" msgid "Supplier Contact" msgstr "Kontakt Dobavitelja" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52667,7 +52714,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "" @@ -52947,19 +52994,10 @@ msgstr "" msgid "Supplier {0} not found in {1}" msgstr "" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Dobavitelj(ji)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53021,7 +53059,7 @@ msgstr "" msgid "Support Tickets" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53280,8 +53318,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "" @@ -53749,7 +53787,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "" @@ -53910,7 +53948,7 @@ msgstr "Odbitni DDV in Stroški" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "Odbitni DDV in Stroški (Valuta Podjetja)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "" @@ -54100,7 +54138,6 @@ msgstr "Predloga Pogojev" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54292,7 +54329,7 @@ msgstr "" msgid "The BOM which will be replaced" msgstr "" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54336,7 +54373,7 @@ msgstr "" msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54352,7 +54389,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "" @@ -54388,7 +54425,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54494,7 +54531,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "" @@ -54538,15 +54575,15 @@ msgstr "" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54702,7 +54739,7 @@ msgstr "" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "" @@ -54724,11 +54761,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "" @@ -54800,7 +54837,7 @@ msgstr "" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54853,7 +54890,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54897,7 +54934,7 @@ msgstr "" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54953,11 +54990,11 @@ msgstr "" msgid "This Month's Summary" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55758,7 +55795,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "" @@ -55793,7 +55830,7 @@ msgstr "" #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "" @@ -55944,7 +55981,7 @@ msgstr "" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Skupni Znesek" @@ -56367,7 +56404,7 @@ msgstr "" msgid "Total Payments" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56399,7 +56436,7 @@ msgstr "" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Skupna Količina" @@ -56785,7 +56822,7 @@ msgstr "" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56796,7 +56833,7 @@ msgstr "" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "" @@ -57468,11 +57505,11 @@ msgstr "" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57544,7 +57581,7 @@ msgstr "" msgid "UOM Name" msgstr "Ime Enote" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57620,7 +57657,7 @@ msgstr "" msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "" @@ -57739,7 +57776,7 @@ msgstr "" msgid "Unit of Measure (UOM)" msgstr "Enota" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "" @@ -57859,10 +57896,9 @@ msgid "Unreconcile Transaction" msgstr "" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "" @@ -57885,10 +57921,6 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57934,7 +57966,7 @@ msgstr "" msgid "Unsecured Loans" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "" @@ -58149,12 +58181,6 @@ msgstr "" msgid "Update Type" msgstr "" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58195,7 +58221,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "" @@ -58653,12 +58679,6 @@ msgstr "" msgid "Validate Components and Quantities Per BOM" msgstr "" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58682,6 +58702,12 @@ msgstr "" msgid "Validate Stock on Save" msgstr "" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58788,11 +58814,11 @@ msgstr "" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "" -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "" @@ -58802,7 +58828,7 @@ msgstr "" msgid "Valuation and Total" msgstr "Vrednotenje in Skupaj" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "" @@ -58952,7 +58978,7 @@ msgstr "" msgid "Variant" msgstr "" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "" @@ -58971,7 +58997,7 @@ msgstr "" msgid "Variant Based On" msgstr "" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "" @@ -58989,7 +59015,7 @@ msgstr "" msgid "Variant Item" msgstr "" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "" @@ -59370,7 +59396,7 @@ msgstr "" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59410,7 +59436,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "" @@ -59442,7 +59468,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59677,7 +59703,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "" @@ -59724,7 +59750,7 @@ msgstr "" #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59780,6 +59806,12 @@ msgstr "" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "" @@ -59963,7 +59995,7 @@ msgstr "" msgid "Website:" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60337,7 +60369,7 @@ msgstr "" msgid "Work Order Item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60399,11 +60431,11 @@ msgstr "" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "" @@ -60719,11 +60751,11 @@ msgstr "" msgid "Year Start Date" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60776,7 +60808,7 @@ msgstr "" msgid "You can also set default CWIP account in Company {}" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60930,6 +60962,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60958,7 +60994,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60966,7 +61002,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "" @@ -61037,8 +61073,11 @@ msgstr "" msgid "Zero quantity" msgstr "" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61150,7 +61189,7 @@ msgstr "" msgid "fieldname" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61368,6 +61407,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "" @@ -61426,7 +61469,8 @@ msgstr "" msgid "{0} Digest" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61446,7 +61490,7 @@ msgstr "" msgid "{0} Request for {1}" msgstr "" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "" @@ -61559,7 +61603,7 @@ msgid "{0} entered twice in Item Tax" msgstr "" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "" @@ -61727,7 +61771,7 @@ msgstr "" msgid "{0} payment entries can not be filtered by {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61740,7 +61784,7 @@ msgstr "{0} do {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "" @@ -61942,7 +61986,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -62028,23 +62072,23 @@ msgstr "" msgid "{0}: {1} is a group account." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "" -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" diff --git a/erpnext/locale/sr.po b/erpnext/locale/sr.po index 05e495f57aa..f182c0fa2fe 100644 --- a/erpnext/locale/sr.po +++ b/erpnext/locale/sr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:21\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:21\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Serbian (Cyrillic)\n" "MIME-Version: 1.0\n" @@ -100,15 +100,15 @@ msgstr " Подсклоп" msgid " Summary" msgstr " Резиме" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"Ставка обезбеђена од стране купца\" не може бити и ставка за набавку" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"Ставка обезбеђена од стране купца\" не може имати стопу вредновања" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "\"Да ли је основно средство\" мора бити означено, јер постоји запис о имовини за ову ставку" @@ -307,7 +307,7 @@ msgstr "'Датум почетка' је обавезан" msgid "'From Date' must be after 'To Date'" msgstr "'Датум почетка' мора бити мањи од 'Датум завршетка'" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "'Има серијски број' не може бити 'Да' за ставке ван залиха" @@ -343,7 +343,7 @@ msgstr "'Ажурирај залихе' не може бити означено msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "'Ажурирај залихе' не може бити означено за продају основног средства" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "'{0}' рачун је већ коришћен од стране {1}. Користи други рачун." @@ -1104,7 +1104,7 @@ msgstr "Драјвер мора бити подешен за подношење. msgid "A logical Warehouse against which stock entries are made." msgstr "Логичко складиште у које се врше уноси залиха." -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "Дошло је до конфликта у серији именовања приликом креирања бројева серија. Молимо Вас да промените серију именовања за ставку {0}." @@ -1316,7 +1316,7 @@ msgstr "Кључ за приступ је обавезан за пружаоца msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "У складу са CEFACT/ICG/2010/IC013 или CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "У складу са саставницом {0}, ставка '{1}' недостаје у уносу залиха." @@ -1986,8 +1986,8 @@ msgstr "Рачуноводствени уноси" msgid "Accounting Entry for Asset" msgstr "Рачуноводствени унос за имовину" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "Рачуноводствени унос за документ трошкова набавке у уносу залиха {0}" @@ -1995,7 +1995,7 @@ msgstr "Рачуноводствени унос за документ трошк msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "Рачуноводствени унос за документ зависних трошкова набавке који се односи на усклађивање залиха {0}" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Рачуноводствени унос за услугу" @@ -2008,16 +2008,16 @@ msgstr "Рачуноводствени унос за услугу" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Рачуноводствени унос за залихе" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "Рачуноводствени унос за {0}" @@ -2315,12 +2315,6 @@ msgstr "Радња уколико се не поднесе инспекција msgid "Action If Quality Inspection Is Rejected" msgstr "Радња уколико је инспекција квалитета одбијена" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "Радња уколико иста цена није одржана" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "Радња покренута" @@ -2379,6 +2373,12 @@ msgstr "Радња уколико је годишњи буџет премаше msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "Радња уколико иста стопа није одржана током интерне трансакције" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2646,7 +2646,7 @@ msgstr "Стварно време у сатима (преко евиденциј msgid "Actual qty in stock" msgstr "Стварна количина на складишту" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "Стварна врста пореза не може бити укључена у цену ставке у реду {0}" @@ -2660,7 +2660,7 @@ msgstr "Непланирана количина" msgid "Add / Edit Prices" msgstr "Додај / Измени цене" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "Додај колоне у валути трансакције" @@ -2814,7 +2814,7 @@ msgstr "Додај број серије / шарже" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "Додај број серије / шарже (Одбијена количина)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -3059,7 +3059,7 @@ msgstr "Висина додатног попуста" msgid "Additional Discount Amount (Company Currency)" msgstr "Висина додатног попуста (валута компаније)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "Додатни износ попуста ({discount_amount}) не може премашити укупан износ пре таквог попуста ({total_before_discount})" @@ -3348,7 +3348,7 @@ msgstr "Коригуј количину" msgid "Adjustment Against" msgstr "Прилагођавање према" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "Прилагођавање на основу цене из улазне фактуре" @@ -3461,7 +3461,7 @@ msgstr "Врста документа за аванс" msgid "Advance amount" msgstr "Износ аванса" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Износ аванса не може бити већи од {0} {1}" @@ -3530,7 +3530,7 @@ msgstr "Против" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Против рачуна" @@ -3648,7 +3648,7 @@ msgstr "Против фактуре добављача {0}" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "Против документа" @@ -3672,7 +3672,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "Против врсте документа" @@ -3953,7 +3953,7 @@ msgstr "Све комуникације укључујући и оне изна msgid "All items are already requested" msgstr "Све ставке су већ захтеване" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "Све ставке су већ фактурисане/враћене" @@ -3961,7 +3961,7 @@ msgstr "Све ставке су већ фактурисане/враћене" msgid "All items have already been received" msgstr "Све ставке су већ примљене" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Све ставке су већ пребачене за овај радни налог." @@ -4010,7 +4010,7 @@ msgstr "Расподели" msgid "Allocate Advances Automatically (FIFO)" msgstr "Аутоматски расподели авансе (ФИФО)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Расподели износе плаћања" @@ -4020,7 +4020,7 @@ msgstr "Расподели износе плаћања" msgid "Allocate Payment Based On Payment Terms" msgstr "Расподели плаћање на основу услова плаћања" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "Расподели захтев за наплату" @@ -4050,7 +4050,7 @@ msgstr "Распоређено" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4171,15 +4171,15 @@ msgstr "Дозволи у повраћајима" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "Дозволи интерне трансфере по тржишним ценама" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "Дозволи додавање ставки више пута у трансакцији" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "Дозволи додељивање ставки више пута у трансакцији" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4208,12 +4208,6 @@ msgstr "Дозволи негативно стање залиха" msgid "Allow Negative Stock for Batch" msgstr "Дозволи негативно стање залиха за шаржу" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "Дозволи негативне цене за ставке" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4426,8 +4420,11 @@ msgstr "Дозволи фактуре у различитим валутама msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4519,7 +4516,7 @@ msgstr "Дозвољене трансакције са" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "Дозвољене примарне улоге су 'Купац' и 'Добављач'. Молимо Вас да изаберете само једну од ових улога." -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4716,7 +4713,7 @@ msgstr "Увек питај" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4746,7 +4743,6 @@ msgstr "Увек питај" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4916,10 +4912,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "Износ у валути рачуна" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "Укупно словима" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5539,7 +5531,7 @@ msgstr "Пошто је поље {0} омогућено, поље {1} је об msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "Пошто је поље {0} омогућено, вредност поља {1} треба да буде већа од 1." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "Пошто већ постоје поднете трансакције за ставку {0}, не можете променити вредност за {1}." @@ -5689,7 +5681,7 @@ msgstr "Рачун категорије имовине" msgid "Asset Category Name" msgstr "Назив категорије имовине" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "Категорија имовине је обавезна за основно средство" @@ -6085,7 +6077,7 @@ msgstr "Имовина {0} није поднета. Молимо Вас да п msgid "Asset {0} must be submitted" msgstr "Имовина {0} мора бити поднета" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "Имовина {assets_link} је креирана за {item_code}" @@ -6123,11 +6115,11 @@ msgstr "Имовина" msgid "Assets Setup" msgstr "Поставке имовине" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "Имовина није креирана за {item_code}. Мораћете да креирате имовину ручно." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "Имовина {assets_link} је креирана за {item_code}" @@ -6200,7 +6192,7 @@ msgstr "Најмање једна сировина мора бити прису msgid "At least one row is required for a financial report template" msgstr "Потребан је најмање један ред у шаблону финансијског извештаја" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "Мора бити одабрано барем једно складиште" @@ -6232,7 +6224,7 @@ msgstr "У реду {0}: Количина је обавезна за шаржу msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "У реду {0}: Број серије је обавезан за ставку {1}" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "У реду {0}: Пакет серије и шарже {1} је већ креиран. Молимо Вас да уклоните вредности из поља за пакет." @@ -6296,7 +6288,11 @@ msgstr "Назив атрибута" msgid "Attribute Value" msgstr "Вредност атрибута" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "Табела атрибута је обавезна" @@ -6304,11 +6300,19 @@ msgstr "Табела атрибута је обавезна" msgid "Attribute value: {0} must appear only once" msgstr "Вредност атрибута: {0} мора се појавити само једном" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "Атрибут {0} је више пута изабран у табели атрибута" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Атрибути" @@ -6368,24 +6372,12 @@ msgstr "Вредност овлашћења" msgid "Auto Create Exchange Rate Revaluation" msgstr "Аутоматски креирај ревалоризацију девизног курса" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "Аутоматски креирај пријемницу набавке" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "Аутоматски креирај пакет серије и шарже за излаз" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "Аутоматски креирај налог за подуговарање" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6504,6 +6496,18 @@ msgstr "Грешка приликом аутоматског креирања к msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "Аутоматска затварање прилике након договора, према броју дана наведеном изнад" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6721,7 +6725,7 @@ msgstr "Датум доступности за употребу" msgid "Available for use date is required" msgstr "Потребан је датум доступности за употребу" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "Доступна количина је {0}, потребно вам је {1}" @@ -6820,7 +6824,7 @@ msgstr "BFS" msgid "BIN Qty" msgstr "Количина у запису о стању ставки" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7093,7 +7097,7 @@ msgstr "Ставка саставнице на веб-сајту" msgid "BOM Website Operation" msgstr "Операција саставнице на веб-сајту" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "Саставница и количина готовог производа су обавезни за растављање" @@ -7184,8 +7188,8 @@ msgstr "Backflush сировина из складишта (рад у току)" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "Backflush сировина за подуговарање на основу" +msgid "Backflush raw materials of subcontract based on" +msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7205,7 +7209,7 @@ msgstr "Стање" msgid "Balance (Dr - Cr)" msgstr "Стање (Д - П)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Стање ({0})" @@ -7736,11 +7740,11 @@ msgstr "Банкарство" msgid "Barcode Type" msgstr "Врста бар-кода" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "Бар-код {0} се већ користи у ставци {1}" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "Бар-код {0} није валидан {1} код" @@ -8107,12 +8111,12 @@ msgstr "Шаржа {0} и складиште" msgid "Batch {0} is not available in warehouse {1}" msgstr "Шаржа {0} није доступна у складишту {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "Шаржа {0} за ставку {1} је истекла." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "Шаржа {0} за ставку {1} је онемогућена." @@ -8185,8 +8189,8 @@ msgstr "Број рачуна" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "Рачун за одбијену количину у улазној фактури" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8526,8 +8530,11 @@ msgstr "Ставка оквирне наруџбине" msgid "Blanket Order Rate" msgstr "Цена оквирне наруџбине" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -9042,7 +9049,7 @@ msgstr "Набавка и продаја" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "Набавка мора бити означена ако је Применљиво за изабрано као {0}" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "Подразумевано, назив добављача поставља се према унесеном називу добављача. Ако желите да добављачи буду именовани према Серији именовања изаберите опцију 'Серија именовања'." @@ -9407,7 +9414,7 @@ msgstr "Не може се филтрирати према броју докум msgid "Can only make payment against unbilled {0}" msgstr "Може се извршити плаћање само за неизмирене {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9463,9 +9470,9 @@ msgstr "Није могуће променити подешавање рачун msgid "Cannot Create Return" msgstr "Није могуће креирати повраћај" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "Није могуће спојити" @@ -9493,7 +9500,7 @@ msgstr "Не може се изменити {0} {1}, молимо Вас да у msgid "Cannot apply TDS against multiple parties in one entry" msgstr "Не може се применити порез одбијен на извору против више странака у једном уносу" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "Не може бити основно средство јер је креирана књига залиха." @@ -9529,7 +9536,7 @@ msgstr "Није могуће отказати овај унос залиха у msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "Није могуће отказати овај документ јер је повезан са поднетом корекцијом вредности имовине {0}. Молимо Вас да прво откажете корекцију вредности имовине како бисте наставили." -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "Не може се отказати овај документ јер је повезан са поднетом имовином {asset_link}. Молимо Вас да је откажете да бисте наставили." @@ -9537,7 +9544,7 @@ msgstr "Не може се отказати овај документ јер ј msgid "Cannot cancel transaction for Completed Work Order." msgstr "Не може се отказати трансакција за завршени радни налог." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "Није могуће мењање атрибута након трансакције са залихама. Креирајте нову ставку и пренесите залихе" @@ -9549,7 +9556,7 @@ msgstr "Не може се променити врста референтног msgid "Cannot change Service Stop Date for item in row {0}" msgstr "Не може се променити датум заустављања услуге за ставку у реду {0}" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "Није могуће променити својства варијанте након трансакције за залихама. Морате креирати нову ставку да бисте то урадили." @@ -9577,11 +9584,11 @@ msgstr "Не може се конвертовати у групу јер је и msgid "Cannot covert to Group because Account Type is selected." msgstr "Не може се склонити у групу јер је изабрана врста рачуна." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "Не могу се креирати уноси за резервацију залиха за пријемницу набавке са будућим датумом." -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "Не може се креирати листа за одабир за продајну поруџбину {0} јер има резервисане залихе. Поништите резервисање залиха да бисте креирали листу." @@ -9607,7 +9614,7 @@ msgstr "Не може се прогласити као изгубљено јер msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "Не може се одбити када је категорија за 'Вредновање' или 'Вредновање и укупно'" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "Не може се обрисати ред прихода/расхода курсних разлика" @@ -9644,7 +9651,7 @@ msgstr "Није могуће онемогућити {0} јер то може д msgid "Cannot disassemble more than produced quantity." msgstr "Није могуће демонтирати више од произведене количине." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "Није могуће демонтирати количину {0} из уноса залиха {1}. Доступно је само {2} за демонтажу." @@ -9652,8 +9659,8 @@ msgstr "Није могуће демонтирати количину {0} из msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "Није могуће омогућити рачун инвентара по ставкама јер постоје уноси у књигу залиха за компанију {0} који користе рачун инвентара по складиштима. Молимо Вас да најпре откажете трансакције залиха и покушате поново." -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "Не може се обезбедити испорука по броју серије јер је ставка {0} додата са и без обезбеђења испоруке по броју серије." @@ -9697,7 +9704,7 @@ msgstr "Не може се примити од купца против нега msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "Није могуће смањити количину испод поручене или набављене количине" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9715,8 +9722,8 @@ msgstr "Није могуће преузети токен за повезива msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "Није могуће изабрати врсту групе као група купаца. Молимо Вас да изаберете групу купаца која није групне врсте." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9732,7 +9739,7 @@ msgstr "Не може се поставити као изгубљено јер msgid "Cannot set authorization on basis of Discount for {0}" msgstr "Не може се поставити ауторизација на основу попуста за {0}" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "Не може се поставити више подразумеваних ставки за једну компанију." @@ -10643,7 +10650,7 @@ msgstr "Затварање (Потражује)" msgid "Closing (Dr)" msgstr "Затварање (Дугује)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "Затварање (Почетно + Укупно)" @@ -11104,7 +11111,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11386,7 +11393,7 @@ msgstr "Компанија" msgid "Company Abbreviation" msgstr "Скраћеница компаније" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11399,7 +11406,7 @@ msgstr "Скраћеница компаније не може да има виш msgid "Company Account" msgstr "Текући рачун компаније" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "Рачун компаније је обавезан" @@ -11575,7 +11582,7 @@ msgstr "Филтер компаније није постављен!" msgid "Company is mandatory" msgstr "Компанија је обавезна" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "Компанија је обавезна за рачун компаније" @@ -11846,7 +11853,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11859,7 +11866,9 @@ msgstr "Подеси контни оквир" msgid "Configure Product Assembly" msgstr "Конфигуришите монтажу производа" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11877,13 +11886,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "Конфигуришите радњу за заустављање трансакција или поставите само упозорење уколико иста стопа није одржана." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "Конфигуришите подразумевани ценовник при креирању нове набавне трансакције. Цене ставки ће бити преузете из ове ценовне листе." @@ -12061,7 +12070,7 @@ msgstr "" msgid "Consumed" msgstr "Утрошено" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "Утрошени износ" @@ -12105,7 +12114,7 @@ msgstr "Трошак утрошених ставки" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12278,10 +12287,6 @@ msgstr "Особа за контакт не припада {0}" msgid "Contact:" msgstr "Контакт:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Контакт: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12459,7 +12464,7 @@ msgstr "Фактор конверзије" msgid "Conversion Rate" msgstr "Стопа конверзије" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "Фактор конверзије за подразумевану јединицу мере мора бити 1 у реду {0}" @@ -12731,7 +12736,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12826,7 +12831,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "Трошковни центар је обавезан у реду {0} у табели пореза за врсту {1}" @@ -13164,7 +13169,7 @@ msgstr "Креирај готове производе" msgid "Create Grouped Asset" msgstr "Креирај груписану имовину" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "Креирај међукомпанијски налог књижења" @@ -13537,7 +13542,7 @@ msgstr "Креирај {0} {1} ?" msgid "Created By Migration" msgstr "Креирано путем миграције" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "Креирано {0} таблица за оцењивање за {1} између:" @@ -13680,15 +13685,15 @@ msgstr "Креирање {0} делимично успешно.\n" msgid "Credit" msgstr "Потражује" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "Потражује (Трансакција)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "Потражује ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "Рачун потраживања" @@ -13883,7 +13888,7 @@ msgstr "Коефицијент обрта добављача" msgid "Creditors" msgstr "Повериоци" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14181,7 +14186,7 @@ msgstr "Тренутни пакет серије/шарже" msgid "Current Serial No" msgstr "Тренутни број серије" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14382,7 +14387,7 @@ msgstr "Прилагођено раздвајање" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15155,7 +15160,7 @@ msgstr "Датуми за обраду" msgid "Day Of Week" msgstr "Дан у недељи" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15271,11 +15276,11 @@ msgstr "Трговац" msgid "Debit" msgstr "Дугује" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "Дугује (Трансакција)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "Дугује ({0})" @@ -15285,7 +15290,7 @@ msgstr "Дугује ({0})" msgid "Debit / Credit Note Posting Date" msgstr "Датум књижења документа о повећању / смањењу" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "Рачун дуговања" @@ -15396,7 +15401,7 @@ msgstr "Дугује-Потражује нису у равнотежи" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15538,7 +15543,7 @@ msgstr "Подразумевани опсег старости" msgid "Default BOM" msgstr "Подразумевана саставница" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "Подразумевана саставница ({0}) мора бити активна за ову ставку или њен шаблон" @@ -15895,15 +15900,15 @@ msgstr "Подразумевана територија" msgid "Default Unit of Measure" msgstr "Подразумевана јединица мере" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "Подразумевана јединица мере за ставку {0} не може се директно променити јер је трансакција већ извршена са другом јединицом мере. Потребно је отказати повезана документа или креирање нове ставке." -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "Подразумевана јединица мере за ставку {0} не може се директно променити јер је већ извршена трансакција са другом јединицом мере. Неопходно је креирање нове ставке у циљу коришћења подразумеване јединице мере." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "Подразумевана јединица мере за варијанту '{0}' мора бити иста као у шаблону '{1}'" @@ -16204,7 +16209,7 @@ msgstr "" msgid "Delivered" msgstr "Испоручено" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Испоручени износ" @@ -16254,8 +16259,8 @@ msgstr "Испоручене ставке које треба фактуриса #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16266,11 +16271,11 @@ msgstr "Испоручена количина" msgid "Delivered Qty (in Stock UOM)" msgstr "Испоручена количина (у јединици мере залиха)" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16359,7 +16364,7 @@ msgstr "Менаџер испоруке" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16884,7 +16889,7 @@ msgstr "Рачун разлике у табели ставки" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "Рачун разлике мора бити рачун имовине или обавеза (привремено почетно стање), јер је овај унос залиха унос отварања почетног стања" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "Рачун разлике мора бити рачун имовине или обавеза, јер ово усклађивање залиха представља унос почетног стања" @@ -17048,11 +17053,9 @@ msgstr "Онемогући кумулативни праг" msgid "Disable In Words" msgstr "Онемогући словну ознаку" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "Онемогући цену из последње набавке" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17093,6 +17096,12 @@ msgstr "Онемогући број серије и селектор шарже" msgid "Disable Transaction Threshold" msgstr "Онемогући праг по трансакцији" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17149,7 +17158,7 @@ msgstr "Демонтирати" msgid "Disassemble Order" msgstr "Налог за демонтажу" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "Демонтирана количина не може бити мања или једнака 0." @@ -17674,6 +17683,12 @@ msgstr "Не користи вредновање по шаржама" msgid "Do Not Use Batchwise Valuation" msgstr "Не користи вредновање по шаржама" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17764,9 +17779,12 @@ msgstr "Претрага докумената" msgid "Document Count" msgstr "Број докумената" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17784,6 +17802,10 @@ msgstr "Врста документа " msgid "Document Type already used as a dimension" msgstr "Врста документа је већ коришћена као димензија" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "Документација" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18088,7 +18110,7 @@ msgstr "Дупликат пројекта са задацима" msgid "Duplicate Sales Invoices found" msgstr "Пронађени су дупликати излазне фактуре" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "Грешка дупликата броја серије" @@ -18208,8 +18230,8 @@ msgstr "ERPNext ИД корисника" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18432,7 +18454,7 @@ msgstr "Имејл потврда" msgid "Email Sent to Supplier {0}" msgstr "Имејл послат добављачу {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "Имејл је обавезан за креирање корисника" @@ -18622,7 +18644,7 @@ msgstr "Кориснички ИД запосленог лица" msgid "Employee cannot report to himself." msgstr "Запослено лице не може извештавати самог себе." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "Запослено лице је обавезно" @@ -18630,7 +18652,7 @@ msgstr "Запослено лице је обавезно" msgid "Employee is required while issuing Asset {0}" msgstr "Запослено лице је обавезно при издавању имовине {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "Запослено лице {0} већ има повезаног корисника" @@ -18643,7 +18665,7 @@ msgstr "Запослено лице {0} не припада компанији { msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "Запослено лице {0} тренутно ради на другој радној станици. Молимо Вас да доделите друго запослено лице." -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "Запослено лице {0} није пронађено" @@ -18686,7 +18708,7 @@ msgstr "Омогућите заказивање термина" msgid "Enable Auto Email" msgstr "Омогућите аутоматски имејл" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "Омогућите аутоматско поновно наручивање" @@ -19287,7 +19309,7 @@ msgstr "Грешка: Ова имовина већ има {0} евидентир "\t\t\t\t\t Датум 'почетка амортизације' мора бити најмање {1} периода након датума 'доступно за коришћење'.\n" "\t\t\t\t\t Молимо Вас да исправите датум у складу са тим." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "Грешка: {0} је обавезно поље" @@ -19333,7 +19355,7 @@ msgstr "Франко фабрика" msgid "Example URL" msgstr "Пример URL-а" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "Пример повезаног документа: {0}" @@ -19363,7 +19385,7 @@ msgstr "Пример: Број серије {0} је резервисан у {1} msgid "Exception Budget Approver Role" msgstr "Улога за одобравање изузетака буџета" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "Прекомерна демонтажа" @@ -19722,7 +19744,7 @@ msgstr "Очекивана вредност након корисног века msgid "Expense" msgstr "Трошак" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "Рачун расхода / разлике ({0}) мора бити рачун врсте 'Добитак или губитак'" @@ -19770,7 +19792,7 @@ msgstr "Рачун расхода / разлике ({0}) мора бити ра msgid "Expense Account" msgstr "Рачун расхода" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "Недостаје рачун расхода" @@ -20233,7 +20255,7 @@ msgstr "Филтер за ставке са количином нула" msgid "Filter by Reference Date" msgstr "Филтер по датуму референце" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20563,7 +20585,7 @@ msgstr "Скалдиште готових производа" msgid "Finished Goods based Operating Cost" msgstr "Оперативни трошак заснован на готовим производима" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "Готов производ {0} не одговара радном налогу {1}" @@ -20658,7 +20680,7 @@ msgstr "Фискални режим је обавезан, молимо Вас msgid "Fiscal Year" msgstr "Фискална година" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20722,7 +20744,7 @@ msgstr "Рачун основних средстава" msgid "Fixed Asset Defaults" msgstr "Задати подаци за основна средства" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "Основно средство мора бити ставка ван залиха." @@ -20872,7 +20894,7 @@ msgstr "За компанију" msgid "For Item" msgstr "За ставку" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "За ставку {0} количина не може бити примљена у већој количини од {1} у односу на {2} {3}" @@ -20903,7 +20925,7 @@ msgstr "За ценовник" msgid "For Production" msgstr "За производњу" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "За количину (произведена количина) је обавезна" @@ -20987,6 +21009,12 @@ msgstr "За ставку {0}, је креирано или повеза msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "За ставку {0}, цена мора бити позитиван број. Да бисте омогућили негативне цене, омогућите {1} у {2}" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "За операцију {0} у реду {1}, молимо Вас да додате сировине или доделите саставницу." @@ -21008,7 +21036,7 @@ msgstr "За пројекат - {0}, ажурирајте свој статус" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "За пројектоване и прогнозиране количине, систем ће узети у обзир сва зависна складишта под изабраним матичним складиштем." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "Количина {0} не би смела бити већа од дозвољене количине {1}" @@ -21017,7 +21045,7 @@ msgstr "Количина {0} не би смела бити већа од доз msgid "For reference" msgstr "За референцу" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "За ред {0} у {1}. Да бисте укључили {2} у цену ставке, редови {3} такође морају бити укључени" @@ -21041,7 +21069,7 @@ msgstr "За поље 'Примени правило на остале' {0} је 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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "За ставку {0}, утрошена количина треба да буде {1} према саставници {2}." @@ -21050,7 +21078,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 "Да би нови {0} ступио на снагу, желите ли да обришете тренутни {1}?" -#: erpnext/controllers/stock_controller.py:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "За ставку {0}, нема доступног складишта за повраћај у складиште {1}." @@ -21663,7 +21691,7 @@ msgstr "G - D" msgid "GENERAL LEDGER" msgstr "ГЛАВНА КЊИГА" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21675,7 +21703,7 @@ msgstr "Стање главне књиге" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "Унос у главну књигу" @@ -22190,7 +22218,7 @@ msgstr "Роба на путу" msgid "Goods Transferred" msgstr "Роба премештена" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "Роба је већ примљена на основу излазног уноса {0}" @@ -22373,7 +22401,7 @@ msgstr "Укупан износ мора одговарати збиру реф msgid "Grant Commission" msgstr "Одобри комисион" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "Већи од износа" @@ -23014,11 +23042,11 @@ msgstr "Колико често?" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" -msgstr "Колико често треба ажурирати пројекат у вези са укупним трошком набавке?" +msgid "How often should project be updated of Total Purchase Cost ?" +msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling #. Settings' @@ -23173,7 +23201,7 @@ msgstr "Уколико је операција подељена на подоп msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "Уколико је празно, користиће се рачун матичног складишта или подразумевани рачун компаније у трансакцијама" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23358,7 +23386,7 @@ msgstr "Уколико је омогућено, систем ће дозволи msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "Уколико је омогућено, систем ће дозволити корисницима да уређују сировине и њихове количине у радном налогу. Систем неће ресетовати количине према саставници, уколико их је корисник изменио." -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23530,11 +23558,11 @@ msgstr "Уколико ово није пожељно, откажите одго msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "Уколико ова ставка има варијанте, не може бити изабрана у продајним поруџбинама итд." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "Уколико је ова опција постављена на 'Да', ERPNext неће дозволити креирање улазне фактуре без претходног креирања набавне поруџбине. Ова конфигурација се може заобићи омогућавањем опције 'Дозволи креирање улазне фактуре без набавне поруџбине' у шифарнику добављача." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "Уколико је ова опција постављена на 'Да', ERPNext неће дозволити улазне фактуре без претходног креирања пријемница набавке. Ова конфигурација се може заобићи омогућавањем опције 'Дозволи креирање улазне фактуре без пријемнице набавке' у шифарнику добављача." @@ -23650,7 +23678,7 @@ msgstr "Игнориши празне залихе" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "Игнориши ревалоризацију девизног курса и дневнике прихода/расхода" @@ -23702,7 +23730,7 @@ msgstr "Правило о ценама је омогућено. Није мог #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "Игнориши дуговне/потражне белешке генерисане од стране система" @@ -23745,7 +23773,7 @@ msgstr "Игнориши преклапање времена на радним msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "Игнориши поље за отварање стања у уносу у главну књигу које омогућава додавање почетног стања након што је систем у употреби приликом генерисања извештаја" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "Слика у опису је уклоњена. Да бисте онемогућили ово понашање, уклоните ознаку са опције \"{0}\" на {1}." @@ -23759,6 +23787,7 @@ msgid "Implementation Partner" msgstr "Партнер за имплементацију" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24112,7 +24141,7 @@ msgstr "Укључи подразумевану имовину у финанси #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24366,7 +24395,7 @@ msgstr "Погрешан салдо количине након трансакц msgid "Incorrect Batch Consumed" msgstr "Утрошена нетачна шаржа" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "Нетачно складиште за поновно наручивање" @@ -24374,7 +24403,7 @@ msgstr "Нетачно складиште за поновно наручивањ msgid "Incorrect Company" msgstr "Нетачна компанија" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "Нетачна количина компоненти" @@ -24584,14 +24613,14 @@ msgstr "Иницирано" msgid "Inspected By" msgstr "Инспекцију извршио" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "Инспекција одбијена" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "Инспекција је потребна" @@ -24608,7 +24637,7 @@ msgstr "Инспекција је потребна пре испоруке" msgid "Inspection Required before Purchase" msgstr "Инспекција је потребна пре набавке" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "Подношење инспекције" @@ -24690,8 +24719,8 @@ msgstr "Недовољне дозволе" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "Недовољно залиха" @@ -24911,7 +24940,7 @@ msgstr "Интерни трансфери" msgid "Internal Work History" msgstr "Интерна радна историја" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "Интерни трансфери могу се обавити само у основној валути компаније" @@ -25004,7 +25033,7 @@ msgstr "Неважећи датум испоруке" msgid "Invalid Discount" msgstr "Неважећи попуст" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "Неважећи износ попуста" @@ -25034,7 +25063,7 @@ msgstr "Неважеће груписање по" msgid "Invalid Item" msgstr "Неважећа ставка" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "Неважећи подразумевани подаци за ставку" @@ -25120,12 +25149,12 @@ msgstr "Неважећи распоред" msgid "Invalid Selling Price" msgstr "Неважећа продајна цена" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "Неважећи број пакета серије и шарже" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "Неважеће изворно и циљно складиште" @@ -25162,7 +25191,7 @@ msgstr "Неважећа формула филтера. Молимо Вас да msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "Неважећи разлог губитка {0}, молимо креирајте нов разлог губитка" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Неважећа серија именовања (. недостаје) за {0}" @@ -25291,7 +25320,6 @@ msgstr "Отказивање фактуре" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "Датум издавања" @@ -25312,10 +25340,6 @@ msgstr "Грешка при избору врсте документа факт msgid "Invoice Grand Total" msgstr "Укупан збир фактуре" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "Фактура ИД" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25837,13 +25861,13 @@ msgstr "Виртуелна ставка" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "Да ли је потребна набавна поруџбина за креирање улазне фактуре и пријемнице набавке?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "Да ли је потребна пријемница набавке за креирање улазне фактуре?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -26115,7 +26139,7 @@ msgstr "Упити" msgid "Issuing Date" msgstr "Датум издавања" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "Може потрајати неколико сати да тачне вредности залиха постану видљиве након спајања ставки." @@ -26185,7 +26209,7 @@ msgstr "Курзивни текст за међузбирове или напо #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26232,6 +26256,7 @@ msgstr "Курзивни текст за међузбирове или напо #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26247,7 +26272,6 @@ msgstr "Курзивни текст за међузбирове или напо #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -27011,6 +27035,7 @@ msgstr "Произвођач ставке" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -27021,7 +27046,6 @@ msgstr "Произвођач ставке" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27281,11 +27305,11 @@ msgstr "Подешавања варијанте ставке" msgid "Item Variant {0} already exists with same attributes" msgstr "Варијанта ставке {0} већ постоји са истим атрибутима" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "Варијанте ставке ажуриране" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "Поновна обрада на основу складишта ставки је омогућена." @@ -27324,6 +27348,15 @@ msgstr "Спецификације ставки на веб-сајту" msgid "Item Weight Details" msgstr "Детаљи тежине ставке" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27353,7 +27386,7 @@ msgstr "Порески детаљи по ставкама" msgid "Item Wise Tax Details" msgstr "Детаљи пореза по ставкама" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "Детаљи пореза по ставкама се не поклапају са порезима и трошковима у следећим редовима:" @@ -27373,11 +27406,11 @@ msgstr "Ставка и складиште" msgid "Item and Warranty Details" msgstr "Детаљи ставке и гаранције" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "Ставке за ред {0} не одговарају захтеву за набавку" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "Ставка има варијанте." @@ -27407,7 +27440,7 @@ msgstr "Ставка операције" msgid "Item qty can not be updated as raw materials are already processed." msgstr "Количина ставки не може бити ажурирана јер су сировине већ обрађене." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "Цена ставке је ажурирана на нулу јер је означена опција 'Дозволи нулту стопу вредновања' за ставку {0}" @@ -27426,10 +27459,14 @@ msgstr "Стопа вредновања ставке је прерачуната msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "Поновна обрада вредновања ставке је у току. Извештај може приказати нетачно вредновање ставке." -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "Варијанта ставке {0} постоји са истим атрибутима" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "Ставка {0} је додата више пута под истом матичном ставком {1} у редовима {2} и {3}" @@ -27443,7 +27480,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "Ставка {0} не може бити наручена у количини већој од {1} према оквирном налогу {2}." #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "Ставка {0} не постоји" @@ -27451,7 +27488,7 @@ msgstr "Ставка {0} не постоји" msgid "Item {0} does not exist in the system or has expired" msgstr "Ставка {0} не постоји у систему или је истекла" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "Ставка {0} не постоји." @@ -27467,15 +27504,15 @@ msgstr "Ставка {0} је већ враћена" msgid "Item {0} has been disabled" msgstr "Ставка {0} је онемогућена" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "Ставка {0} нема број серије. Само ставке са бројем серије могу имати испоруку на основу серијског броја" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "Ставка {0} је достигла крај свог животног века на дан {1}" @@ -27487,19 +27524,23 @@ msgstr "Ставка {0} је занемарена јер није ставка msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "Ставка {0} је већ резервисана / испоручена према продајној поруџбини {1}." -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "Ставка {0} је отказана" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "Ставка {0} је онемогућена" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "Ставка {0} није серијализована ставка" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "Ставка {0} није ставка на залихама" @@ -27507,7 +27548,11 @@ msgstr "Ставка {0} није ставка на залихама" msgid "Item {0} is not a subcontracted item" msgstr "Ставка {0} није ставка за подуговарање" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "Ставка {0} није активна или је достигла крај животног века" @@ -27523,7 +27568,7 @@ msgstr "Ставка {0} мора бити ставка ван залиха" msgid "Item {0} must be a non-stock item" msgstr "Ставка {0} мора бити ставка ван залиха" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "Ставка {0} није пронађена у табели 'Примљене сировине' {1} {2}" @@ -27539,7 +27584,7 @@ msgstr "Ставка {0}: Наручена количина {1} не може б msgid "Item {0}: {1} qty produced. " msgstr "Ставка {0}: Произведена количина {1}. " -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "Ставка {} не постоји." @@ -27649,7 +27694,7 @@ msgstr "Ставке за захтев за набавку сировина" msgid "Items not found." msgstr "Ставке нису пронађене." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "Цена ставки је ажурирана на нулу јер је опција дозволи нулту стопу вредновања означена за следеће ставке: {0}" @@ -28282,7 +28327,7 @@ msgstr "Последње скенирано складиште" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "Последња трансакција залиха за ставку {0} у складишту {1} је била {2}." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28561,7 +28606,7 @@ msgstr "Легенда" msgid "Length (cm)" msgstr "Дужина (цм)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "Мање од износа" @@ -28702,7 +28747,7 @@ msgstr "Повезани рачуни" msgid "Linked Location" msgstr "Повезана локација" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "Повезано са поднетим документима" @@ -29097,11 +29142,6 @@ msgstr "Одржавање имовине" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "Одржавај исту стопу током интерне трансакције" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "Одржавати исту цену током целог циклуса набавке" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29113,6 +29153,11 @@ msgstr "Одржавај стање залиха" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29309,7 +29354,7 @@ msgid "Major/Optional Subjects" msgstr "Обавезни/Изборни предмети" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29478,8 +29523,8 @@ msgstr "Обавезни одељак" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29538,8 +29583,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29688,7 +29733,7 @@ msgstr "Датум производње" msgid "Manufacturing Manager" msgstr "Менаџер производње" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "Количина производње је обавезна" @@ -29964,7 +30009,7 @@ msgstr "Потрошња материјала" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "Потрошња материјала за производњу" @@ -30035,6 +30080,7 @@ msgstr "Пријемница материјала" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30141,11 +30187,11 @@ msgstr "Планирана ставка захтева за набавку" msgid "Material Request Type" msgstr "Врста захтева за набавку" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "Захтев за набавку је већ креиран за наручену количину" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "Захтев за набавку није креиран, јер је количина сировина већ доступна." @@ -30260,7 +30306,7 @@ msgstr "Материјал премештен за производњу" msgid "Material Transferred for Manufacturing" msgstr "Материјал премештен за производни процес" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30389,11 +30435,11 @@ msgstr "Максимални износ плаћања" msgid "Maximum Producible Items" msgstr "Максимална количина производивих ставки" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "Максимални узорци - {0} може бити задржано за шаржу {1} и ставку {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "Максимални узорци - {0} су већ задржани за шаржу {1} и ставку {2} у шаржи {3}." @@ -30837,11 +30883,11 @@ msgstr "Разно" msgid "Miscellaneous Expenses" msgstr "Разни трошкови" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "Неподударање" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "Недостаје" @@ -30879,7 +30925,7 @@ msgstr "Недостају филтери" msgid "Missing Finance Book" msgstr "Недостајућа финансијска евиденција" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "Недостаје готов производ" @@ -30887,11 +30933,11 @@ msgstr "Недостаје готов производ" msgid "Missing Formula" msgstr "Недостаје формула" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "Недостајућа ставка" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "Недостајући параметар" @@ -30935,10 +30981,6 @@ msgstr "Недостајућа вредност" msgid "Mixed Conditions" msgstr "Помешани услови" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "Мобилни: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31207,7 +31249,7 @@ msgstr "Доступно је више поља компаније: {0}. Мол msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "Постоји више фискалних година за датум {0}. Молимо поставите компанију у фискалну годину" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "Више ставки не може бити означено као готов производ" @@ -31286,27 +31328,20 @@ msgstr "Названо место" msgid "Naming Series Prefix" msgstr "Префикс серије именовања" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "Серија именовања и подразумеване цене" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "Серија именовања је обавезна" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31354,16 +31389,16 @@ msgstr "Анализа потребна" msgid "Negative Batch Report" msgstr "Извештај о шаржама са негативним стањем" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "Негативна количина није дозвољена" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "Грешка због негативног стања залиха" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "Негативна стопа вредновања није дозвољена" @@ -31977,7 +32012,7 @@ msgstr "Не постоји профил малопродаје. Молимо В #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "Без дозволе" @@ -31990,7 +32025,7 @@ msgstr "Ниједна набавна поруџбина није креиран msgid "No Records for these settings." msgstr "Без записа за ове поставке." -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "Није извршен избор" @@ -32035,7 +32070,7 @@ msgstr "Нема неусклађених уплата за ову странк msgid "No Work Orders were created" msgstr "Нису креирани радни налози" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "Нема рачуноводствених уноса за следећа складишта" @@ -32048,7 +32083,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "Нема активне саставнице за ставку {0}. Достава по броју серије није могућа" @@ -32060,7 +32095,7 @@ msgstr "Нема доступних додатних поља" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "Нема доступне количине за резервацију ставке {0} у складишту {1}" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -32068,7 +32103,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32162,7 +32197,7 @@ msgstr "Нема више зависних елемената са леве ст msgid "No more children on Right" msgstr "Нема више зависних елемената са десне стране" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32337,7 +32372,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "Нема доступних залиха за ову шаржу." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "Уноси у књигу залиха нису креирани. Молимо Вас да правилно подесите количину или стопу вредновања за ставке и да покушате поново." @@ -32429,7 +32464,7 @@ msgstr "Нема нула" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "Није могуће креирати саставницу која није виртуелна за ставку ван залиха {0}." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "Ниједна од ставки није имала промене у количини или вредности." @@ -32533,7 +32568,7 @@ msgstr "Није дозвољено јер {0} премашује лимите" msgid "Not authorized to edit frozen Account {0}" msgstr "Није дозвољено изменити закључани рачун {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32579,7 +32614,7 @@ msgstr "Напомена: Унос уплате неће бити креиран msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "Напомена: Овај трошковни центар је група. Није могуће направити рачуноводствене уносе против група." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "Напомена: Да бисте спојили ставке, креирајте засебно усклађивање залиха за старију ставку {0}" @@ -33056,7 +33091,7 @@ msgstr "Приликом примене искључене накнаде, са msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "Само једна операција може имати означено 'Финални готов производ' када је омогућено 'Праћење полупроизвода'." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "Може се креирати само један {0} унос против радног налога {1}" @@ -33208,7 +33243,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "Почетни салдо" @@ -33367,16 +33402,16 @@ msgstr "Почетне излазне фактуре су креиране." #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Почетни лагер" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33733,7 +33768,7 @@ msgstr "Опционо. Ово подешавање ће се користити msgid "Optional. Used with Financial Report Template" msgstr "Опционо. Користи се уз шаблон финансијског извештаја" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33867,7 +33902,7 @@ msgstr "Наручена количина" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "Наруџбине" @@ -34075,7 +34110,7 @@ msgstr "Неизмирено (валута компаније)" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34133,7 +34168,7 @@ msgstr "Налог за издавање" msgid "Over Billing Allowance (%)" msgstr "Дозвола за фактурисање преко лимита (%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "Дозвола за фактурисање преко лимита је премашена за ставку улазне фактуре {0} ({1}) за {2}%" @@ -34151,7 +34186,7 @@ msgstr "Дозвола за прекорачење испоруке/пријем msgid "Over Picking Allowance" msgstr "Дозвола за преузимање вишка" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "Прекорачење пријема" @@ -34394,7 +34429,6 @@ msgstr "Поље у малопродаји" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "Фискални рачун" @@ -34665,7 +34699,7 @@ msgstr "Упакована ставка" msgid "Packed Items" msgstr "Упаковане ставке" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "Упаковане ставке не могу бити део интерног преноса" @@ -35113,7 +35147,7 @@ msgstr "Делимично примљено" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35249,7 +35283,7 @@ msgstr "Милионити део" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35375,7 +35409,7 @@ msgstr "Неподударање странке" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35461,7 +35495,7 @@ msgstr "Специфична ставка странке" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35764,7 +35798,6 @@ msgstr "Уноси плаћања {0} нису повезани" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -36022,7 +36055,7 @@ msgstr "Референце плаћања" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36101,10 +36134,6 @@ msgstr "Захтев за наплату на основу распореда п msgid "Payment Schedules" msgstr "Распореди плаћања" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "Статус наплате" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37124,7 +37153,7 @@ msgstr "Молимо Вас да поставите приоритет" msgid "Please Set Supplier Group in Buying Settings." msgstr "Молимо Вас да поставите групу добављача у подешавањима за набавку." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "Молимо Вас да наведете рачун" @@ -37156,11 +37185,11 @@ msgstr "Молимо Вас да додате привремени рачун з msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "Молимо Вас да додате барем један број серије / шарже" @@ -37180,7 +37209,7 @@ msgstr "Молимо Вас да додате рачун за основни н msgid "Please add {1} role to user {0}." msgstr "Молимо Вас да додате улогу {1} кориснику {0}." -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "Молимо Вас да прилагодите количину или измените {0} за наставак." @@ -37287,7 +37316,7 @@ msgstr "Молимо Вас да креирате набавку из интер msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "Молимо Вас да креирате пријемницу набавке или улазну фактуру за ставку {0}" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "Молимо Вас да обришете производну комбинацију {0}, пре него што спојите {1} у {2}" @@ -37356,11 +37385,11 @@ msgstr "Молимо Вас да унесете рачун за кусур" msgid "Please enter Approving Role or Approving User" msgstr "Молимо Вас да унесете улогу одобравања или корисника који одобрава" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "Молимо Вас да унесете број шарже" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "Молимо Вас да унесете трошковни центар" @@ -37372,7 +37401,7 @@ msgstr "Молимо Вас да унесете датум испоруке" msgid "Please enter Employee Id of this sales person" msgstr "Молимо Вас да унесете ИД запосленог лица за овог продавца" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "Молимо Вас да унесете рачун расхода" @@ -37417,7 +37446,7 @@ msgstr "Молимо Вас да унесете датум референце" msgid "Please enter Root Type for account- {0}" msgstr "Молимо Вас да унесете врсту главног рачуна за рачун - {0}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "Молимо Вас да унесете број серије" @@ -37494,7 +37523,7 @@ msgstr "Молимо Вас да унесете први датум испору msgid "Please enter the phone number first" msgstr "Молимо Вас да прво унесете број телефона" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "Молимо Вас да унесете {schedule_date}." @@ -37608,12 +37637,12 @@ msgstr "Сачувајте продајну поруџбину пре додав msgid "Please select Template Type to download template" msgstr "Молимо Вас да изаберете Врсту шаблона да преузмете шаблон" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "Молимо Вас да изаберете на шта ће се применити попуст" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "Молимо Вас да изаберете саставницу за ставку {0}" @@ -37629,13 +37658,13 @@ msgstr "Молимо Вас да изаберете текући рачун" msgid "Please select Category first" msgstr "Молимо Вас да прво изаберете категорију" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "Молимо Вас да прво изаберете врсту трошка" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "Молимо Вас да изаберете компанију" @@ -37644,7 +37673,7 @@ msgstr "Молимо Вас да изаберете компанију" msgid "Please select Company and Posting Date to getting entries" msgstr "Молимо Вас да изаберете компанију и датум књижења да бисте добили уносе" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "Молимо Вас да прво изаберете компанију" @@ -37693,7 +37722,7 @@ msgstr "Молимо Вас да изаберете рачун разлике з msgid "Please select Posting Date before selecting Party" msgstr "Молимо Вас да изаберете датум књижења пре него што изаберете странку" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "Молимо Вас да прво изаберете датум књижења" @@ -37701,11 +37730,11 @@ msgstr "Молимо Вас да прво изаберете датум књиж msgid "Please select Price List" msgstr "Молимо Вас да изаберете ценовник" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "Молимо Вас да изаберете количину за ставку {0}" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "Молимо Вас да прво изаберете складиште за задржане узорке у подешавањима залиха" @@ -37758,7 +37787,7 @@ msgstr "Молимо Вас да изаберете набавну поруџб msgid "Please select a Supplier" msgstr "Молимо Вас да изаберете добављача" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "Молимо Вас да изаберете складиште" @@ -37819,7 +37848,7 @@ msgstr "Молимо Вас да изаберете ред за креирање msgid "Please select a supplier for fetching payments." msgstr "Молимо Вас да изаберете добављача за преузимање уплата." -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37839,7 +37868,7 @@ msgstr "Молимо Вас да изаберете шифру ставке пр msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "Молимо Вас да изаберете барем један филтер: Шифра ставке, шаржа или број серије." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37946,7 +37975,7 @@ msgstr "Молимо Вас да изаберете валидну врсту д msgid "Please select weekly off day" msgstr "Молимо Вас да изаберете недељни дан одмора" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "Молимо Вас да прво изаберете {0}" @@ -38086,7 +38115,7 @@ msgstr "Молимо Вас подесите стварну потражњу и msgid "Please set an Address on the Company '%s'" msgstr "Молимо Вас да поставите адресу на компанију '%s'" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "Молимо Вас да поставите рачун расхода у табелу ставки" @@ -38130,7 +38159,7 @@ msgstr "Молимо Вас да поставите подразумевани msgid "Please set default UOM in Stock Settings" msgstr "Молимо Вас да поставите подразумеване јединице мере у поставкама залиха" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "Молимо Вас да поставите подразумевани рачун трошка продате робе у компанији {0} за књижење заокруживања добитака и губитака током преноса залиха" @@ -38249,7 +38278,7 @@ msgstr "Молимо Вас прецизирајте {0}." msgid "Please specify at least one attribute in the Attributes table" msgstr "Молимо Вас да прецизирате барем један атрибут у табели атрибута" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "Молимо Вас да прецизирате или количину или стопу вредновања или оба" @@ -38420,7 +38449,7 @@ msgstr "Објављено на" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38445,7 +38474,7 @@ msgstr "Објављено на" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38560,7 +38589,7 @@ msgstr "Датум и време књижења" msgid "Posting Time" msgstr "Време књижења" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "Датум и време књижења су обавезни" @@ -38739,6 +38768,12 @@ msgstr "Превентивно одржавање" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39032,7 +39067,9 @@ msgstr "Потребне су категорије попуста на цену msgid "Price per Unit (Stock UOM)" msgstr "Цена по јединици (јединица мере залиха)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40387,6 +40424,7 @@ msgstr "Трошак набавке за ставку {0}" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40423,6 +40461,12 @@ msgstr "Аванс за улазну фактуру" msgid "Purchase Invoice Item" msgstr "Ставка улазне фактуре" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40474,6 +40518,7 @@ msgstr "Улазне фактуре" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40483,7 +40528,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40600,7 +40645,7 @@ msgstr "Набавна поруџбина {0} је креирана" msgid "Purchase Order {0} is not submitted" msgstr "Набавна поруџбина {0} није поднета" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "Набавне поруџбине" @@ -40663,6 +40708,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40677,7 +40723,7 @@ msgstr "Ценовник набавке" msgid "Purchase Receipt" msgstr "Пријемница набавке" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40943,7 +40989,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41531,7 +41576,7 @@ msgstr "Преглед квалитета" msgid "Quality Review Objective" msgstr "Циљ прегледа квалитета" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41592,7 +41637,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41786,7 +41831,7 @@ msgstr "Query Route String" msgid "Queue Size should be between 5 and 100" msgstr "Величина реда мора бити између 5 и 100" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "Брзи налог књижења" @@ -41841,7 +41886,7 @@ msgstr "Понуда/Потенцијални клијент %" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -42004,7 +42049,6 @@ msgstr "Покренуто од стране (Имејл)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42414,8 +42458,8 @@ msgstr "Сировине ка купцу" msgid "Raw SQL" msgstr "Необрађени SQL" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "Утрошена количина сировина биће проверена на основу потребне количине из саставнице готовог производа" @@ -42823,11 +42867,10 @@ msgstr "Усклади банкарску трансакцију" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43351,7 +43394,7 @@ msgstr "Одбијени пакети серија и шаржи" msgid "Rejected Warehouse" msgstr "Складиште одбијених залиха" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "Складиште одбијених залиха и Складиште прихваћених залиха не могу бити исто." @@ -43401,7 +43444,7 @@ msgid "Remaining Balance" msgstr "Преостали салдо" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43455,7 +43498,7 @@ msgstr "Напомена" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43494,7 +43537,7 @@ msgstr "Уклони записе са нултим бројем" msgid "Remove item if charges is not applicable to that item" msgstr "Уклони ставку уколико трошкови нису примењиви на њу" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "Уклони ставке без промене у количини или вредности." @@ -43899,6 +43942,7 @@ msgstr "Захтев за информацијама" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44172,7 +44216,7 @@ msgstr "Резервиши за подсклопове" msgid "Reserved" msgstr "Резервисано" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "Конфликт резервисане шарже" @@ -44785,7 +44829,7 @@ msgstr "" msgid "Reversal Of" msgstr "Поништавање" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "Поништавање налога књижења" @@ -44934,10 +44978,7 @@ msgstr "Улоге које имају дозволу за испоруку/пр #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "Улоге које имају дозволу да пониште радње стопирања" @@ -44952,8 +44993,11 @@ msgstr "Улоге које имају дозволу да заобиђу лим msgid "Role allowed to bypass period restrictions." msgstr "Улога којој је дозвољено заобилажење ограничења периода." +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45154,8 +45198,8 @@ msgstr "Одобрење за губитак од заокруживања" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "Одобрење за губитак од заокруживања треба бити између 0 и 1" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "Унос прихода/расхода од заокруживања за пренос залиха" @@ -45182,11 +45226,11 @@ msgstr "Назив за рутирање" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "Ред # {0}: Не може се вратити више од {1} за ставку {2}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "Ред {0}: Молимо Вас да додате пакет серије и шарже за ставку {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "Ред # {0}: Молимо Вас да унесете количину за ставку {1} јер није нула." @@ -45212,7 +45256,7 @@ msgstr "Ред #{0} (Евиденција плаћања): Износ мора msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "Ред #{0} (Евиденција плаћања): Износ мора бити позитиван" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "Ред #{0}: Унос за поновну наруџбину већ постоји за складиште {1} са врстом поновне наруџбине {2}." @@ -45413,7 +45457,7 @@ msgstr "Ред #{0}: Дупли унос у референцама {1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "Ред #{0}: Очекивани датум испоруке не може бити пре датума набавне поруџбине" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "Ред #{0}: Рачун расхода није постављен за ставку {1}. {2}" @@ -45473,7 +45517,7 @@ msgstr "Ред #{0}: Поља за време почетка и време за msgid "Row #{0}: Item added" msgstr "Ред #{0}: Ставка је додата" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "Ред #{0}: Ставка {1} не може се пренети у количини већој од {2} у односу на {3} {4}" @@ -45501,7 +45545,7 @@ msgstr "Ред #{0}: Ставка {1} у складишту {2}: Доступн msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "Ред #{0}: Ставка {1} није ставка обезбеђена од стране купца." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "Ред #{0}: Ставка {1} није ставка серије / шарже. Не може имати број серије / шарже." @@ -45554,7 +45598,7 @@ msgstr "Ред #{0}: Само {1} је доступно за резерваци msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "Ред #{0}: Почетна акумулирана амортизација мора бити мања од или једнака {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "Ред #{0}: Операција {1} није завршена за {2} количине готових производа у радном налогу {3}. Молимо Вас да ажурирате статус операције путем радне картице {4}." @@ -45579,7 +45623,7 @@ msgstr "Ред #{0}: Молимо Вас да изаберете ставку г msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Ред #{0}: Молимо Вас да изаберете складиште подсклопова" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "Ред #{0}: Молимо Вас да поставите количину за наручивање" @@ -45605,15 +45649,15 @@ msgstr "Ред #{0}: Количина мора бити позитиван бр msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "Ред #{0}: Количина треба да буде мања или једнака доступној количини за резервацију (стварна количина - резервисана количина) {1} за ставку {2} против шарже {3} у складишту {4}." -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "Ред #{0}: Инспекција квалитета је неопходна за ставку {1}" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "Ред #{0}: Инспекција квалитета {1} није поднета за ставку: {2}" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "Ред #{0}: Инспекција квалитета {1} је одбијена за ставку {2}" @@ -45644,11 +45688,11 @@ msgstr "Ред #{0}: Количина за резервацију за став msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "Ред #{0}: Цена мора бити иста као {1}: {2} ({3} / {4})" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "Ред #{0}: Врста референтног документа мора бити једна од следећих: набавна поруџбина, улазна фактура, налог књижења или опомена" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "Ред #{0}: Врста референтног документа мора бити једна од следећих: продајна поруџбина, излазна фактура, налог књижења или опомена" @@ -45694,7 +45738,7 @@ msgstr "Ред #{0}: Продајна цена за ставку {1} је ниж msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "Ред #{0}: ИД секвенце мора бити {1} или {2} за операцију {3}." -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "Ред #{0}: Број серије {1} не припада шаржи {2}" @@ -45742,11 +45786,11 @@ msgstr "Ред #{0}: Изворно складиште {1} за ставку {2} msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "Ред #{0}: Изворно складиште {1} за ставку {2} мора бити исто као изворно складиште {3} у радном налогу." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "Ред #{0}: Изворно и циљно складиште не могу бити исто приликом преноса материјала" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "Ред #{0}: Изворно, циљно складиште и димензије инвентара не могу бити потпуно исти приликом преноса материјала" @@ -45799,11 +45843,11 @@ msgstr "Ред #{0}: Количина залиха {1} ({2}) за ставку { msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "Ред #{0}: Циљно складиште мора бити исто као складиште купца {1} из повезаног налога за пријем из подуговарања" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "Ред #{0}: Шаржа {1} је већ истекла." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "Ред #{0}: Складиште {1} није зависно складиште групног складишта {2}" @@ -45831,7 +45875,7 @@ msgstr "Ред #{0}: Износ пореза по одбитку {1} не одг msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "Ред #{0}: Радни налог постоји за потпуну или делимичну количину ставке {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "Ред #{0}: Не можете користити димензију инвентара '{1}' у усклађивању залиха за измену количине или стопе вредновања. Усклађивање залиха са димензијама инвентара је предвиђено само за обављање уноса почетног стања." @@ -45867,23 +45911,23 @@ msgstr "Ред #{1}: Складиште је обавезно за склади msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "Ред #{idx}: Не може се изабрати складиште добављача приликом испоруке сировина подуговарача." -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "Ред #{idx}: Цена ставке је ажурирана према стопи вредновања јер је у питању интерни пренос залиха." -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "Ред# {idx}: Унесите локацију за ставку имовине {item_code}." -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "Ред #{idx}: Примљена количина мора бити једнака збиру прихваћене и одбијене количине за ставку {item_code}." -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "Ред #{idx}: {field_label} не може бити негативно за ставку {item_code}." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "Ред #{idx}: {field_label} је обавезан." @@ -45891,7 +45935,7 @@ msgstr "Ред #{idx}: {field_label} је обавезан." msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "Ред #{idx}: {from_warehouse_field} и {to_warehouse_field} не могу бити исто." -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "Ред #{idx}: {schedule_date} не може бити пре {transaction_date}." @@ -45956,7 +46000,7 @@ msgstr "Ред #{}: {}" msgid "Row #{}: {} {} does not exist." msgstr "Ред #{}: {} {} не постоји." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "Ред #{}: {} {} не припада компанији {}. Молимо Вас да изаберете важећи {}." @@ -45972,7 +46016,7 @@ msgstr "Ред {0} : Операција је обавезна за ставку msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "Ред {0} одабрана количина је мања од захтеване количине, потребно је додатних {1} {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "Ред {0}# ставка {1} није пронађена у табели 'Примљене сировине' у {2} {3}" @@ -46004,7 +46048,7 @@ msgstr "Ред {0}: Распоређени износ {1} мора бити ма msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "Ред {0}: Распоређени износ {1} мора бити мањи или једнак преосталом износу за плаћање {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "Ред {0}: Пошто је {1} омогућен, сировине не могу бити додате у {2} унос. Користите {3} унос за потрошњу сировина." @@ -46063,7 +46107,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "Ред {0}: Ставка из отпремнице или референца упаковане ставке је обавезна." #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "Ред {0}: Девизни курс је обавезан" @@ -46104,7 +46148,7 @@ msgstr "Ред {0}: Време почетка и време завршетка msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "Ред {0}: Време почетка и време завршетка за {1} се преклапају са {2}" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "Ред {0}: Почетно складиште је обавезно за интерне трансфере" @@ -46228,7 +46272,7 @@ msgstr "Ред {0}: Количина мора бити већа од 0." msgid "Row {0}: Quantity cannot be negative." msgstr "Ред {0}: Количина не може бити негативна." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "Ред {0}: Количина није доступна за {4} у складишту {1} за време књижења ({2} {3})" @@ -46240,11 +46284,11 @@ msgstr "Ред {0}: Излазна фактура {1} је већ креиран msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "Ред {0}: Смена се не може променити јер је амортизација већ обрачуната" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "Ред {0}: Подуговорена ставка је обавезна за сировину {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "Ред {0}: Циљно складиште је обавезно за интерне трансфере" @@ -46268,7 +46312,7 @@ msgstr "Ред {0}: Рачун {3} {1} не припада компанији {2 msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "Ред {0}: За постављање периодичности {1}, разлика између датума почетка и датума завршетка мора бити већа или једнака од {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "Ред {0}: Пренета количина не може бити већа од затражене количине." @@ -46321,7 +46365,7 @@ msgstr "Ред {0}: Ставка {2} {1} не постоји у {2} {3}" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "Ред {1}: Количина ({0}) не може бити разломак. Да бисте то омогућили, онемогућите опцију '{2}' у јединици мере {3}." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "Ред {idx}: Серија именовања за имовину је обавезна за аутоматско креирање имовине за ставку {item_code}." @@ -46351,7 +46395,7 @@ msgstr "Редови са истим аналитичким рачунима ћ msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "Пронађени су редови са дуплим датумима доспећа у другим редовима: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "Редови: {0} имају 'Унос уплате' као референтну врсту. Ово не треба подешавати ручно." @@ -46417,7 +46461,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46714,7 +46758,7 @@ msgstr "Продајна улазна јединична цена" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46888,7 +46932,7 @@ msgstr "Продајне прилике по извору" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -47011,8 +47055,8 @@ msgstr "Продајна поруџбина је потребна за став msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "Продајна поруџбина {0} већ постоји за набавну поруџбину купца {1}. Да бисте омогућили више продајних поруџбина, омогућите {2} у {3}" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "Продајна поруџбина {0} није доступна за производњу" @@ -47423,7 +47467,7 @@ msgstr "Иста ставка" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "Иста ставка и комбинација складишта су већ унесени." @@ -47460,7 +47504,7 @@ msgstr "Складиште за задржане узорке" msgid "Sample Size" msgstr "Величина узорка" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "Количина узорка {0} не може бити већа од примљене количине {1}" @@ -47751,7 +47795,7 @@ msgstr "Претрага по шифри ставке, броју серије msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47896,7 +47940,7 @@ msgstr "Изаберите бренд..." msgid "Select Columns and Filters" msgstr "Изаберите колоне и филтере" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "Изаберите компанију" @@ -48592,7 +48636,7 @@ msgstr "Опсег серијских бројева" msgid "Serial No Reserved" msgstr "Резервисани број серије" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "Преклапање серије бројева серије" @@ -48653,7 +48697,7 @@ msgstr "Број серије је обавезан" msgid "Serial No is mandatory for Item {0}" msgstr "Број серије је обавезан за ставку {0}" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "Број серије {0} већ постоји" @@ -48939,7 +48983,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48965,7 +49009,7 @@ msgstr "Бројеви серије нису доступни за ставку #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49363,12 +49407,6 @@ msgstr "Постави циљно складиште" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "Поставите стопу вредновања на основу изворног складишта" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "Постави стопу вредновања за одбијене материјале" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "Постави складиште" @@ -49474,6 +49512,12 @@ msgstr "Поставите ову вредност на 0 да бисте оне msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "Постави {0} у категорију имовине {1} за компанију {2}" @@ -49972,7 +50016,7 @@ msgstr "Прикажи стање у контном оквиру" msgid "Show Barcode Field in Stock Transactions" msgstr "Прикажи поља за бар-код у трансакцијама са залихама" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "Прикажи отказане уносе" @@ -49980,7 +50024,7 @@ msgstr "Прикажи отказане уносе" msgid "Show Completed" msgstr "Прикажи завршено" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "Прикажи потражује / дугује у валути компаније" @@ -50063,7 +50107,7 @@ msgstr "Прикажи повезане отпремнице" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "Прикажи нето вредности на рачуну странке" @@ -50075,7 +50119,7 @@ msgstr "" msgid "Show Open" msgstr "Прикажи отворено" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "Прикажи уносе почетног стања" @@ -50088,11 +50132,6 @@ msgstr "Прикажи почетно и завршно стање" msgid "Show Operations" msgstr "Прикажи операције" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "Прикажи дугме за плаћање у порталу набавних поруџбина" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "Прикажи детаље плаћања" @@ -50108,7 +50147,7 @@ msgstr "Прикажи распоред плаћања у штампаном ф #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "Прикажи напомене" @@ -50175,6 +50214,11 @@ msgstr "Прикажи само малопродају" msgid "Show only the Immediate Upcoming Term" msgstr "Прикажи само непосредно наредни период" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "Прикажи нерешене уносе" @@ -50463,11 +50507,11 @@ msgstr "Изворни унос производње" msgid "Source Stock Entry (Manufacture)" msgstr "Изворни унос залиха (производња)" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "Изворни унос залиха {0} припада радном налогу {1}, а не {2}. Молимо Вас да користите унос производње из истог радног налога." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "Изворни унос залиха {0} нема количину готових производа" @@ -50533,7 +50577,7 @@ msgstr "Изворно складиште {0} мора бити исто као msgid "Source and Target Location cannot be same" msgstr "Извор и циљна локација не могу бити исти" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "Изворно и циљно складиште не могу бити исти за ред {0}" @@ -50547,8 +50591,8 @@ msgid "Source of Funds (Liabilities)" msgstr "Извор средстава (Обавезе)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "Изворно складиште је обавезно за ред {0}" @@ -50713,8 +50757,8 @@ msgstr "Стандардни оцењени трошкови" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "Стандардна продаја" @@ -51047,7 +51091,7 @@ msgstr "Дневник затварања залиха" msgid "Stock Details" msgstr "Детаљи о залихама" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "Уноси залиха су већ креирани за радни налог {0}: {1}" @@ -51318,7 +51362,7 @@ msgstr "Залихе примљене али нису фактурисане" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51330,7 +51374,7 @@ msgstr "Усклађивање залиха" msgid "Stock Reconciliation Item" msgstr "Ставка усклађивања залиха" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "Усклађивања залиха" @@ -51368,7 +51412,7 @@ msgstr "Подешавање поновне обраде залиха" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51396,7 +51440,7 @@ msgstr "Уноси резервације залиха отказани" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "Уноси резервације залиха креирани" @@ -51778,7 +51822,7 @@ msgstr "Заустављени радни налози не могу бити о #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "Магацини" @@ -51856,10 +51900,6 @@ msgstr "Подоперације" msgid "Sub Procedure" msgstr "Подпроцедура" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "Међузбир" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "Недостају референце ставки подсклопа. Молимо Вас да поново учитате подсклопе и сировине." @@ -52076,7 +52116,7 @@ msgstr "Ставка услуге налога за пријем из подуг msgid "Subcontracting Order" msgstr "Налог за подуговарање" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52102,7 +52142,7 @@ msgstr "Услужна ставка налога за подуговарање" msgid "Subcontracting Order Supplied Item" msgstr "Набављене ставке налога за подуговарање" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "Налог за подуговарање {0} је креиран." @@ -52191,7 +52231,7 @@ msgstr "Поставке подуговарања" msgid "Subdivision" msgstr "Пододељење" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "Подношење радње није успело" @@ -52366,7 +52406,7 @@ msgstr "Успешно усклађено" msgid "Successfully Set Supplier" msgstr "Добављач успешно постављен" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "Јединица мере на залихама је успешно промењена, редефинишите факторе конверзије за нову јединицу мере." @@ -52522,6 +52562,7 @@ msgstr "Набављена количина" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52563,8 +52604,8 @@ msgstr "Набављена количина" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52612,6 +52653,12 @@ msgstr "Адресе и контакти добављача" msgid "Supplier Contact" msgstr "Контакт добављача" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52706,7 +52753,7 @@ msgstr "Датум издавања фактуре добављача" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "Број фактуре добављача" @@ -52986,19 +53033,10 @@ msgstr "Добављач робе или услуга." msgid "Supplier {0} not found in {1}" msgstr "Добављач {0} није пронађен у {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Добављач(и)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "Аналитика продаје по добављачу" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53060,7 +53098,7 @@ msgstr "Тим за подршку" msgid "Support Tickets" msgstr "Тикет за подршку" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53319,8 +53357,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "Циљно складиште {0} мора бити исто као складиште за испоруку {1} у ставци налога за пријем из подуговарања." #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "Циљно складиште је обавезно за ред {0}" @@ -53789,7 +53827,7 @@ msgstr "Порез по одбитку се обрачунава само на #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "Опорезиви износ" @@ -53950,7 +53988,7 @@ msgstr "Одбијени порези и накнаде" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "Одбијени порези и накнаде (валута компаније)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "Ред пореза #{0}: {1} не може бити мањи од {2}" @@ -54140,7 +54178,6 @@ msgstr "Шаблон услова" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54332,7 +54369,7 @@ msgstr "Приступ захтеву за понуду са портала је msgid "The BOM which will be replaced" msgstr "Саставница која ће бити замењена" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "Шаржа {0} има негативну количину од {1}. Да бисте то исправили, отворите шаржу и кликните да поново израчунате количину шарже. Уколико проблем и даље постоји, креирајте улазну ставку." @@ -54376,7 +54413,7 @@ msgstr "Услов плаћања у реду {0} је вероватно дуп 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:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "Количина губитка у процесу је ресетована према количини губитка у процесу са радном картицом" @@ -54392,7 +54429,7 @@ msgstr "Број серије у реду #{0}: {1} није доступан у msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "Серијски број {0} је резервисан за {1} {2} и не може се користити за било коју другу трансакцију." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "Пакет серије и шарже {0} није валидан за ову трансакцију. 'Врста трансакције' треба да буде 'Излазна' уместо 'Улазна' у пакету серије и шарже {0}" @@ -54428,7 +54465,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "Шаржа {0} је већ резервисана у {1} {2}. Дакле, није могуће наставити са {3} {4}, која је креирана за {5} {6}." @@ -54534,7 +54571,7 @@ msgstr "Следеће шарже су истекле, молимо Вас да msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "Постоје следећи отказани уноси поновног књижења за {0}:

{1}

Молимо Вас да обришете ове уносе пре наставка." -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "Следећи обрисани атрибути постоје у варијантама, али не и у шаблонима. Можете или обрисати варијанте или задржати атрибуте у шаблону." @@ -54579,15 +54616,15 @@ msgstr "Празник који пада на {0} није између дату msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "Следећа ставка {item} није означена као {type_of} ставка. Можете је омогућити као {type_of} ставку из мастер података ставке." -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "Ставке {0} и {1} су присутне у следећем {2} :" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "Следеће ставке {items} нису означене као {type_of} ставке. Можете их омогућити као {type_of} ставке из мастер података ставке." @@ -54743,7 +54780,7 @@ msgstr "Удели не постоје са {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "Залихе за ставку {0} у складишту {1} су биле негативне на {2}. Требало би да креирате позитиван унос {3} пре датума {4} и времена {5} како бисте унели исправну стопу вредновања. За више детаља прочитајте документацију.." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "Залихе су резервисане за следеће ставке и складишта, поништите резервисање како бисте могли да {0} ускладите залихе:

{1}" @@ -54765,11 +54802,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "Задатак је стављен у статус чекања као позадински процес. У случају проблема при обради у позадини, систем ће додати коментар о грешци у овом усклађивању залиха и вратити га у фазу нацрта" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "Задатак је стављен у статус чекања као позадински процес. У случају проблема при обради у позадини, систем ће додати коментар о грешци у овом усклађивању залиха и вратити га у статус поднето" @@ -54841,7 +54878,7 @@ msgstr "{0} ({1}) мора бити једнако {2} ({3})" msgid "The {0} contains Unit Price Items." msgstr "{0} садржи ставке са јединичном ценом." -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "Префикс {0} '{1}' већ постоји. Молимо Вас да промените серију бројева серије, у супротном ће доћи до грешке дуплог уноса." @@ -54894,7 +54931,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "Нема доступних термина за овај датум" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54938,7 +54975,7 @@ msgstr "Није пронађена ниједна шаржа за {0}: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "Мора постојати бар један готов производ у уносу залиха" @@ -54994,11 +55031,11 @@ msgstr "Ова ставка је варијанта {0} (Шаблон)." msgid "This Month's Summary" msgstr "Резиме овог месеца" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "Ова набавна поруџбина је у потпуности подуговорена." -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "Ова продајна поруџбина је у потпуности подуговорена." @@ -55799,7 +55836,7 @@ msgstr "Омогућава укључивање трошкова подскло msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "Да би порез био укључен у ред {0} у цени ставке, порези у редовима {1} такође морају бити укључени" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "За спајање, следеће особине морају бити исте за обе ставке" @@ -55834,7 +55871,7 @@ msgstr "Да бисте користили другу финансијску е #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "Да бисте користили другу финансијску књигу, поништите означавање опције 'Укључи подразумеване уносе у финансијским евиденцијама'" @@ -55985,7 +56022,7 @@ msgstr "Укупне расподеле" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Укупан износ" @@ -56408,7 +56445,7 @@ msgstr "Укупан износ захтева за наплату не може msgid "Total Payments" msgstr "Укупно плаћања" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "Укупно одабрана количина {0} је већа од наручене количине {1}. Можете поставити дозволу за преузимање вишка у подешавањима залиха." @@ -56440,7 +56477,7 @@ msgstr "Укупни трошак набавке (путем улазне фак #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Укупна количина" @@ -56826,7 +56863,7 @@ msgstr "URL за праћење" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56837,7 +56874,7 @@ msgstr "Трансакција" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "Валута трансакције" @@ -57509,11 +57546,11 @@ msgstr "UAE VAT Settings" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57585,7 +57622,7 @@ msgstr "Фактор конверзије јединице мере је оба msgid "UOM Name" msgstr "Назив јединице мере" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "Фактор конверзије јединице мере је обавезан за јединицу мере: {0} у ставци: {1}" @@ -57661,7 +57698,7 @@ msgstr "Није могуће пронаћи оцену која почиње с msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "Није могуће пронаћи временски термин у наредних {0} дана за операцију {1}. Молимо Вас да повећате 'Планирање капацитета за (у данима)' за {2}." -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "Није могуће пронаћи променљиве:" @@ -57780,7 +57817,7 @@ msgstr "Јединица мере" msgid "Unit of Measure (UOM)" msgstr "Јединица мере" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "Јединица мере {0} је унета више пута у табелу фактора конверзије" @@ -57900,10 +57937,9 @@ msgid "Unreconcile Transaction" msgstr "Поништавање усклађености трансакција" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "Неусклађено" @@ -57926,10 +57962,6 @@ msgstr "Неусклађени уноси" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "Успешно поништено усклађивање" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57975,7 +58007,7 @@ msgstr "Непланирано" msgid "Unsecured Loans" msgstr "Необезбеђени кредити" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "Поништи усклађени захтев за наплату" @@ -58190,12 +58222,6 @@ msgstr "Ажурирај залихе" msgid "Update Type" msgstr "Ажурирај врсту" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "Ажурирај учесталост пројекта" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58236,7 +58262,7 @@ msgstr "Ажурирано {0} редова финансијског извеш msgid "Updating Costing and Billing fields against this Project..." msgstr "Ажурирање поља за обрачун трошкова и фактурисање за овај пројекат..." -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "Ажурирање варијанти..." @@ -58694,12 +58720,6 @@ msgstr "Проверите примењено правило" msgid "Validate Components and Quantities Per BOM" msgstr "Проверите компоненте и количине компоненти по саставници" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "Провери утрошену количину (према саставници)" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58723,6 +58743,12 @@ msgstr "Проверите правило ценовника" msgid "Validate Stock on Save" msgstr "Проверите стање залиха приликом чувања" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58829,11 +58855,11 @@ msgstr "Недостаје стопа вредновања" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "Стопа вредновања за ставку {0} је неопходна за рачуноводствене уносе за {1} {2}." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "Стопа вредновања је обавезна уколико је унет почетни инвентар" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "Стопа вредновања је обавезна за ставку {0} у реду {1}" @@ -58843,7 +58869,7 @@ msgstr "Стопа вредновања је обавезна за ставку msgid "Valuation and Total" msgstr "Вредновање и укупно" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "Стопа вредновања за ставке обезбеђене од стране купца је постављена на нулу." @@ -58993,7 +59019,7 @@ msgstr "Одступање ({})" msgid "Variant" msgstr "Варијанта" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "Грешка атрибута варијанте" @@ -59012,7 +59038,7 @@ msgstr "Варијанта саставнице" msgid "Variant Based On" msgstr "Варијанта заснована на" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "Варијанта заснована на се не може променити" @@ -59030,7 +59056,7 @@ msgstr "Поље варијанте" msgid "Variant Item" msgstr "Ставка варијанте" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "Ставке варијанте" @@ -59411,7 +59437,7 @@ msgstr "Назив документа" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59451,7 +59477,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "Подврста документа" @@ -59483,7 +59509,7 @@ msgstr "Подврста документа" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59718,7 +59744,7 @@ msgstr "Складиште {0} не постоји" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "Складиште {0} није дозвољено за продајну поруџбину {1}, требало би да буде {2}" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "Складиште {0} није повезано ни са једним рачуном, молимо Вас да наведете рачун у евиденцији складишта или поставите подразумевани рачун инвентара у компанији {1}" @@ -59765,7 +59791,7 @@ msgstr "Складишта са постојећим трансакцијама #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59821,6 +59847,12 @@ msgstr "Упозорење на нове захтеве за понуду" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "Упозорење - Ред {0}: Фактурисани сати су већи од стварних сати" @@ -60004,7 +60036,7 @@ msgstr "Спецификације веб-сајта" msgid "Website:" msgstr "Веб-сајт:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60378,7 +60410,7 @@ msgstr "Утрошени материјали радног налога" msgid "Work Order Item" msgstr "Ставка радног налога" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "Неусклађеност радног налога" @@ -60440,11 +60472,11 @@ msgstr "Радни налог није креиран" msgid "Work Order {0} created" msgstr "Радни налог {0} је креиран" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "Радни налог {0} нема произведену количину" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "Радни налог: {0} радна картица није пронађена за операцију {1}" @@ -60760,11 +60792,11 @@ msgstr "Назив фискалне године" msgid "Year Start Date" msgstr "Датум почетка године" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60817,7 +60849,7 @@ msgstr "Такође можете копирати и залепити овај msgid "You can also set default CWIP account in Company {}" msgstr "Такође можете поставити подразумевани рачун за грађевинске радове у току у компанији {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60971,6 +61003,10 @@ msgstr "Немате дозволу да креирате адресу комп msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "Немате дозволу да ажурирате податке о компанији. Молимо Вас да се обратите систем менаџеру." +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "Немате дозволу да ажурирате овај документ. Молимо Вас да се обратите систем менаџеру." @@ -60999,7 +61035,7 @@ msgstr "Омогућили сте {0} и {1} у {2}. Ово може довес msgid "You have entered a duplicate Delivery Note on Row" msgstr "Унели сте дуплу отпремницу у реду" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -61007,7 +61043,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "Морате омогућити аутоматско поновно наручивање у подешавањима залиха да бисте одржали нивое поновног наручивања." @@ -61078,8 +61114,11 @@ msgstr "Нулта стопа" msgid "Zero quantity" msgstr "Нулта количина" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61191,7 +61230,7 @@ msgstr "exchangerate.host" msgid "fieldname" msgstr "назив поља" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61409,6 +61448,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "јединствено, нпр. SAVE20 Користи за за остваривање попуста" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "одступање" @@ -61467,7 +61510,8 @@ msgstr "{0} купона искоришћено за {1}. Дозвољена к msgid "{0} Digest" msgstr "{0} Извештај" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61487,7 +61531,7 @@ msgstr "{0} операције: {1}" msgid "{0} Request for {1}" msgstr "{0} захтев за {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} задржавање узорка се заснива на шаржи, молимо Вас да проверите да ли ставка има број шарже како бисте задржали узорак" @@ -61600,7 +61644,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} унет два пута у ставке пореза" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "{0} унет два пута {1} у ставке пореза" @@ -61768,7 +61812,7 @@ msgstr "Параметар {0} је неважећи" msgid "{0} payment entries can not be filtered by {1}" msgstr "Уноси плаћања {0} не могу се филтрирати према {1}" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "Количина {0} за ставку {1} се прима у складиште {2} са капацитетом {3}." @@ -61781,7 +61825,7 @@ msgstr "{0} до {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "{0} јединица је резервисано за ставку {1} у складишту {2}, молимо Вас да поништите резервисање у {3} да ускладите залихе." @@ -61983,7 +62027,7 @@ msgstr "{0} {1}: рачун {2} је неактиван" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: рачуноводствени унос {2} може бити направљен само у валути: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: трошковни центар је обавезан за ставку {2}" @@ -62069,23 +62113,23 @@ msgstr "{0}: {1} не постоји" msgid "{0}: {1} is a group account." msgstr "{0}: {1} је групни рачун." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} мора бити мање од {2}" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "{count} имовине креиране за {item_code}" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} је отказано или затворено." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "Величина узорка за {item_name} ({sample_size}) не може бити већа од прихваћене количине ({accepted_quantity})" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "{ref_doctype} {ref_name} је {status}." diff --git a/erpnext/locale/sr_CS.po b/erpnext/locale/sr_CS.po index 3cf96ff1fe0..96cbe74b070 100644 --- a/erpnext/locale/sr_CS.po +++ b/erpnext/locale/sr_CS.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:22\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:22\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Serbian (Latin)\n" "MIME-Version: 1.0\n" @@ -100,15 +100,15 @@ msgstr " Podsklop" msgid " Summary" msgstr " Rezime" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"Stavka obezbeđena od strane kupca\" ne može biti i stavka za nabavku" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"Stavka obezbeđena od strane kupca\" ne može imati stopu vrednovanja" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "\"Da li je osnovno sredstvo\" mora biti označeno, jer postoji zapis o imovini za ovu stavku" @@ -307,7 +307,7 @@ msgstr "'Datum početka' je obavezan" msgid "'From Date' must be after 'To Date'" msgstr "'Datum početka' mora biti manji od 'Datum završetka'" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "'Ima serijski broj' ne može biti 'Da' za stavke van zaliha" @@ -343,7 +343,7 @@ msgstr "'Ažuriraj zalihe' ne može biti označeno jer stavke nisu isporučene p msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "'Ažuriraj zalihe' ne može biti označeno za prodaju osnovnog sredstva" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "'{0}' račun je već korišćen od strane {1}. Koristi drugi račun." @@ -1104,7 +1104,7 @@ msgstr "Drajver mora biti podešen za podnošenje." msgid "A logical Warehouse against which stock entries are made." msgstr "Logičko skladište u koje se vrše unosi zaliha." -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "Došlo je do konflikta u seriji imenovanja prilikom kreiranja brojeva serija. Molimo Vas da promenite seriju imenovanja za stavku {0}." @@ -1316,7 +1316,7 @@ msgstr "Ključ za pristup je obavezan za pružaoca usluga: {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "U skladu sa CEFACT/ICG/2010/IC013 ili CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "U skladu sa sastavnicom {0}, stavka '{1}' nedostaje u unosu zaliha." @@ -1986,8 +1986,8 @@ msgstr "Računovodstveni unosi" msgid "Accounting Entry for Asset" msgstr "Računovodstveni unos za imovinu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "Računovodstveni unos za dokument troškova nabavke u unosu zaliha {0}" @@ -1995,7 +1995,7 @@ msgstr "Računovodstveni unos za dokument troškova nabavke u unosu zaliha {0}" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "Računovodstveni unos za dokument zavisnih troškova nabavke koji se odnosi na usklađivanje zaliha {0}" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Računovodstveni unos za uslugu" @@ -2008,16 +2008,16 @@ msgstr "Računovodstveni unos za uslugu" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Računovodstveni unos za zalihe" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "Računovodstveni unos za {0}" @@ -2315,12 +2315,6 @@ msgstr "Radnja ukoliko se ne podnese inspekcija kvaliteta" msgid "Action If Quality Inspection Is Rejected" msgstr "Radnja ukoliko je inspekcija kvaliteta odbijena" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "Radnja ukoliko ista cena nije održana" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "Radnja pokrenuta" @@ -2379,6 +2373,12 @@ msgstr "Radnja ukoliko je godišnji budžet premašen po kumulativnim troškovim msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "Radnja ukoliko ista stopa nije održana tokom interne transakcije" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2646,7 +2646,7 @@ msgstr "Stvarno vreme u satima (preko evidencije vremena)" msgid "Actual qty in stock" msgstr "Stvarna količina na skladištu" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "Stvarna vrsta poreza ne može biti uključena u cenu stavke u redu {0}" @@ -2660,7 +2660,7 @@ msgstr "Neplanirana količina" msgid "Add / Edit Prices" msgstr "Dodaj / Izmeni cene" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "Dodaj kolone u valuti transakcije" @@ -2814,7 +2814,7 @@ msgstr "Dodaj broj serije / šarže" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "Dodaj broj serije / šarže (Odbijena količina)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -3059,7 +3059,7 @@ msgstr "Visina dodatnog popusta" msgid "Additional Discount Amount (Company Currency)" msgstr "Visina dodatnog popusta (valuta kompanije)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "Dodatni iznos popusta ({discount_amount}) ne može premašiti ukupan iznos pre takvog popusta ({total_before_discount})" @@ -3348,7 +3348,7 @@ msgstr "Koriguj količinu" msgid "Adjustment Against" msgstr "Prilagođavanje prema" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "Prilagođavanje na osnovu cene iz ulazne fakture" @@ -3461,7 +3461,7 @@ msgstr "Vrsta dokumenta za avans" msgid "Advance amount" msgstr "Iznos avansa" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Iznos avansa ne može biti veći od {0} {1}" @@ -3530,7 +3530,7 @@ msgstr "Protiv" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Protiv računa" @@ -3648,7 +3648,7 @@ msgstr "Protiv fakture dobavljača {0}" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "Protiv dokumenta" @@ -3672,7 +3672,7 @@ msgstr "Protiv broja dokumenta" #: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "Protiv vrste dokumenta" @@ -3953,7 +3953,7 @@ msgstr "Sve komunikacije uključujući i one iznad biće premeštene kao novi pr msgid "All items are already requested" msgstr "Sve stavke su već zahtevane" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "Sve stavke su već fakturisane/vraćene" @@ -3961,7 +3961,7 @@ msgstr "Sve stavke su već fakturisane/vraćene" msgid "All items have already been received" msgstr "Sve stavke su već primljene" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Sve stavke su već prebačene za ovaj radni nalog." @@ -4010,7 +4010,7 @@ msgstr "Raspodeli" msgid "Allocate Advances Automatically (FIFO)" msgstr "Automatski raspodeli avanse (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Raspodeli iznose plaćanja" @@ -4020,7 +4020,7 @@ msgstr "Raspodeli iznose plaćanja" msgid "Allocate Payment Based On Payment Terms" msgstr "Raspodeli plaćanje na osnovu uslova plaćanja" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "Raspodeli zahtev za naplatu" @@ -4050,7 +4050,7 @@ msgstr "Raspoređeno" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4171,15 +4171,15 @@ msgstr "Dozvoli u povraćajima" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "Dozvoli interne transfere po tržišnim cenama" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "Dozvoli dodavanje stavki više puta u transakciji" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "Dozvoli dodeljivanje stavki više puta u transakciji" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4208,12 +4208,6 @@ msgstr "Dozvoli negativno stanje zaliha" msgid "Allow Negative Stock for Batch" msgstr "Dozvoli negativno stanje zaliha za šaržu" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "Dozvoli negativne cene za stavke" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4426,8 +4420,11 @@ msgstr "Dozvoli fakture u različitim valutama za jedan račun " msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4519,7 +4516,7 @@ msgstr "Dozvoljene transakcije sa" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "Dozvoljene primarne uloge su 'Kupac' i 'Dobavljač'. Molimo Vas da izaberete samo jednu od ovih uloga." -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4716,7 +4713,7 @@ msgstr "Uvek pitaj" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4746,7 +4743,6 @@ msgstr "Uvek pitaj" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4916,10 +4912,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "Iznos u valuti računa" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "Ukupno slovima" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5539,7 +5531,7 @@ msgstr "Pošto je polje {0} omogućeno, polje {1} je obavezno." msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "Pošto je polje {0} omogućeno, vrednost polja {1} treba da bude veća od 1." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "Pošto već postoje podnete transakcije za stavku {0}, ne možete promeniti vrednost za {1}." @@ -5689,7 +5681,7 @@ msgstr "Račun kategorije imovine" msgid "Asset Category Name" msgstr "Naziv kategorije imovine" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "Kategorija imovine je obavezna za osnovno sredstvo" @@ -6085,7 +6077,7 @@ msgstr "Imovina {0} nije podneta. Molimo Vas da podnesete imovinu pre nastavka." msgid "Asset {0} must be submitted" msgstr "Imovina {0} mora biti podneta" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "Imovina {assets_link} je kreirana za {item_code}" @@ -6123,11 +6115,11 @@ msgstr "Imovina" msgid "Assets Setup" msgstr "Postavke imovine" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "Imovina nije kreirana za {item_code}. Moraćete da kreirate imovinu ručno." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "Imovina {assets_link} je kreirana za {item_code}" @@ -6200,7 +6192,7 @@ msgstr "Najmanje jedna sirovina mora biti prisutna u unosu zaliha za vrstu {0}" msgid "At least one row is required for a financial report template" msgstr "Potreban je najmanje jedan red u šablonu finansijskog izveštaja" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "Mora biti odabrano barem jedno skladište" @@ -6232,7 +6224,7 @@ msgstr "U redu {0}: Količina je obavezna za šaržu {1}" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "U redu {0}: Broj serije je obavezan za stavku {1}" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "U redu {0}: Paket serije i šarže {1} je već kreiran. Molimo Vas da uklonite vrednosti iz polja za paket." @@ -6296,7 +6288,11 @@ msgstr "Naziv atributa" msgid "Attribute Value" msgstr "Vrednost atributa" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "Tabela atributa je obavezna" @@ -6304,11 +6300,19 @@ msgstr "Tabela atributa je obavezna" msgid "Attribute value: {0} must appear only once" msgstr "Vrednost atributa: {0} mora se pojaviti samo jednom" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "Atribut {0} je više puta izabran u tabeli atributa" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Atributi" @@ -6368,24 +6372,12 @@ msgstr "Vrednost ovlašćenja" msgid "Auto Create Exchange Rate Revaluation" msgstr "Automatski kreiraj revalorizaciju deviznog kursa" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "Automatski kreiraj prijemnicu nabavke" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "Automatski kreiraj paket serije i šarže za izlaz" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "Automatski kreiraj nalog za podugovaranje" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6504,6 +6496,18 @@ msgstr "Greška prilikom automatskog kreiranja korisnika" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "Automatska zatvaranje prilike nakon dogovora, prema broju dana navedenom iznad" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6721,7 +6725,7 @@ msgstr "Datum dostupnosti za upotrebu" msgid "Available for use date is required" msgstr "Potreban je datum dostupnosti za upotrebu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "Dostupna količina je {0}, potrebno vam je {1}" @@ -6820,7 +6824,7 @@ msgstr "BFS" msgid "BIN Qty" msgstr "Količina u zapisu o stanju stavki" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7093,7 +7097,7 @@ msgstr "Stavka sastavnice na veb-sajtu" msgid "BOM Website Operation" msgstr "Operacija sastavnice na veb-sajtu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "Sastavnica i količina gotovog proizvoda su obavezni za rastavljanje" @@ -7184,8 +7188,8 @@ msgstr "Backflush sirovina iz skladišta (rad u toku)" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "Backflush sirovina za podugovaranje na osnovu" +msgid "Backflush raw materials of subcontract based on" +msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7205,7 +7209,7 @@ msgstr "Stanje" msgid "Balance (Dr - Cr)" msgstr "Stanje (D - P)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Stanje ({0})" @@ -7736,11 +7740,11 @@ msgstr "Bankarstvo" msgid "Barcode Type" msgstr "Vrsta bar-koda" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "Bar-kod {0} se već koristi u stavci {1}" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "Bar-kod {0} nije validan {1} kod" @@ -8107,12 +8111,12 @@ msgstr "Šarža {0} i skladište" msgid "Batch {0} is not available in warehouse {1}" msgstr "Šarža {0} nije dostupna u skladištu {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "Šarža {0} za stavku {1} je istekla." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "Šarža {0} za stavku {1} je onemogućena." @@ -8185,8 +8189,8 @@ msgstr "Broj računa" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "Račun za odbijenu količinu u ulaznoj fakturi" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8526,8 +8530,11 @@ msgstr "Stavka okvirne narudžbine" msgid "Blanket Order Rate" msgstr "Cena okvirne narudžbine" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -9042,7 +9049,7 @@ msgstr "Nabavka i prodaja" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "Nabavka mora biti označena ako je Primenljivo za izabrano kao {0}" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "Podrazumevano, naziv dobavljača postavlja se prema unesenom nazivu dobavljača. Ako želite da dobavljači budu imenovani prema Seriji imenovanja izaberite opciju 'Serija imenovanja'." @@ -9407,7 +9414,7 @@ msgstr "Ne može se filtrirati prema broju dokumenta, ukoliko je grupisano po do msgid "Can only make payment against unbilled {0}" msgstr "Može se izvršiti plaćanje samo za neizmirene {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9463,9 +9470,9 @@ msgstr "Nije moguće promeniti podešavanje računa inventara" msgid "Cannot Create Return" msgstr "Nije moguće kreirati povraćaj" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "Nije moguće spojiti" @@ -9493,7 +9500,7 @@ msgstr "Ne može se izmeniti {0} {1}, molimo Vas da umesto toga kreirate novi." msgid "Cannot apply TDS against multiple parties in one entry" msgstr "Ne može se primeniti porez odbijen na izvoru protiv više stranaka u jednom unosu" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "Ne može biti osnovno sredstvo jer je kreirana knjiga zaliha." @@ -9529,7 +9536,7 @@ msgstr "Nije moguće otkazati ovaj unos zaliha u proizvodnji jer količina proiz msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "Nije moguće otkazati ovaj dokument jer je povezan sa podnetom korekcijom vrednosti imovine {0}. Molimo Vas da prvo otkažete korekciju vrednosti imovine kako biste nastavili." -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "Ne može se otkazati ovaj dokument jer je povezan sa podnetom imovinom {asset_link}. Molimo Vas da je otkažete da biste nastavili." @@ -9537,7 +9544,7 @@ msgstr "Ne može se otkazati ovaj dokument jer je povezan sa podnetom imovinom { msgid "Cannot cancel transaction for Completed Work Order." msgstr "Ne može se otkazati transakcija za završeni radni nalog." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "Nije moguće menjanje atributa nakon transakcije sa zalihama. Kreirajte novu stavku i prenesite zalihe" @@ -9549,7 +9556,7 @@ msgstr "Ne može se promeniti vrsta referentnog dokumenta." msgid "Cannot change Service Stop Date for item in row {0}" msgstr "Ne može se promeniti datum zaustavljanja usluge za stavku u redu {0}" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "Nije moguće promeniti svojstva varijante nakon transakcije za zalihama. Morate kreirati novu stavku da biste to uradili." @@ -9577,11 +9584,11 @@ msgstr "Ne može se konvertovati u grupu jer je izabrana vrsta računa." msgid "Cannot covert to Group because Account Type is selected." msgstr "Ne može se skloniti u grupu jer je izabrana vrsta računa." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "Ne mogu se kreirati unosi za rezervaciju zaliha za prijemnicu nabavke sa budućim datumom." -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "Ne može se kreirati lista za odabir za prodajnu porudžbinu {0} jer ima rezervisane zalihe. Poništite rezervisanje zaliha da biste kreirali listu." @@ -9607,7 +9614,7 @@ msgstr "Ne može se proglasiti kao izgubljeno jer je izdata ponuda." msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "Ne može se odbiti kada je kategorija za 'Vrednovanje' ili 'Vrednovanje i ukupno'" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "Ne može se obrisati red prihoda/rashoda kursnih razlika" @@ -9644,7 +9651,7 @@ msgstr "Nije moguće onemogućiti {0} jer to može dovesti do netačnog vrednova msgid "Cannot disassemble more than produced quantity." msgstr "Nije moguće demontirati više od proizvedene količine." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "Nije moguće demontirati količinu {0} iz unosa zaliha {1}. Dostupno je samo {2} za demontažu." @@ -9652,8 +9659,8 @@ msgstr "Nije moguće demontirati količinu {0} iz unosa zaliha {1}. Dostupno je msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "Nije moguće omogućiti račun inventara po stavkama jer postoje unosi u knjigu zaliha za kompaniju {0} koji koriste račun inventara po skladištima. Molimo Vas da najpre otkažete transakcije zaliha i pokušate ponovo." -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "Ne može se obezbediti isporuka po broju serije jer je stavka {0} dodata sa i bez obezbeđenja isporuke po broju serije." @@ -9697,7 +9704,7 @@ msgstr "Ne može se primiti od kupca protiv negativnih neizmirenih obaveza" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "Nije moguće smanjiti količinu ispod poručene ili nabavljene količine" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9715,8 +9722,8 @@ msgstr "Nije moguće preuzeti token za povezivanje. Proverite evidenciju grešak msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "Nije moguće izabrati vrstu grupe kao grupa kupaca. Molimo Vas da izaberete grupu kupaca kojа nije grupne vrste." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9732,7 +9739,7 @@ msgstr "Ne može se postaviti kao izgubljeno jer je napravljena prodajna porudž msgid "Cannot set authorization on basis of Discount for {0}" msgstr "Ne može se postaviti autorizacija na osnovu popusta za {0}" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "Ne može se postaviti više podrazumevanih stavki za jednu kompaniju." @@ -10643,7 +10650,7 @@ msgstr "Zatvaranje (Potražuje)" msgid "Closing (Dr)" msgstr "Zatvaranje (Duguje)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "Zatvaranje (Početno + Ukupno)" @@ -11104,7 +11111,7 @@ msgstr "Kompanije" #: 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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11386,7 +11393,7 @@ msgstr "Kompanija" msgid "Company Abbreviation" msgstr "Skraćenica kompanije" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11399,7 +11406,7 @@ msgstr "Skraćenica kompanije ne može da ima više od 5 karaktera" msgid "Company Account" msgstr "Tekući račun kompanije" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "Računa kompanije je obavezan" @@ -11575,7 +11582,7 @@ msgstr "Filter kompanije nije postavljen!" msgid "Company is mandatory" msgstr "Kompanija je obavezna" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "Kompanija je obavezna za račun kompanije" @@ -11846,7 +11853,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11859,7 +11866,9 @@ msgstr "Podesi kontni okvir" msgid "Configure Product Assembly" msgstr "Konfigurišite montažu proizvoda" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11877,13 +11886,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "Konfigurišite radnju za zaustavljanje transakcija ili postavite samo upozorenje ukoliko ista stopa nije održana." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "Konfigurišite podrazumevani cenovnik pri kreiranju nove nabavne transakcije. Cene stavki će biti preuzete iz ove cenovne liste." @@ -12061,7 +12070,7 @@ msgstr "" msgid "Consumed" msgstr "Utrošeno" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "Utrošeni iznos" @@ -12105,7 +12114,7 @@ msgstr "Trošak utrošenih stavki" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12278,10 +12287,6 @@ msgstr "Osoba za kontakt ne pripada {0}" msgid "Contact:" msgstr "Kontakt:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Kontakt: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12459,7 +12464,7 @@ msgstr "Faktor konverzije" msgid "Conversion Rate" msgstr "Stopa konverzije" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "Faktor konverzije za podrazumevanu jedinicu mere mora biti 1 u redu {0}" @@ -12731,7 +12736,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12826,7 +12831,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "Troškovni centar je obavezan u redu {0} u tabeli poreza za vrstu {1}" @@ -13164,7 +13169,7 @@ msgstr "Kreiraj gotove proizvode" msgid "Create Grouped Asset" msgstr "Kreiraj grupisanu imovinu" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "Kreiraj međukompanijski nalog knjiženja" @@ -13537,7 +13542,7 @@ msgstr "Kreiraj {0} {1} ?" msgid "Created By Migration" msgstr "Kreirano putem migracije" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "Kreirano {0} tablica za ocenjivanje za {1} između:" @@ -13680,15 +13685,15 @@ msgstr "Kreiranje {0} delimično uspešno.\n" msgid "Credit" msgstr "Potražuje" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "Potražuje (Transakcija)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "Potražuje ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "Račun potraživanja" @@ -13883,7 +13888,7 @@ msgstr "Koeficijent obrta dobavljača" msgid "Creditors" msgstr "Poverioci" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14181,7 +14186,7 @@ msgstr "Trenutni paket serije/šarže" msgid "Current Serial No" msgstr "Trenutni broj serije" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14382,7 +14387,7 @@ msgstr "Prilagođeno razdvajanje" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15155,7 +15160,7 @@ msgstr "Datumi za obradu" msgid "Day Of Week" msgstr "Dan u nedelji" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15271,11 +15276,11 @@ msgstr "Trgovac" msgid "Debit" msgstr "Duguje" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "Duguje (Transakcija)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "Duguje ({0})" @@ -15285,7 +15290,7 @@ msgstr "Duguje ({0})" msgid "Debit / Credit Note Posting Date" msgstr "Datum knjiženja dokumenta o povećanju / smanjenju" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "Račun dugovanja" @@ -15396,7 +15401,7 @@ msgstr "Duguje-Potražuje nisu u ravnoteži" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15538,7 +15543,7 @@ msgstr "Podrazumevani opseg starosti" msgid "Default BOM" msgstr "Podrazumevana sastavnica" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "Podrazumevana sastavnica ({0}) mora biti aktivna za ovu stavku ili njen šablon" @@ -15895,15 +15900,15 @@ msgstr "Podrazumevana teritorija" msgid "Default Unit of Measure" msgstr "Podrazumevana jedinica mere" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "Podrazumevana jedinica mere za stavku {0} ne može se direktno promeniti jer je transakcija već izvršena sa drugom jedinicom mere. Potrebno je otkazati povezana dokumenta ili kreiranje nove stavke." -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "Podrazumevana jedinica mere za stavku {0} ne može se direktno promeniti jer je već izvršena transakcija sa drugom jedinicom mere. Neophodno je kreiranje nove stavke u cilju korišćenja podrazumevane jedinice mere." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "Podrazumevana jedinica mere za varijantu '{0}' mora biti ista kao u šablonu '{1}'" @@ -16204,7 +16209,7 @@ msgstr "" msgid "Delivered" msgstr "Isporučeno" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Isporučeni iznos" @@ -16254,8 +16259,8 @@ msgstr "Isporučene stavke koje treba fakturisati" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16266,11 +16271,11 @@ msgstr "Isporučena količina" msgid "Delivered Qty (in Stock UOM)" msgstr "Isporučena količina (u jedinici mere zaliha)" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16359,7 +16364,7 @@ msgstr "Menadžer isporuke" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16884,7 +16889,7 @@ msgstr "Račun razlike u tabeli stavki" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "Račun razlike mora biti račun imovine ili obaveza (privremeno početno stanje), jer je ovaj unos zaliha unos otvaranja početnog stanja" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "Račun razlike mora biti račun imovine ili obaveza, jer ovo usklađivanje zaliha predstavlja unos početnog stanja" @@ -17048,11 +17053,9 @@ msgstr "Onemogući kumulativni prag" msgid "Disable In Words" msgstr "Onemogući slovnu oznaku" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "Onemogući cenu iz poslednje nabavke" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17093,6 +17096,12 @@ msgstr "Onemogući broj serije i selektor šarže" msgid "Disable Transaction Threshold" msgstr "Onemogući prag po transakciji" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17149,7 +17158,7 @@ msgstr "Demontirati" msgid "Disassemble Order" msgstr "Nalog za demontažu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "Demontirana količina ne može biti manja ili jednaka 0." @@ -17674,6 +17683,12 @@ msgstr "Ne koristi vrednovanje po šaržama" msgid "Do Not Use Batchwise Valuation" msgstr "Ne koristi vrednovanje po šaržama" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17764,9 +17779,12 @@ msgstr "Pretraga dokumenata" msgid "Document Count" msgstr "Broj dokumenata" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17784,6 +17802,10 @@ msgstr "Vrsta dokumenta " msgid "Document Type already used as a dimension" msgstr "Vrsta dokumenta je već korišćena kao dimenzija" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "Dokumentacija" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18088,7 +18110,7 @@ msgstr "Duplikat projekta sa zadacima" msgid "Duplicate Sales Invoices found" msgstr "Pronađeni su duplikati izlazne fakture" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "Greška duplikata broja serije" @@ -18208,8 +18230,8 @@ msgstr "ERPNext ID korisnika" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18432,7 +18454,7 @@ msgstr "Imejl potvrda" msgid "Email Sent to Supplier {0}" msgstr "Imejl poslat dobavljaču {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "Imejl je obavezan za kreiranje korisnika" @@ -18622,7 +18644,7 @@ msgstr "Korisnički ID zaposlenog lica" msgid "Employee cannot report to himself." msgstr "Zaposleno lice ne može izveštavati samog sebe." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "Zaposleno lice je obavezno" @@ -18630,7 +18652,7 @@ msgstr "Zaposleno lice je obavezno" msgid "Employee is required while issuing Asset {0}" msgstr "Zaposleno lice je obavezno pri izdavanju imovine {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "Zaposleno lice {0} već ima povezanog korisnika" @@ -18643,7 +18665,7 @@ msgstr "Zaposleno lice {0} ne pripada kompaniji {1}" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "Zaposleno lice {0} trenutno radi na drugoj radnoj stanici. Molimo Vas da dodelite drugo zaposleno lice." -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "Zaposleno lice {0} nije pronađeno" @@ -18686,7 +18708,7 @@ msgstr "Omogućite zakazivanje termina" msgid "Enable Auto Email" msgstr "Omogućite automatski imejl" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "Omogućite automatsko ponovno naručivanje" @@ -19287,7 +19309,7 @@ msgstr "Greška: Ova imovina već ima {0} evidentiranih perioda amortizacije.\n" "\t\t\t\t\t Datum 'početka amortizacije' mora biti najmanje {1} perioda nakon datuma 'dostupno za korišćenje'.\n" "\t\t\t\t\t Molimo Vas da ispravite datum u skladu sa tim." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "Greška: {0} je obavezno polje" @@ -19333,7 +19355,7 @@ msgstr "Franko fabrika" msgid "Example URL" msgstr "Primer URL-a" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "Primer povezanog dokumenta: {0}" @@ -19363,7 +19385,7 @@ msgstr "Primer: Broj serije {0} je rezervisan u {1}." msgid "Exception Budget Approver Role" msgstr "Uloga za odobravanje izuzetaka budžeta" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "Prekomerna demontaža" @@ -19722,7 +19744,7 @@ msgstr "Očekivana vrednost nakon korisnog veka" msgid "Expense" msgstr "Trošak" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "Račun rashoda / razlike ({0}) mora biti račun vrste 'Dobitak ili gubitak'" @@ -19770,7 +19792,7 @@ msgstr "Račun rashoda / razlike ({0}) mora biti račun vrste 'Dobitak ili gubit msgid "Expense Account" msgstr "Račun rashoda" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "Nedostaje račun rashoda" @@ -20233,7 +20255,7 @@ msgstr "Filter za stavke sa količinom nula" msgid "Filter by Reference Date" msgstr "Filter po datumu reference" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20563,7 +20585,7 @@ msgstr "Skaldište gotovih proizvoda" msgid "Finished Goods based Operating Cost" msgstr "Operativni trošak zasnovan na gotovim proizvodima" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "Gotov proizvod {0} ne odgovara radnom nalogu {1}" @@ -20658,7 +20680,7 @@ msgstr "Fiskalni režim je obavezan, molimo Vas da postavite fiskalni režim u k msgid "Fiscal Year" msgstr "Fiskalna godina" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20722,7 +20744,7 @@ msgstr "Račun osnovnih sredstava" msgid "Fixed Asset Defaults" msgstr "Zadati podaci za osnovna sredstva" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "Osnovno sredstvo mora biti stavka van zaliha." @@ -20872,7 +20894,7 @@ msgstr "Za kompaniju" msgid "For Item" msgstr "Za stavku" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "Za stavku {0} količina ne može biti primljena u većoj količini od {1} u odnosu na {2} {3}" @@ -20903,7 +20925,7 @@ msgstr "Za cenovnik" msgid "For Production" msgstr "Za proizvodnju" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "Za količinu (proizvedena količina) je obavezna" @@ -20987,6 +21009,12 @@ msgstr "Za stavku {0}, je kreirano ili povezano samo {1} imovine u msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "Za stavku {0}, cena mora biti pozitivan broj. Da biste omogućili negativne cene, omogućite {1} u {2}" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "Za operaciju {0} u redu {1}, molimo Vas da dodate sirovine ili dodelite sastavnicu." @@ -21008,7 +21036,7 @@ msgstr "Za projekat - {0}, ažurirajte svoj status" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "Za projektovane i prognozirane količine, sistem će uzeti u obzir sva zavisna skladišta pod izabranim matičnim skladištem." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "Količina {0} ne bi smela biti veća od dozvoljene količine {1}" @@ -21017,7 +21045,7 @@ msgstr "Količina {0} ne bi smela biti veća od dozvoljene količine {1}" msgid "For reference" msgstr "Za referencu" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "Za red {0} u {1}. Da biste uključili {2} u cenu stavke, redovi {3} takođe moraju biti uključeni" @@ -21041,7 +21069,7 @@ msgstr "Za polje 'Primeni pravilo na ostale' {0} je obavezno" msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "Radi pogodnosti kupaca, ove šifre mogu se koristiti u formatima za štampanje kao što su fakture i otpremnice" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "Za stavku {0}, utrošena količina treba da bude {1} prema sastavnici {2}." @@ -21050,7 +21078,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 "Da bi novi {0} stupio na snagu, želite li da obrišete trenutni {1}?" -#: erpnext/controllers/stock_controller.py:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "Za stavku {0}, nema dostupnog skladišta za povraćaj u skladište {1}." @@ -21663,7 +21691,7 @@ msgstr "G - D" msgid "GENERAL LEDGER" msgstr "GLAVNA KNJIGA" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21675,7 +21703,7 @@ msgstr "Stanje glavne knjige" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "Unos u glavnu knjigu" @@ -22190,7 +22218,7 @@ msgstr "Roba na putu" msgid "Goods Transferred" msgstr "Roba premeštena" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "Roba je već primljena na osnovu izlaznog unosa {0}" @@ -22373,7 +22401,7 @@ msgstr "Ukupan iznos mora odgovarati zbiru referenci plaćanja" msgid "Grant Commission" msgstr "Odobri komision" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "Veći od iznosa" @@ -23014,11 +23042,11 @@ msgstr "Koliko često?" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" -msgstr "Koliko često treba ažurirati projekat u vezi sa ukupnim troškom nabavke?" +msgid "How often should project be updated of Total Purchase Cost ?" +msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling #. Settings' @@ -23173,7 +23201,7 @@ msgstr "Ukoliko je operacija podeljena na podoperacije, one se mogu dodavati ovd msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "Ukoliko je prazno, koristiće se račun matičnog skladišta ili podrazumevani račun kompanije u transakcijama" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23358,7 +23386,7 @@ msgstr "Ukoliko je omogućeno, sistem će dozvoliti odabir jedinica mere u proda msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "Ukoliko je omogućeno, sistem će dozvoliti korisnicima da uređuju sirovine i njihove količine u radnom nalogu. Sistem neće resetovati količine prema sastavnici, ukoliko ih je korisnik izmenio." -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23530,11 +23558,11 @@ msgstr "Ukoliko ovo nije poželjno, otkažite odgovarajući unos uplate." msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "Ukoliko ova stavka ima varijante, ne može biti izabrana u prodajnim porudžbinama itd." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "Ukoliko je ova opcija postavljena na 'Da', ERPNext neće dozvoliti kreiranje ulazne fakture bez prethodnog kreiranja nabavne porudžbine. Ova konfiguracija se može zaobići omogućavanjem opcije 'Dozvoli kreiranje ulazne fakture bez nabavne porudžbine' u šifarniku dobavljača." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "Ukoliko je ova opcija postavljena na 'Da', ERPNext neće dozvoliti ulazne fakture bez prethodnog kreiranja prijemnica nabavke. Ova konfiguracija se može zaobići omogućavanjem opcije 'Dozvoli kreiranje ulazne fakture bez prijemnice nabavke' u šifarniku dobavljača." @@ -23650,7 +23678,7 @@ msgstr "Ignoriši prazne zalihe" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "Ignoriši revalorizaciju deviznog kursa i dnevnike prihoda/rashoda" @@ -23702,7 +23730,7 @@ msgstr "Pravilo o cenama je omogućeno. Nije moguće primeniti šifru kupona." #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "Ignoriši dugovne/potražne beleške generisane od strane sistema" @@ -23745,7 +23773,7 @@ msgstr "Ignoriši preklapanje vremena na radnim stanicama" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "Ignoriši polje za otvaranje stanja u unosu u glavnu knjigu koje omogućava dodavanje početnog stanja nakon što je sistem u upotrebi prilikom generisanja izveštaja" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "Slika u opisu je uklonjena. Da biste onemogućili ovo ponašanje, uklonite oznaku sa opcije \"{0}\" u {1}." @@ -23759,6 +23787,7 @@ msgid "Implementation Partner" msgstr "Partner za implementaciju" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24112,7 +24141,7 @@ msgstr "Uključi podrazumevanu imovinu u finansijskim evidencijama" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24366,7 +24395,7 @@ msgstr "Pogrešan saldo količine nakon transakcije" msgid "Incorrect Batch Consumed" msgstr "Utrošena netačna šarža" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "Netačno skladište za ponovno naručivanje" @@ -24374,7 +24403,7 @@ msgstr "Netačno skladište za ponovno naručivanje" msgid "Incorrect Company" msgstr "Netačna kompanija" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "Netačna količina komponenti" @@ -24584,14 +24613,14 @@ msgstr "Inicirano" msgid "Inspected By" msgstr "Inspekciju izvršio" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "Inspekcija odbijena" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "Inspekcija je potrebna" @@ -24608,7 +24637,7 @@ msgstr "Inspekcija je potrebna pre isporuke" msgid "Inspection Required before Purchase" msgstr "Inspekcija je potrebna pre nabavke" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "Podnošenje inspekcije" @@ -24690,8 +24719,8 @@ msgstr "Nedovoljne dozvole" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "Nedovoljno zaliha" @@ -24911,7 +24940,7 @@ msgstr "Interni transferi" msgid "Internal Work History" msgstr "Interna radna istorija" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "Interni transferi mogu se obaviti samo u osnovnoj valuti kompanije" @@ -25004,7 +25033,7 @@ msgstr "Nevažeći datum isporuke" msgid "Invalid Discount" msgstr "Nevažeći popust" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "Nevažeći iznos popusta" @@ -25034,7 +25063,7 @@ msgstr "Nevažeće grupisanje po" msgid "Invalid Item" msgstr "Nevažeća stavka" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "Nevažeći podrazumevani podaci za stavku" @@ -25120,12 +25149,12 @@ msgstr "Nevažeći raspored" msgid "Invalid Selling Price" msgstr "Nevažeća prodajna cena" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "Nevažeći broj paketa serije i šarže" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "Nevažeće izvorno i ciljno skladište" @@ -25162,7 +25191,7 @@ msgstr "Nevažeća formula filtera. Molimo Vas da proverite sintaksu." msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "Nevažeći razlog gubitka {0}, molimo kreirajte nov razlog gubitka" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Nevažeća serija imenovanja (. nedostaje) za {0}" @@ -25291,7 +25320,6 @@ msgstr "Otkazivanje fakture" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "Datum izdavanja" @@ -25312,10 +25340,6 @@ msgstr "Greška pri izboru vrste dokumenta fakture" msgid "Invoice Grand Total" msgstr "Ukupan zbir fakture" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "Faktura ID" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25837,13 +25861,13 @@ msgstr "Virtuelna stavka" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "Da li je potrebna nabavna porudžbina za kreiranje ulazne fakture i prijemnice nabavke?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "Da li je potrebna prijemnica nabavke za kreiranje ulazne fakture?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -26115,7 +26139,7 @@ msgstr "Upiti" msgid "Issuing Date" msgstr "Datum izdavanja" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "Može potrajati nekoliko sati da tačne vrednosti zaliha postanu vidljive nakon spajanja stavki." @@ -26185,7 +26209,7 @@ msgstr "Kurizvni tekst za međuzbirove ili napomene" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26232,6 +26256,7 @@ msgstr "Kurizvni tekst za međuzbirove ili napomene" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26247,7 +26272,6 @@ msgstr "Kurizvni tekst za međuzbirove ili napomene" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -27011,6 +27035,7 @@ msgstr "Proizvođač stavke" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -27021,7 +27046,6 @@ msgstr "Proizvođač stavke" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27281,11 +27305,11 @@ msgstr "Podešavanja varijante stavke" msgid "Item Variant {0} already exists with same attributes" msgstr "Varijanta stavke {0} već postoji sa istim atributima" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "Varijante stavke ažurirane" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "Ponovna obrada na osnovu skladišta stavki je omogućena." @@ -27324,6 +27348,15 @@ msgstr "Specifikacije stavki na veb-sajtu" msgid "Item Weight Details" msgstr "Detalji težine stavke" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27353,7 +27386,7 @@ msgstr "Poreski detalji po stavkama" msgid "Item Wise Tax Details" msgstr "Detalji poreza po stavkama" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "Detalji poreza po stavkama se ne poklapaju sa porezima i troškovima u sledećim redovima:" @@ -27373,11 +27406,11 @@ msgstr "Stavka i skladište" msgid "Item and Warranty Details" msgstr "Detalji stavke i garancije" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "Stavke za red {0} ne odgovaraju zahtevu za nabavku" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "Stavka ima varijante." @@ -27407,7 +27440,7 @@ msgstr "Stavka operacije" msgid "Item qty can not be updated as raw materials are already processed." msgstr "Količina stavki ne može biti ažurirana jer su sirovine već obrađene." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "Cena stavke je ažurirana na nulu jer je označena opcija 'Dozvoli nultu stopu vrednovanja' za stavku {0}" @@ -27426,10 +27459,14 @@ msgstr "Stopa vrednovanja stavke je preračunata uzimajući u obzir zavisne tro msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "Ponovna obrada vrednovanja stavke je u toku. Izveštaj može prikazati netačno vrednovanje stavke." -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "Varijanta stavke {0} postoji sa istim atributima" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "Stavka {0} je dodata više puta pod istom matičnom stavkom {1} u redovima {2} i {3}" @@ -27443,7 +27480,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "Stavka {0} ne može biti naručena u količini većoj od {1} prema okvirnom nalogu {2}." #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "Stavka {0} ne postoji" @@ -27451,7 +27488,7 @@ msgstr "Stavka {0} ne postoji" msgid "Item {0} does not exist in the system or has expired" msgstr "Stavka {0} ne postoji u sistemu ili je istekla" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "Stavka {0} ne postoji." @@ -27467,15 +27504,15 @@ msgstr "Stavka {0} je već vraćena" msgid "Item {0} has been disabled" msgstr "Stavka {0} je onemogućena" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "Stavka {0} nema broj serije. Samo stavke sa brojem serije mogu imati isporuku na osnovu serijskog broja" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "Stavka {0} je dostigla kraj svog životnog veka na dan {1}" @@ -27487,19 +27524,23 @@ msgstr "Stavka {0} je zanemarena jer nije stavka na zalihama" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "Stavka {0} je već rezervisana / isporučena prema prodajnoj porudžbini {1}." -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "Stavka {0} je otkazana" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "Stavka {0} je onemogućena" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "Stavka {0} nije serijalizovana stavka" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "Stavka {0} nije stavka na zalihama" @@ -27507,7 +27548,11 @@ msgstr "Stavka {0} nije stavka na zalihama" msgid "Item {0} is not a subcontracted item" msgstr "Stavka {0} nije stavka za podugovaranje" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "Stavka {0} nije aktivna ili je dostigla kraj životnog veka" @@ -27523,7 +27568,7 @@ msgstr "Stavka {0} mora biti stavka van zaliha" msgid "Item {0} must be a non-stock item" msgstr "Stavka {0} mora biti stavka van zaliha" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "Stavka {0} nije pronađena u tabeli 'Primljene sirovine' {1} {2}" @@ -27539,7 +27584,7 @@ msgstr "Stavka {0}: Naručena količina {1} ne može biti manja od minimalne kol msgid "Item {0}: {1} qty produced. " msgstr "Stavka {0}: Proizvedena količina {1}. " -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "Stavka {} ne postoji." @@ -27649,7 +27694,7 @@ msgstr "Stavke za zahtev za nabavku sirovina" msgid "Items not found." msgstr "Stavke nisu pronađene." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "Cena stavki je ažurirana na nulu jer je opcija dozvoli nultu stopu vrednovanja označena za sledeće stavke: {0}" @@ -28282,7 +28327,7 @@ msgstr "Poslednje skenirano skladište" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "Poslednja transakcija zaliha za stavku {0} u skladištu {1} je bila {2}." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28561,7 +28606,7 @@ msgstr "Legenda" msgid "Length (cm)" msgstr "Dužina (cm)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "Manje od iznosa" @@ -28702,7 +28747,7 @@ msgstr "Povezani računi" msgid "Linked Location" msgstr "Povezana lokacija" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "Povezano sa podnetim dokumentima" @@ -29097,11 +29142,6 @@ msgstr "Održavanje imovine" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "Održavaj istu stopu tokom interne transakcije" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "Održavati istu cenu tokom celog ciklusa nabavke" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29113,6 +29153,11 @@ msgstr "Održavaj stanje zaliha" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29309,7 +29354,7 @@ msgid "Major/Optional Subjects" msgstr "Obavezni/Izborni predmeti" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29478,8 +29523,8 @@ msgstr "Obavezni odeljak" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29538,8 +29583,8 @@ msgstr "Ručno unošenje ne može biti kreirano! Onemogućite automatski unos za #: 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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29688,7 +29733,7 @@ msgstr "Datum proizvodnje" msgid "Manufacturing Manager" msgstr "Menadžer proizvodnje" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "Količina proizvodnje je obavezna" @@ -29964,7 +30009,7 @@ msgstr "Potrošnja materijala" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "Potrošnja materijala za proizvodnju" @@ -30035,6 +30080,7 @@ msgstr "Prijemnica materijala" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30141,11 +30187,11 @@ msgstr "Planirana stavka zahteva za nabavku" msgid "Material Request Type" msgstr "Vrsta zahteva za nabavku" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "Zahtev za nabavku je već kreiran za naručenu količinu" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "Zahtev za nabavku nije kreiran, jer je količina sirovina već dostupna." @@ -30260,7 +30306,7 @@ msgstr "Materijal premešten za proizvodnju" msgid "Material Transferred for Manufacturing" msgstr "Materijal premešten za proizvodni proces" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30389,11 +30435,11 @@ msgstr "Maksimalni iznos plaćanja" msgid "Maximum Producible Items" msgstr "Maksimalna količina proizvodivih stavki" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "Maksimalni uzorci - {0} može biti zadržano za šaržu {1} i stavku {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "Maksimalni uzorci - {0} su već zadržani za šaržu {1} i stavku {2} u šarži {3}." @@ -30837,11 +30883,11 @@ msgstr "Razno" msgid "Miscellaneous Expenses" msgstr "Razni troškovi" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "Nepodudaranje" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "Nedostaje" @@ -30879,7 +30925,7 @@ msgstr "Nedostaju filteri" msgid "Missing Finance Book" msgstr "Nedostajuća finansijska evidencija" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "Nedostaje gotov proizvod" @@ -30887,11 +30933,11 @@ msgstr "Nedostaje gotov proizvod" msgid "Missing Formula" msgstr "Nedostaje formula" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "Nedostajuća stavka" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "Nedostajući parametar" @@ -30935,10 +30981,6 @@ msgstr "Nedostajuća vrednost" msgid "Mixed Conditions" msgstr "Pomešani uslovi" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "Mobilni: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31207,7 +31249,7 @@ msgstr "Dostupno je više polja kompanije: {0}. Molimo Vas da izaberete ručno." msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "Postoji više fiskalnih godina za datum {0}. Molimo postavite kompaniju u fiskalnu godinu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "Više stavki ne može biti označeno kao gotov proizvod" @@ -31286,27 +31328,20 @@ msgstr "Nazvano mesto" msgid "Naming Series Prefix" msgstr "Prefiks serije imenovanja" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "Serija imenovanja i podrazumevane cene" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "Serija imenovanja je obavezna" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31354,16 +31389,16 @@ msgstr "Analiza potrebna" msgid "Negative Batch Report" msgstr "Izveštaj o šaržama sa negativnim stanjem" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "Negativna količina nije dozvoljena" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "Greška zbog negativnog stanja zaliha" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "Negativna stopa vrednovanja nije dozvoljena" @@ -31977,7 +32012,7 @@ msgstr "Ne postoji profil maloprodaje. Molimo Vas da kreirate novi profil malopr #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "Bez dozvole" @@ -31990,7 +32025,7 @@ msgstr "Nijedna nabavna porudžbina nije kreirana" msgid "No Records for these settings." msgstr "Bez zapisa za ove postavke." -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "Nije izvršen izbor" @@ -32035,7 +32070,7 @@ msgstr "Nema neusklađenih uplata za ovu stranku" msgid "No Work Orders were created" msgstr "Nisu kreirani radni nalozi" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "Nema računovodstvenih unosa za sledeća skladišta" @@ -32048,7 +32083,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "Nema aktivne sastavnice za stavku {0}. Dostava po broju serije nije moguća" @@ -32060,7 +32095,7 @@ msgstr "Nema dostupnih dodatnih polja" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "Nema dostupne količine za rezervaciju stavke {0} u skladištu {1}" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -32068,7 +32103,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32162,7 +32197,7 @@ msgstr "Nema više zavisnih elemenata sa leve strane" msgid "No more children on Right" msgstr "Nema više zavisnih elemenata sa desne strane" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32337,7 +32372,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "Nema dostupnih zaliha za ovu šaržu." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "Unosi u knjigu zaliha nisu kreirani. Molimo Vas da pravilno podesite količinu ili stopu vrednovanja za stavke i da pokušate ponovo." @@ -32429,7 +32464,7 @@ msgstr "Nema nula" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "Nije moguće kreirati sastavnicu koja nije virtuelna za stavku van zaliha {0}." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "Nijedna od stavki nije imala promene u količini ili vrednosti." @@ -32533,7 +32568,7 @@ msgstr "Nije dozvoljeno jer {0} premašuje limite" msgid "Not authorized to edit frozen Account {0}" msgstr "Nije dozvoljeno izmeniti zaključani račun {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32579,7 +32614,7 @@ msgstr "Napomena: Unos uplate neće biti kreiran jer nije navedena 'Blagajna ili msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "Napomena: Ovaj troškovni centar je grupa. Nije moguće napraviti računovodstvene unose protiv grupa." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "Napomena: Da biste spojili stavke, kreirajte zasebno usklađivanje zaliha za stariju stavku {0}" @@ -33056,7 +33091,7 @@ msgstr "Prilikom primene isključene naknade, samo depozit ili povlačenje sreds msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "Samo jedna operacija može imati označeno 'Finalni gotov proizvod' kada je omogućeno 'Praćenje poluproizvoda'." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "Može se kreirati samo jedan {0} unos protiv radnog naloga {1}" @@ -33208,7 +33243,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "Početni saldo" @@ -33367,16 +33402,16 @@ msgstr "Početne izlazne fakture su kreirane." #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Početni lager" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33733,7 +33768,7 @@ msgstr "Opciono. Ovo podešavanje će se koristiti za filtriranje u raznim trans msgid "Optional. Used with Financial Report Template" msgstr "Opciono. Koristi se uz šablon finansijskog izveštaja" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33867,7 +33902,7 @@ msgstr "Naručena količina" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "Narudžbine" @@ -34075,7 +34110,7 @@ msgstr "Neizmireno (valuta kompanije)" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34133,7 +34168,7 @@ msgstr "Nalog za izdavanje" msgid "Over Billing Allowance (%)" msgstr "Dozvola za fakturisanje preko limita (%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "Dozvola za fakturisanje preko limita je premašena za stavku ulazne fakture {0} ({1}) za {2}%" @@ -34151,7 +34186,7 @@ msgstr "Dozvola za prekoračenje isporuke/prijema (%)" msgid "Over Picking Allowance" msgstr "Dozvola za preuzimanje viška" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "Prekoračenje prijema" @@ -34394,7 +34429,6 @@ msgstr "Polje u maloprodaji" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "Fiskalni račun" @@ -34665,7 +34699,7 @@ msgstr "Upakovana stavka" msgid "Packed Items" msgstr "Upakovane stavke" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "Upakovane stavke ne mogu biti deo internog prenosa" @@ -35113,7 +35147,7 @@ msgstr "Delimično primljeno" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35249,7 +35283,7 @@ msgstr "Milioniti deo" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35375,7 +35409,7 @@ msgstr "Nepodudaranje stranke" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35461,7 +35495,7 @@ msgstr "Specifična stavka stranke" #: 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:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35764,7 +35798,6 @@ msgstr "Unosi plaćanja {0} nisu povezani" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -36022,7 +36055,7 @@ msgstr "Reference plaćanja" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36101,10 +36134,6 @@ msgstr "Zahtev za naplatu na osnovu rasporeda plaćanja ne može biti kreiran je msgid "Payment Schedules" msgstr "Rasporedi plaćanja" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "Status naplate" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37124,7 +37153,7 @@ msgstr "Molimo Vas da postavite prioritet" msgid "Please Set Supplier Group in Buying Settings." msgstr "Molimo Vas da postavite grupu dobavljača u podešavanjima za nabavku." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "Molimo Vas da navedete račun" @@ -37156,11 +37185,11 @@ msgstr "Molimo Vas da dodate privremeni račun za otvaranje početnog stanja u k msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "Molimo Vas da dodate barem jedan broj serije / šarže" @@ -37180,7 +37209,7 @@ msgstr "Molimo Vas da dodate račun za osnovni nivo kompanije - {}" msgid "Please add {1} role to user {0}." msgstr "Molimo Vas da dodate ulogu {1} korisniku {0}." -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "Molimo Vas da prilagodite količinu ili izmenite {0} za nastavak." @@ -37287,7 +37316,7 @@ msgstr "Molimo Vas da kreirate nabavku iz interne prodaje ili iz samog dokumenta msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "Molimo Vas da kreirate prijemnicu nabavke ili ulaznu fakturu za stavku {0}" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "Molimo Vas da obrišete proizvodnu kombinaciju {0}, pre nego što spojite {1} u {2}" @@ -37356,11 +37385,11 @@ msgstr "Molimo Vas da unesete račun za kusur" msgid "Please enter Approving Role or Approving User" msgstr "Molimo Vas da unesete ulogu odobravanja ili korisnika koji odobrava" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "Molimo Vas da unesete broj šarže" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "Molimo Vas da unesete troškovni centar" @@ -37372,7 +37401,7 @@ msgstr "Molimo Vas da unesete datum isporuke" msgid "Please enter Employee Id of this sales person" msgstr "Molimo Vas da unesete ID zaposlenog lica za ovog prodavca" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "Molimo Vas da unesete račun rashoda" @@ -37417,7 +37446,7 @@ msgstr "Molimo Vas da unesete datum reference" msgid "Please enter Root Type for account- {0}" msgstr "Molimo Vas da unesete vrstu glavnog računa za račun - {0}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "Molimo Vas da unesete broj serije" @@ -37494,7 +37523,7 @@ msgstr "Molimo Vas da unesete prvi datum isporuke" msgid "Please enter the phone number first" msgstr "Molimo Vas da prvo unesete broj telefona" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "Molimo Vas da unesete {schedule_date}." @@ -37608,12 +37637,12 @@ msgstr "Sačuvajte prodajnu porudžbinu pre dodavanja rasporeda isporuke." msgid "Please select Template Type to download template" msgstr "Molimo Vas da izaberete Vrstu šablona da preuzmete šablon" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "Molimo Vas da izaberete na šta će se primeniti popust" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "Molimo Vas da izaberete sastavnicu za stavku {0}" @@ -37629,13 +37658,13 @@ msgstr "Molimo Vas da izaberete tekući račun" msgid "Please select Category first" msgstr "Molimo Vas da prvo izaberete kategoriju" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "Molimo Vas da prvo izaberete vrstu troška" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "Molimo Vas da izaberete kompaniju" @@ -37644,7 +37673,7 @@ msgstr "Molimo Vas da izaberete kompaniju" msgid "Please select Company and Posting Date to getting entries" msgstr "Molimo Vas da izaberete kompaniju i datum knjiženja da biste dobili unose" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "Molimo Vas da prvo izaberete kompaniju" @@ -37693,7 +37722,7 @@ msgstr "Molimo Vas da izaberete račun razlike za periodični unos" msgid "Please select Posting Date before selecting Party" msgstr "Molimo Vas da izaberete datum knjiženja pre nego što izaberete stranku" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "Molimo Vas da prvo izaberete datum knjiženja" @@ -37701,11 +37730,11 @@ msgstr "Molimo Vas da prvo izaberete datum knjiženja" msgid "Please select Price List" msgstr "Molimo Vas da izaberete cenovnik" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "Molimo Vas da izaberete količinu za stavku {0}" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "Molimo Vas da prvo izaberete skladište za zadržane uzorke u podešavanjima zaliha" @@ -37758,7 +37787,7 @@ msgstr "Molimo Vas da izaberete nabavnu porudžbinu podugovaranja." msgid "Please select a Supplier" msgstr "Molimo Vas da izaberete dobavljača" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "Molimo Vas da izaberete skladište" @@ -37819,7 +37848,7 @@ msgstr "Molimo Vas da izaberete red za kreiranje ponovnog knjiženja" msgid "Please select a supplier for fetching payments." msgstr "Molimo Vas da izaberete dobavljača za preuzimanje uplata." -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37839,7 +37868,7 @@ msgstr "Molimo Vas da izaberete šifru stavke pre nego što postavite skladište msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "Molimo Vas da izaberete barem jedan filter: Šifra stavke, šarža ili broj serije." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37946,7 +37975,7 @@ msgstr "Molimo Vas da izaberete validnu vrstu dokumenta." msgid "Please select weekly off day" msgstr "Molimo Vas da izaberete nedeljni dan odmora" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "Molimo Vas da prvo izaberete {0}" @@ -38086,7 +38115,7 @@ msgstr "Molimo Vas da podesite stvarnu potražnju ili prognozu prodaje da biste msgid "Please set an Address on the Company '%s'" msgstr "Molimo Vas da postavite adresu na kompaniju '%s'" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "Molimo Vas da postavite račun rashoda u tabelu stavki" @@ -38130,7 +38159,7 @@ msgstr "Molimo Vas da postavite podrazumevani račun rashoda u kompaniji {0}" msgid "Please set default UOM in Stock Settings" msgstr "Molimo Vas da postavite podrazumevane jedinice mere u postavkama zaliha" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "Molimo Vas da postavite podrazumevani račun troška prodate robe u kompaniji {0} za knjiženje zaokruživanja dobitaka i gubitaka tokom prenosa zaliha" @@ -38249,7 +38278,7 @@ msgstr "Molimo Vas precizirajte {0}." msgid "Please specify at least one attribute in the Attributes table" msgstr "Molimo Vas da precizirate barem jedan atribut u tabeli atributa" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "Molimo Vas da precizirate ili količinu ili stopu vrednovanja ili oba" @@ -38420,7 +38449,7 @@ msgstr "Objavljeno na" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38445,7 +38474,7 @@ msgstr "Objavljeno na" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38560,7 +38589,7 @@ msgstr "Datum i vreme knjiženja" msgid "Posting Time" msgstr "Vreme knjiženja" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "Datum i vreme knjiženja su obavezni" @@ -38739,6 +38768,12 @@ msgstr "Preventivno održavanje" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39032,7 +39067,9 @@ msgstr "Potrebne su kategorije popusta na cenu ili proizvod" msgid "Price per Unit (Stock UOM)" msgstr "Cena po jedinici (jedinica mere zaliha)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40387,6 +40424,7 @@ msgstr "Trošak nabavke za stavku {0}" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40423,6 +40461,12 @@ msgstr "Avans za ulaznu fakturu" msgid "Purchase Invoice Item" msgstr "Stavka ulazne fakture" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40474,6 +40518,7 @@ msgstr "Ulazne fakture" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40483,7 +40528,7 @@ msgstr "Ulazne fakture" #: 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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40600,7 +40645,7 @@ msgstr "Nabavna porudžbina {0} je kreirana" msgid "Purchase Order {0} is not submitted" msgstr "Nabavna porudžbina {0} nije podneta" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "Nabavne porudžbine" @@ -40663,6 +40708,7 @@ msgstr "Cenovnik nabavke" #: 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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40677,7 +40723,7 @@ msgstr "Cenovnik nabavke" msgid "Purchase Receipt" msgstr "Prijemnica nabavke" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40943,7 +40989,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41531,7 +41576,7 @@ msgstr "Pregled kvaliteta" msgid "Quality Review Objective" msgstr "Cilj pregleda kvaliteta" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41592,7 +41637,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41786,7 +41831,7 @@ msgstr "Query Route String" msgid "Queue Size should be between 5 and 100" msgstr "Veličina reda mora biti između 5 i 100" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "Brzi nalog knjiženja" @@ -41841,7 +41886,7 @@ msgstr "Ponuda/Potencijalni klijent %" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -42004,7 +42049,6 @@ msgstr "Pokrenuto od strane (Imejl)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42414,8 +42458,8 @@ msgstr "Sirovine ka kupcu" msgid "Raw SQL" msgstr "Neobrađeni SQL" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "Utrošena količina sirovina biće proverena na osnovu potrebne količine iz sastavnice gotovog proizvoda" @@ -42823,11 +42867,10 @@ msgstr "Uskladi bankarsku transakciju" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43351,7 +43394,7 @@ msgstr "Odbijeni paketi serija i šarži" msgid "Rejected Warehouse" msgstr "Skladište odbijenih zaliha" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "Skladište odbijenih zaliha i Skladište prihvaćenih zaliha ne mogu biti isto." @@ -43401,7 +43444,7 @@ msgid "Remaining Balance" msgstr "Preostali saldo" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43455,7 +43498,7 @@ msgstr "Napomena" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43494,7 +43537,7 @@ msgstr "Ukloni zapise sa nultim brojem" msgid "Remove item if charges is not applicable to that item" msgstr "Ukloni stavku ukoliko troškovi nisu primenjivi na nju" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "Ukloni stavke bez promene u količini ili vrednosti." @@ -43899,6 +43942,7 @@ msgstr "Zahtev za informacijama" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44172,7 +44216,7 @@ msgstr "Rezerviši za podsklopove" msgid "Reserved" msgstr "Rezervisano" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "Konflikt rezervisane šarže" @@ -44785,7 +44829,7 @@ msgstr "" msgid "Reversal Of" msgstr "Poništavanje" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "Poništavanje naloga knjiženja" @@ -44934,10 +44978,7 @@ msgstr "Uloge koje imaju dozvolu za isporuku/prijem veće količine nego što je #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "Uloge koje imaju dozvolu da ponište radnje stopiranja" @@ -44952,8 +44993,11 @@ msgstr "Uloge koje imaju dozvolu da zaobiđu limit" msgid "Role allowed to bypass period restrictions." msgstr "Uloga kojoj je dozvoljeno zaobilaženje ograničenja perioda." +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45154,8 +45198,8 @@ msgstr "Odobrenje za gubitak od zaokruživanja" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "Odobrenje za gubitak od zaokruživanja treba biti između 0 i 1" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "Unos prihoda/rashoda od zaokruživanja za prenos zaliha" @@ -45182,11 +45226,11 @@ msgstr "Naziv za rutiranje" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "Red # {0}: Ne može se vratiti više od {1} za stavku {2}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "Red {0}: Molimo Vas da dodate paket serije i šarže za stavku {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "Red # {0}: Molimo Vas da unesete količinu za stavku {1} jer nije nula." @@ -45212,7 +45256,7 @@ msgstr "Red #{0} (Evidencija plaćanja): Iznos mora biti negativan" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "Red #{0} (Evidencija plaćanja): Iznos mora biti pozitivan" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "Red #{0}: Unos za ponovnu narudžbinu već postoji za skladište {1} sa vrstom ponovne narudžbine {2}." @@ -45413,7 +45457,7 @@ msgstr "Red #{0}: Dupli unos u referencama {1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "Red #{0}: Očekivani datum isporuke ne može biti pre datuma nabavne porudžbine" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "Red #{0}: Račun rashoda nije postavljen za stavku {1}. {2}" @@ -45473,7 +45517,7 @@ msgstr "Red #{0}: Polja za vreme početka i vreme završetka su obavezna" msgid "Row #{0}: Item added" msgstr "Red #{0}: Stavka je dodata" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "Red #{0}: Stavka {1} ne može se preneti u količini većoj od {2} u odnosu na {3} {4}" @@ -45501,7 +45545,7 @@ msgstr "Red #{0}: Stavka {1} u skladištu {2}: Dostupno {3}, potrebno {4}." msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "Red #{0}: Stavka {1} nije stavka obezbeđena od strane kupca." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "Red #{0}: Stavka {1} nije stavka serije / šarže. Ne može imati broj serije / šarže." @@ -45554,7 +45598,7 @@ msgstr "Red #{0}: Samo {1} je dostupno za rezervaciju za stavku {2}" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "Red #{0}: Početna akumulirana amortizacija mora biti manja od ili jednaka {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "Red #{0}: Operacija {1} nije završena za {2} količine gotovih proizvoda u radnom nalogu {3}. Molimo Vas da ažurirate status operacije putem radne kartice {4}." @@ -45579,7 +45623,7 @@ msgstr "Red #{0}: Molimo Vas da izaberete stavku gotovog proizvoda uz koju će s msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Red #{0}: Molimo Vas da izaberete skladište podsklopova" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "Red #{0}: Molimo Vas da postavite količinu za naručivanje" @@ -45605,15 +45649,15 @@ msgstr "Red #{0}: Količina mora biti pozitivan broj" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "Red #{0}: Količina treba da bude manja ili jednaka dostupnoj količini za rezervaciju (stvarna količina - rezervisana količina) {1} za stavku {2} protiv šarže {3} u skladištu {4}." -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "Red #{0}: Inspekcija kvaliteta je neophodna za stavku {1}" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "Red #{0}: Inspekcija kvaliteta {1} nije podneta za stavku: {2}" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "Red #{0}: Inspekcija kvaliteta {1} je odbijena za stavku {2}" @@ -45644,11 +45688,11 @@ msgstr "Red #{0}: Količina za rezervaciju za stavku {1} mora biti veća od 0." msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "Red #{0}: Cena mora biti ista kao {1}: {2} ({3} / {4})" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "Red #{0}: Vrsta referentnog dokumenta mora biti jedna od sledećih: nabavna porudžbina, ulazna faktura, nalog knjiženja ili opomena" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "Red #{0}: Vrsta referentnog dokumenta mora biti jedna od sledećih: prodajna porudžbina, izlazna faktura, nalog knjiženja ili opomena" @@ -45694,7 +45738,7 @@ msgstr "Red #{0}: Prodajna cena za stavku {1} je niža od njene {2}.\n" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "Red #{0}: ID sekvence mora biti {1} ili {2} za operaciju {3}." -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "Red #{0}: Broj serije {1} ne pripada šarži {2}" @@ -45742,11 +45786,11 @@ msgstr "Red #{0}: Izvorno skladište {1} za stavku {2} ne može biti skladište msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "Red #{0}: Izvorno skladište {1} za stavku {2} mora biti isto kao izvorno skladište {3} u radnom nalogu." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "Red #{0}: Izvorno i ciljno skladište ne mogu biti isto prilikom prenosa materijala" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "Red #{0}: Izvorno, ciljno skladište i dimenzije inventara ne mogu biti potpuno isti prilikom prenosa materijala" @@ -45799,11 +45843,11 @@ msgstr "Red #{0}: Količina zaliha {1} ({2}) za stavku {3} ne može premašiti { msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "Red #{0}: Ciljno skladište mora biti isto kao skladište kupca {1} iz povezanog naloga za prijem iz podugovaranja" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "Red #{0}: Šarža {1} je već istekla." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "Red #{0}: Skladište {1} nije zavisno skladište grupnog skladišta {2}" @@ -45831,7 +45875,7 @@ msgstr "Red #{0}: Iznos poreza po odbitku {1} ne odgovara obračunatom iznosu {2 msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "Red #{0}: Radni nalog postoji za potpunu ili delimičnu količinu stavke {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "Red #{0}: Ne možete koristiti dimenziju inventara '{1}' u usklađivanju zaliha za izmenu količine ili stope vrednovanja. Usklađivanje zaliha sa dimenzijama inventara je predviđeno samo za obavljanje unosa početnog stanja." @@ -45867,23 +45911,23 @@ msgstr "Red #{1}: Skladište je obavezno za skladišne stavke {0}" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "Red #{idx}: Ne može se izabrati skladište dobavljača prilikom isporuke sirovina podugovarača." -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "Red #{idx}: Cena stavke je ažurirana prema stopi vrednovanja jer je u pitanju interni prenos zaliha." -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "Red# {idx}: Unesite lokaciju za stavku imovine {item_code}." -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "Red #{idx}: Primljena količina mora biti jednaka zbiru prihvaćene i odbijene količine za stavku {item_code}." -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "Red #{idx}: {field_label} ne može biti negativno za stavku {item_code}." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "Red #{idx}: {field_label} je obavezan." @@ -45891,7 +45935,7 @@ msgstr "Red #{idx}: {field_label} je obavezan." msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "Red #{idx}: {from_warehouse_field} i {to_warehouse_field} ne mogu biti isto." -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "Red #{idx}: {schedule_date} ne može biti pre {transaction_date}." @@ -45956,7 +46000,7 @@ msgstr "Red #{}: {}" msgid "Row #{}: {} {} does not exist." msgstr "Red #{}: {} {} ne postoji." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "Red #{}: {} {} ne pripada kompaniji {}. Molimo Vas da izaberete važeći {}." @@ -45972,7 +46016,7 @@ msgstr "Red {0} : Operacija je obavezna za stavku sirovine {1}" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "Red {0} odabrana količina je manja od zahtevane količine, potrebno je dodatnih {1} {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "Red {0}# stavka {1} nije pronađena u tabeli 'Primljene sirovine' u {2} {3}" @@ -46004,7 +46048,7 @@ msgstr "Red {0}: Raspoređeni iznos {1} mora biti manji ili jednak neizmirenom i msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "Red {0}: Raspoređeni iznos {1} mora biti manji ili jednak preostalom iznosu za plaćanje {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "Red {0}: Pošto je {1} omogućen, sirovine ne mogu biti dodate u {2} unos. Koristite {3} unos za potrošnju sirovina." @@ -46063,7 +46107,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "Red {0}: Stavka iz otpremnice ili referenca upakovane stavke je obavezna." #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "Red {0}: Devizni kurs je obavezan" @@ -46104,7 +46148,7 @@ msgstr "Red {0}: Vreme početka i vreme završetka su obavezni." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "Red {0}: Vreme početka i vreme završetka za {1} se preklapaju sa {2}" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "Red {0}: Početno skladište je obavezno za interne transfere" @@ -46228,7 +46272,7 @@ msgstr "Red {0}: Količina mora biti veća od 0." msgid "Row {0}: Quantity cannot be negative." msgstr "Red {0}: Količina ne može biti negativna." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "Red {0}: Količina nije dostupna za {4} u skladištu {1} za vreme knjiženja ({2} {3})" @@ -46240,11 +46284,11 @@ msgstr "Red {0}: Izlazna faktura {1} je već kreirana za {2}" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "Red {0}: Smena se ne može promeniti jer je amortizacija već obračunata" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "Red {0}: Podugovorena stavka je obavezna za sirovinu {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "Red {0}: Ciljno skladište je obavezno za interne transfere" @@ -46268,7 +46312,7 @@ msgstr "Red {0}: Račun {3} {1} ne pripada kompaniji {2}" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "Red {0}: Za postavljanje periodičnosti {1}, razlika između datuma početka i datuma završetka mora biti veća ili jednaka od {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "Red {0}: Preneta količina ne može biti veća od zatražene količine." @@ -46321,7 +46365,7 @@ msgstr "Red {0}: Stavka {2} {1} ne postoji u {2} {3}" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "Red {1}: Količina ({0}) ne može biti razlomak. Da biste to omogućili, onemogućite opciju '{2}' u jedinici mere {3}." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "Red {idx}: Serija imenovanja za imovinu je obavezna za automatsko kreiranje imovine za stavku {item_code}." @@ -46351,7 +46395,7 @@ msgstr "Redovi sa istim analitičkim računima će biti spojeni u jedan račun" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "Pronađeni su redovi sa duplim datumima dospeća u drugim redovima: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "Redovi: {0} imaju 'Unos uplate' kao referentnu vrstu. Ovo ne treba podešavati ručno." @@ -46417,7 +46461,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46714,7 +46758,7 @@ msgstr "Prodajna ulazna jedinična cena" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46888,7 +46932,7 @@ msgstr "Prodajne prilike po izvoru" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -47011,8 +47055,8 @@ msgstr "Prodajna porudžbina je potrebna za stavku {0}" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "Prodajna porudžbina {0} već postoji za nabavnu porudžbinu kupca {1}. Da biste omogućili više prodajnih porudžbina, omogućite {2} u {3}" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "Prodajna porudžbina {0} nije dostupna za proizvodnju" @@ -47423,7 +47467,7 @@ msgstr "Ista stavka" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "Ista stavka i kombinacija skladišta su već uneseni." @@ -47460,7 +47504,7 @@ msgstr "Skladište za zadržane uzorke" msgid "Sample Size" msgstr "Veličina uzorka" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "Količina uzorka {0} ne može biti veća od primljene količine {1}" @@ -47751,7 +47795,7 @@ msgstr "Pretraga po šifri stavke, broju serije ili bar-kodu" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47896,7 +47940,7 @@ msgstr "Izaberite brend..." msgid "Select Columns and Filters" msgstr "Izaberite kolone i filtere" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "Izaberite kompaniju" @@ -48592,7 +48636,7 @@ msgstr "Opseg serijskih brojeva" msgid "Serial No Reserved" msgstr "Rezervisani broj serije" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "Preklapanje serije brojeva serije" @@ -48653,7 +48697,7 @@ msgstr "Broj serije je obavezan" msgid "Serial No is mandatory for Item {0}" msgstr "Broj serije je obavezan za stavku {0}" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "Broj serije {0} već postoji" @@ -48939,7 +48983,7 @@ msgstr "Brojevi serije nisu dostupni za stavku {0} u skladištu {1}. Molimo Vas #: 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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48965,7 +49009,7 @@ msgstr "Brojevi serije nisu dostupni za stavku {0} u skladištu {1}. Molimo Vas #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49363,12 +49407,6 @@ msgstr "Postavi ciljno skladište" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "Postavite stopu vrednovanja na osnovu izvornog skladišta" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "Postavi stopu vrednovanja za odbijene materijale" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "Postavi skladište" @@ -49474,6 +49512,12 @@ msgstr "Postavite ovu vrednost na 0 da biste onemogućili funkcionalnost." msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "Postavi {0} u kategoriju imovine {1} za kompaniju {2}" @@ -49972,7 +50016,7 @@ msgstr "Prikaži stanje u kontnom okviru" msgid "Show Barcode Field in Stock Transactions" msgstr "Prikaži polja za bar-kod u transakcijama sa zalihama" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "Prikaži otkazane unose" @@ -49980,7 +50024,7 @@ msgstr "Prikaži otkazane unose" msgid "Show Completed" msgstr "Prikaži završeno" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "Prikaži potražuje / duguje u valuti kompanije" @@ -50063,7 +50107,7 @@ msgstr "Prikaži povezane otpremnice" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "Prikaži neto vrednosti na računu stranke" @@ -50075,7 +50119,7 @@ msgstr "" msgid "Show Open" msgstr "Prikaži otvoreno" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "Prikaži unose početnog stanja" @@ -50088,11 +50132,6 @@ msgstr "Prikaži početno i završno stanje" msgid "Show Operations" msgstr "Prikaži operacije" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "Prikaži dugme za plaćanje u portalu nabavnih porudžbina" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "Prikaži detalje plaćanja" @@ -50108,7 +50147,7 @@ msgstr "Prikaži raspored plaćanja u štampanom formatu" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "Prikaži napomene" @@ -50175,6 +50214,11 @@ msgstr "Prikaži samo maloprodaju" msgid "Show only the Immediate Upcoming Term" msgstr "Prikaži samo neposredno naredni period" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "Prikaži nerešene unose" @@ -50463,11 +50507,11 @@ msgstr "Izvorni unos proizvodnje" msgid "Source Stock Entry (Manufacture)" msgstr "Izvorni unos zaliha (proizvodnja)" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "Izvorni unos zaliha {0} pripada radnom nalogu {1}, a ne {2}. Molimo Vas da koristite unos proizvodnje iz istog radnog naloga." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "Izvorni unos zaliha {0} nema količinu gotovih proizvoda" @@ -50533,7 +50577,7 @@ msgstr "Izvorno skladište {0} mora biti isto kao skladište kupca {1} u nalogu msgid "Source and Target Location cannot be same" msgstr "Izvor i ciljna lokacija ne mogu biti isti" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "Izvorno i ciljno skladište ne mogu biti isti za red {0}" @@ -50547,8 +50591,8 @@ msgid "Source of Funds (Liabilities)" msgstr "Izvor sredstava (Obaveze)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "Izvorno skladište je obavezno za red {0}" @@ -50713,8 +50757,8 @@ msgstr "Standardni ocenjeni troškovi" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "Standardna prodaja" @@ -51047,7 +51091,7 @@ msgstr "Dnevnik zatvaranja zaliha" msgid "Stock Details" msgstr "Detalji o zalihama" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "Unosi zaliha su već kreirani za radni nalog {0}: {1}" @@ -51318,7 +51362,7 @@ msgstr "Zalihe primljene ali nisu fakturisane" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51330,7 +51374,7 @@ msgstr "Usklađivanje zaliha" msgid "Stock Reconciliation Item" msgstr "Stavka usklađivanja zaliha" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "Usklađivanja zaliha" @@ -51368,7 +51412,7 @@ msgstr "Podešavanje ponovne obrade zaliha" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51396,7 +51440,7 @@ msgstr "Unosi rezervacije zaliha otkazani" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "Unosi rezervacije zaliha kreirani" @@ -51778,7 +51822,7 @@ msgstr "Zaustavljeni radni nalozi ne mogu biti otkazani. Prvo je potrebno otkaza #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "Magacini" @@ -51856,10 +51900,6 @@ msgstr "Podoperacije" msgid "Sub Procedure" msgstr "Podprocedura" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "Međuzbir" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "Nedostaju reference stavki podsklopa. Molimo Vas da ponovo učitate podsklope i sirovine." @@ -52076,7 +52116,7 @@ msgstr "Stavka usluge naloga za prijem iz podugovaranja" msgid "Subcontracting Order" msgstr "Nalog za podugovaranje" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52102,7 +52142,7 @@ msgstr "Uslužna stavka naloga za podugovaranje" msgid "Subcontracting Order Supplied Item" msgstr "Nabavljene stavke naloga za podugovaranje" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "Nalog za podugovaranje {0} je kreiran." @@ -52191,7 +52231,7 @@ msgstr "Postavke podugovaranja" msgid "Subdivision" msgstr "Pododeljenje" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "Podnošenje radnje nije uspelo" @@ -52366,7 +52406,7 @@ msgstr "Uspešno usklađeno" msgid "Successfully Set Supplier" msgstr "Dobavljač uspešno postavljen" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "Jedinica mere na zalihama je uspešno promenjena, redefinišite faktore konverzije za novu jedinicu mere." @@ -52522,6 +52562,7 @@ msgstr "Nabavljena količina" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52563,8 +52604,8 @@ msgstr "Nabavljena količina" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52612,6 +52653,12 @@ msgstr "Adrese i kontakti dobavljača" msgid "Supplier Contact" msgstr "Kontakt dobavljača" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52706,7 +52753,7 @@ msgstr "Datum izdavanja fakture dobavljača" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "Broj fakture dobavljača" @@ -52986,19 +53033,10 @@ msgstr "Dobavljač robe ili usluga." msgid "Supplier {0} not found in {1}" msgstr "Dobavljač {0} nije pronađen u {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Dobavljač(i)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "Analitika prodaje po dobavljaču" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53060,7 +53098,7 @@ msgstr "Tim za podršku" msgid "Support Tickets" msgstr "Tiket za podršku" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53319,8 +53357,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "Ciljno skladište {0} mora biti isto kao skladište za isporuku {1} u stavci naloga za prijem iz podugovaranja." #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "Ciljno skladište je obavezno za red {0}" @@ -53789,7 +53827,7 @@ msgstr "Porez po odbitku se obračunava samo na iznos koji prelazi kumulativni p #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "Oporezivi iznos" @@ -53950,7 +53988,7 @@ msgstr "Odbijeni porezi i naknade" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "Odbijeni porezi i naknade (valuta kompanije)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "Red poreza #{0}: {1} ne može biti manji od {2}" @@ -54140,7 +54178,6 @@ msgstr "Šablon uslova" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54332,7 +54369,7 @@ msgstr "Pristup zahtevu za ponudu sa portala je onemogućeno. Da biste omogućil msgid "The BOM which will be replaced" msgstr "Sastavnica koja će biti zamenjena" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "Šarža {0} ima negativnu količinu od {1}. Da biste to ispravili, otvorite šaržu i kliknite da ponovo izračunate količinu šarže. Ukoliko problem i dalje postoji, kreirajte ulaznu stavku." @@ -54376,7 +54413,7 @@ msgstr "Uslov plaćanja u redu {0} je verovatno duplikat." 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 "Lista za odabir koja sadrži unose rezervacije zaliha ne može biti ažurirana. Ukoliko morate da izvršite promene, preporučujemo da otkažete postojeće stavke unosa rezervacije zaliha pre nego što ažurirate listu za odabir." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "Količina gubitka u procesu je resetovana prema količini gubitka u procesu sa radnom karticom" @@ -54392,7 +54429,7 @@ msgstr "Broj serije u redu #{0}: {1} nije dostupan u skladištu {2}." msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "Serijski broj {0} je rezervisan za {1} {2} i ne može se koristiti za bilo koju drugu transakciju." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "Paket serije i šarže {0} nije validan za ovu transakciju. 'Vrsta transakcije' treba da bude 'Izlazna' umesto 'Ulazna' u paketu serije i šarže {0}" @@ -54428,7 +54465,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "Šarža {0} je već rezervisana u {1} {2}. Dakle, nije moguće nastaviti sa {3} {4}, koja je kreirana za {5} {6}." @@ -54534,7 +54571,7 @@ msgstr "Sledeće šarže su istekle, molimo Vas da ih dopunite:
{0}" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "Postoje sledeći otkazani unosi ponovnog knjiženja za {0}:

{1}

Molimo Vas da obrišete ove unose pre nastavka." -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "Sledeći obrisani atributi postoje u varijantama, ali ne i u šablonima. Možete ili obrisati varijante ili zadržati atribute u šablonu." @@ -54579,15 +54616,15 @@ msgstr "Praznik koji pada na {0} nije između datum početka i datuma završetka msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "Sledeća stavka {item} nije označena kao {type_of} stavka. Možete je omogućiti kao {type_of} stavku iz master podataka stavke." -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "Stavke {0} i {1} su prisutne u sledećem {2} :" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "Sledeće stavke {items} nisu označene kao {type_of} stavke. Možete ih omogućiti kao {type_of} stavke iz master podataka stavke." @@ -54743,7 +54780,7 @@ msgstr "Udeli ne postoje sa {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "Zalihe za stavku {0} u skladištu {1} su bile negativne na {2}. Trebalo bi da kreirate pozitivan unos {3} pre datuma {4} i vremena {5} kako biste uneli ispravnu stopu vrednovanja. Za više detalja pročitajte dokumentaciju.." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "Zalihe su rezervisane za sledeće stavke i skladišta, poništite rezervisanje kako biste mogli da {0} uskladite zalihe:

{1}" @@ -54765,11 +54802,11 @@ 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 "Sistem će kreirati izlaznu fakturu ili fiskalni račun sa maloprodajnog interfejsa u zavisnosti od ovog podešavanja. Za transakcije velikog obima preporučuje se korišćenje fiskalnog računa." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "Zadatak je stavljen u status čekanja kao pozadinski proces. U slučaju problema pri obradi u pozadini, sistem će dodati komentar o grešci u ovom usklađivanju zaliha i vratiti ga u fazu nacrta" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "Zadatak je stavljen u status čekanja kao pozadinski proces. U slučaju problema pri obradi u pozadini, sistem će dodati komentar o grešci u ovom usklađivanju zaliha i vratiti ga u status podneto" @@ -54841,7 +54878,7 @@ msgstr "{0} ({1}) mora biti jednako {2} ({3})" msgid "The {0} contains Unit Price Items." msgstr "{0} sadrži stavke sa jediničnom cenom." -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "Prefiks {0} '{1}' već postoji. Molimo Vas da promenite seriju brojeva serije, u suprotnom će doći do greške duplog unosa." @@ -54894,7 +54931,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "Nema dostupnih termina za ovaj datum" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54938,7 +54975,7 @@ msgstr "Nije pronađena nijedna šarža za {0}: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "Mora postojati bar jedan gotov proizvod u unosu zaliha" @@ -54994,11 +55031,11 @@ msgstr "Ova stavka je varijanta {0} (Šablon)." msgid "This Month's Summary" msgstr "Rezime ovog meseca" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "Ova nabavna porudžbina je u potpunosti podugovorena." -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "Ova prodajna porudžbina je u potpunosti podugovorena." @@ -55799,7 +55836,7 @@ msgstr "Omogućava uključivanje troškova podsklopova i sekundarnih stavki u go msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "Da bi porez bio uključen u red {0} u ceni stavke, porezi u redovima {1} takođe moraju biti uključeni" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "Za spajanje, sledeće osobine moraju biti iste za obe stavke" @@ -55834,7 +55871,7 @@ msgstr "Da biste koristili drugu finansijsku evidenciju, poništite označavanje #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "Da biste koristili drugu finansijsku knjigu, poništite označavanje opcije 'Uključi podrazumevane unose u finansijskim evidencijama'" @@ -55985,7 +56022,7 @@ msgstr "Ukupne raspodele" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Ukupan iznos" @@ -56408,7 +56445,7 @@ msgstr "Ukupan iznos zahteva za naplatu ne može biti veći od {0} iznosa" msgid "Total Payments" msgstr "Ukupno plaćanja" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "Ukupno odabrana količina {0} je veća od naručene količine {1}. Možete postaviti dozvolu za preuzimanje viška u podešavanjima zaliha." @@ -56440,7 +56477,7 @@ msgstr "Ukupni trošak nabavke (putem ulazne fakture)" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Ukupna količina" @@ -56826,7 +56863,7 @@ msgstr "URL za praćenje" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56837,7 +56874,7 @@ msgstr "Transakcija" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "Valuta transakcije" @@ -57509,11 +57546,11 @@ msgstr "UAE VAT Settings" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57585,7 +57622,7 @@ msgstr "Faktor konverzije jedinice mere je obavezan u redu {0}" msgid "UOM Name" msgstr "Naziv jedinice mere" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "Faktor konverzije jedinice mere je obavezan za jedinicu mere: {0} u stavci: {1}" @@ -57661,7 +57698,7 @@ msgstr "Nije moguće pronaći ocenu koja počinje sa {0}. Morate imati postojeć msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "Nije moguće pronaći vremenski termin u narednih {0} dana za operaciju {1}. Molimo Vas da povećate 'Planiranje kapaciteta za (u danima)' za {2}." -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "Nije moguće pronaći promenljive:" @@ -57780,7 +57817,7 @@ msgstr "Jedinica mere" msgid "Unit of Measure (UOM)" msgstr "Jedinica mere" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "Jedinica mere {0} je uneta više puta u tabelu faktora konverzije" @@ -57900,10 +57937,9 @@ msgid "Unreconcile Transaction" msgstr "Poništavanje usklađenosti transakcija" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "Neusklađeno" @@ -57926,10 +57962,6 @@ msgstr "Neusklađeni unosi" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "Uspešno poništeno usklađivanje" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57975,7 +58007,7 @@ msgstr "Neplanirano" msgid "Unsecured Loans" msgstr "Neobezbeđeni krediti" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "Poništi usklađeni zahtev za naplatu" @@ -58190,12 +58222,6 @@ msgstr "Ažuriraj zalihe" msgid "Update Type" msgstr "Ažuriraj vrstu" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "Ažuriraj učestalost projekta" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58236,7 +58262,7 @@ msgstr "Ažurirano {0} redova finansijskog izveštaja sa novim nazivom kategorij msgid "Updating Costing and Billing fields against this Project..." msgstr "Ažuriranje polja za obračun troškova i fakturisanje za ovaj projekat..." -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "Ažuriranje varijanti..." @@ -58694,12 +58720,6 @@ msgstr "Proverite primenjeno pravilo" msgid "Validate Components and Quantities Per BOM" msgstr "Proverite komponente i količine komponenti po sastavnici" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "Proveri utrošenu količinu (prema sastavnici)" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58723,6 +58743,12 @@ msgstr "Proverite pravilo cenovnika" msgid "Validate Stock on Save" msgstr "Proverite stanje zaliha prilikom čuvanja" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58829,11 +58855,11 @@ msgstr "Nedostaje stopa vrednovanja" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "Stopa vrednovanja za stavku {0} je neophodna za računovodstvene unose za {1} {2}." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "Stopa vrednovanja je obavezna ukoliko je unet početni inventar" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "Stopa vrednovanja je obavezna za stavku {0} u redu {1}" @@ -58843,7 +58869,7 @@ msgstr "Stopa vrednovanja je obavezna za stavku {0} u redu {1}" msgid "Valuation and Total" msgstr "Vrednovanje i ukupno" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "Stopa vrednovanja za stavke obezbeđene od strane kupca je postavljena na nulu." @@ -58993,7 +59019,7 @@ msgstr "Odstupanje ({})" msgid "Variant" msgstr "Varijanta" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "Greška atributa varijante" @@ -59012,7 +59038,7 @@ msgstr "Varijanta sastavnice" msgid "Variant Based On" msgstr "Varijanta zasnovana na" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "Varijanta zasnovana na se ne može promeniti" @@ -59030,7 +59056,7 @@ msgstr "Polje varijante" msgid "Variant Item" msgstr "Stavka varijante" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "Stavke varijante" @@ -59411,7 +59437,7 @@ msgstr "Naziv dokumenta" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59451,7 +59477,7 @@ msgstr "Količina u dokumentu" #. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "Podvrsta dokumenta" @@ -59483,7 +59509,7 @@ msgstr "Podvrsta dokumenta" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59718,7 +59744,7 @@ msgstr "Skladište {0} ne postoji" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "Skladište {0} nije dozvoljeno za prodajnu porudžbinu {1}, trebalo bi da bude {2}" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "Skladište {0} nije povezano ni sa jednim računom, molimo Vas da navedete račun u evidenciji skladišta ili postavite podrazumevani račun inventara u kompaniji {1}" @@ -59765,7 +59791,7 @@ msgstr "Skladišta sa postojećim transakcijama ne mogu biti konvertovana u glav #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59821,6 +59847,12 @@ msgstr "Upozorenje na nove zahteve za ponudu" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "Upozorenje - Red {0}: Fakturisani sati su veći od stvarnih sati" @@ -60004,7 +60036,7 @@ msgstr "Specifikacije veb-sajta" msgid "Website:" msgstr "Veb-sajt:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60378,7 +60410,7 @@ msgstr "Utrošeni materijali radnog naloga" msgid "Work Order Item" msgstr "Stavka radnog naloga" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "Neusklađenost radnog naloga" @@ -60440,11 +60472,11 @@ msgstr "Radni nalog nije kreiran" msgid "Work Order {0} created" msgstr "Radni nalog {0} je kreiran" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "Radni nalog {0} nema proizvedenu količinu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "Radni nalog: {0} radna kartica nije pronađena za operaciju {1}" @@ -60760,11 +60792,11 @@ msgstr "Naziv fiskalne godine" msgid "Year Start Date" msgstr "Datum početka godine" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60817,7 +60849,7 @@ msgstr "Takođe možete kopirati i zalepiti ovaj link u Vašem internet pretraž msgid "You can also set default CWIP account in Company {}" msgstr "Takođe možete postaviti podrazumevani račun za građevinske radove u toku u kompaniji {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60971,6 +61003,10 @@ msgstr "Nemate dozvolu da kreirate adresu kompanije. Molimo Vas da se obratite s msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "Nemate dozvolu da ažurirate podatke o kompaniji. Molimo Vas da se obratite sistem menadžeru." +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "Nemate dozvolu da ažurirate ovaj dokument. Molimo Vas da se obratite sistem menadžeru." @@ -60999,7 +61035,7 @@ msgstr "Omogućili ste {0} i {1} u {2}. Ovo može dovesti do toga da se cene iz msgid "You have entered a duplicate Delivery Note on Row" msgstr "Uneli ste duplu otpremnicu u redu" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -61007,7 +61043,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "Morate omogućiti automatsko ponovno naručivanje u podešavanjima zaliha da biste održali nivoe ponovnog naručivanja." @@ -61078,8 +61114,11 @@ msgstr "Nulta stopa" msgid "Zero quantity" msgstr "Nulta količina" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61191,7 +61230,7 @@ msgstr "exchangerate.host" msgid "fieldname" msgstr "naziv polja" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61409,6 +61448,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "jedinstveno, npr. SAVE20 Koristi za za ostvarivanje popusta" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "odstupanje" @@ -61467,7 +61510,8 @@ msgstr "{0} kupona iskorišćeno za {1}. Dozvoljena količina je iskorišćena" msgid "{0} Digest" msgstr "{0} Izveštaj" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61487,7 +61531,7 @@ msgstr "{0} operacije: {1}" msgid "{0} Request for {1}" msgstr "{0} zahtev za {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} zadržavanje uzorka se zasniva na šarži, molimo Vas da proverite da li stavka ima broj šarže kako biste zadržali uzorak" @@ -61600,7 +61644,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} unet dva puta u stavke poreza" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "{0} unet dva puta {1} u stavke poreza" @@ -61768,7 +61812,7 @@ msgstr "Parametar {0} je nevažeći" msgid "{0} payment entries can not be filtered by {1}" msgstr "Unosi plaćanja {0} ne mogu se filtrirati prema {1}" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "Količina {0} za stavku {1} se prima u skladište {2} sa kapacitetom {3}." @@ -61781,7 +61825,7 @@ msgstr "{0} do {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "{0} jedinica je rezervisano za stavku {1} u skladištu {2}, molimo Vas da poništite rezervisanje u {3} da uskladite zalihe." @@ -61983,7 +62027,7 @@ msgstr "{0} {1}: račun {2} je neaktivan" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: računovodstveni unos {2} može biti napravljen samo u valuti: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: troškovni centar je obavezan za stavku {2}" @@ -62069,23 +62113,23 @@ msgstr "{0}: {1} ne postoji" msgid "{0}: {1} is a group account." msgstr "{0}: {1} je grupni račun." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} mora biti manje od {2}" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "{count} imovine kreirane za {item_code}" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} je otkazano ili zatvoreno." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "Veličina uzorka za {item_name} ({sample_size}) ne može biti veća od prihvaćene količine ({accepted_quantity})" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "{ref_doctype} {ref_name} je {status}." diff --git a/erpnext/locale/sv.po b/erpnext/locale/sv.po index 983c4cd4423..90a7933cc01 100644 --- a/erpnext/locale/sv.po +++ b/erpnext/locale/sv.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-13 19:29\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:21\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -100,15 +100,15 @@ msgstr " Underenhet" msgid " Summary" msgstr "Översikt" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"Kund Försedd Artikel\" kan inte vara Inköp Artikel" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"Kund Försedd Artikel\" kan inte ha Grund Pris" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "\"Är Fast Tillgång\" kan inte ångras då Tillgång Register finns mot denna Artikel" @@ -307,7 +307,7 @@ msgstr "'Från Datum' erfordras" msgid "'From Date' must be after 'To Date'" msgstr "'Från Datum' måste vara efter 'Till Datum'" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "'Har Serie Nummer' kan inte vara 'Ja' för ej Lager Artikel" @@ -343,7 +343,7 @@ msgstr "\"Uppdatera Lager\" kan inte väljas eftersom artiklar inte är leverera msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "\"Uppdatera Lager\" kan inte väljas för Fast Tillgång Försäljning" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "'{0}' konto används redan av {1}. Använd ett annat konto." @@ -1104,7 +1104,7 @@ msgstr "Förare måste anges för att godkänna." msgid "A logical Warehouse against which stock entries are made." msgstr "Logisk Lager mot vilken lager poster skapas" -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "Namngivning konflikt uppstod när serienummer skapades. Ändra namngivning serie för artikel {0}." @@ -1316,7 +1316,7 @@ msgstr "Åtkomst Nyckel erfordras för Tjänsteleverantör: {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "Enligt CEFACT/ICG/2010/IC013 eller CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "Enligt stycklista {0} saknas artikel '{1}' i lager post." @@ -1523,7 +1523,7 @@ msgstr "Konto Saldo" #: erpnext/accounts/doctype/account/account.py:328 msgid "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'" -msgstr "Konto Saldo är redan i Kredit, Ej Tillåtet att ange \"Balans måste vara\" som \"Debet\"" +msgstr "Konto Saldo är redan i Kredit, Ej Tillåtet att ange \"Saldo Måste Vara\" som \"Debet\"" #: erpnext/accounts/doctype/account/account.py:322 msgid "Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'" @@ -1799,7 +1799,7 @@ msgstr "Bokföring Dimension" #: erpnext/accounts/doctype/gl_entry/gl_entry.py:213 #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:150 msgid "Accounting Dimension {0} is required for 'Balance Sheet' account {1}." -msgstr "Bokföring Dimension {0} erfordras för 'Balans Rapport' konto {1}." +msgstr "Bokföring Dimension {0} erfordras för 'Saldo Rapport' konto {1}." #: erpnext/accounts/doctype/gl_entry/gl_entry.py:200 #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:138 @@ -1986,8 +1986,8 @@ msgstr "Bokföring Poster" msgid "Accounting Entry for Asset" msgstr "Bokföring Post för Tillgång" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "Bokföring Post för Landad Kostnad Verifikat i Lager Post {0}" @@ -1995,7 +1995,7 @@ msgstr "Bokföring Post för Landad Kostnad Verifikat i Lager Post {0}" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "Bokföring Post för Landad Kostnad Verifikat för Underleverantör Följesedel {0}" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Bokföring Post för Service" @@ -2008,16 +2008,16 @@ msgstr "Bokföring Post för Service" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Bokföring Post för Lager" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "Bokföring Post för {0}" @@ -2315,12 +2315,6 @@ msgstr "Åtgärd om Kvalitet Kontroll ej Godkänd" msgid "Action If Quality Inspection Is Rejected" msgstr "Åtgärd om Kvalitet Kontroll är Avvisad" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "Åtgärd om Samma Marginal inte Bibehålls" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "Åtgärd Initierad" @@ -2379,6 +2373,12 @@ msgstr "Åtgärd om Årsbudget Överskridits på Ackumulerad Kostnad" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "Åtgärd om Samma Marginal inte bibehålls vid Intern Transaktion" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "Åtgärd om samma marginal inte bibehålls" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2646,7 +2646,7 @@ msgstr "Faktisk Tid i Timmar (via Tidrapport)" msgid "Actual qty in stock" msgstr "Faktisk Kvantitet på Lager" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "Faktisk Moms/Avgift kan inte inkluderas i Artikel Pris på rad {0}" @@ -2660,7 +2660,7 @@ msgstr "Ändamål Kvantitet" msgid "Add / Edit Prices" msgstr "Lägg till / Ändra Priser" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "Lägg till kolumner i Transaktion Valuta" @@ -2814,7 +2814,7 @@ msgstr "Lägg till Serie/Parti Nummer" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "Lägg till Serie/Parti Nummer (Avvisad Kvantitet)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "Lägg till Namngivning Serie Prefix" @@ -3059,7 +3059,7 @@ msgstr "Extra Rabatt Belopp" msgid "Additional Discount Amount (Company Currency)" msgstr "Extra Rabatt Belopp (Bolag Valuta)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "Extra Rabatt Blopp ({discount_amount}) kan inte överstiga summan före sådan rabatt ({total_before_discount})" @@ -3348,7 +3348,7 @@ msgstr "Justera Kvantitet" msgid "Adjustment Against" msgstr "Justering Mot" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "Justering Baserad på Inköp Faktura Pris" @@ -3461,7 +3461,7 @@ msgstr "Förskott Verifikat Typ" msgid "Advance amount" msgstr "Förskott Belopp" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Förskott Belopp kan inte vara högre än {0} {1}" @@ -3530,7 +3530,7 @@ msgstr "Mot " #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Mot Konto" @@ -3648,7 +3648,7 @@ msgstr "Mot Leverantör Faktura {0}" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "Mot Verifikat" @@ -3672,7 +3672,7 @@ msgstr "Mot Verifikat Nummer" #: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "Mot Verifikat Typ" @@ -3953,7 +3953,7 @@ msgstr "All kommunikation inklusive och ovanför detta ska flyttas till ny Ären msgid "All items are already requested" msgstr "Alla artiklar är redan efterfrågade" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "Alla Artiklar är redan Fakturerade / Återlämnade" @@ -3961,7 +3961,7 @@ msgstr "Alla Artiklar är redan Fakturerade / Återlämnade" msgid "All items have already been received" msgstr "Alla Artiklar är redan mottagna" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Alla Artikel har redan överförts för denna Arbetsorder." @@ -4010,7 +4010,7 @@ msgstr "Tilldela" msgid "Allocate Advances Automatically (FIFO)" msgstr "Tilldela Förskott Automatiskt (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Tilldela Betalning Belopp" @@ -4020,7 +4020,7 @@ msgstr "Tilldela Betalning Belopp" msgid "Allocate Payment Based On Payment Terms" msgstr "Tilldela Betalning baserat på Betalning Villkor" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "Tilldela Betalning Begäran" @@ -4050,7 +4050,7 @@ msgstr "Tilldelad" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4171,15 +4171,15 @@ msgstr "Tillåt Retur" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "Tillåt Interna Överföringar till Marknadsmässig Pris" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "Tillåt att Artikel läggs till flera gånger i en transaktion" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "Tillåt att Artikel läggs till flera gånger i Transaktion" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "Tillåt att Artikel läggs till flera gånger i transaktion" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4208,12 +4208,6 @@ msgstr "Tillåt Negativ Lager" msgid "Allow Negative Stock for Batch" msgstr "Tillåt negativt lager för Parti" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "Tillåt Negativa Priser för Artiklar" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4426,8 +4420,11 @@ msgstr "Tillåt Fler Valuta Fakturor mot Parti Konto" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "Tillåt flera Försäljning Order mot Kund Inköp Order" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "Tillåt Negativa Priser för Artiklar" @@ -4519,7 +4516,7 @@ msgstr "Tillåtet att skapa Transaktioner med" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "Tillåtna primära roller är 'Kund' och 'Leverantör'. Välj endast en av dessa roller." -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "Tillåtna specialtecken är '/' och '-'" @@ -4716,7 +4713,7 @@ msgstr "Fråga Alltid" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4746,7 +4743,6 @@ msgstr "Fråga Alltid" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4916,10 +4912,6 @@ msgstr "Belopp stämmer inte med vald transaktion" msgid "Amount in Account Currency" msgstr "Belopp i Konto Valuta" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "Belopp i Ord" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5539,7 +5531,7 @@ msgstr "Eftersom fält {0} är aktiverad erfordras fält {1}." msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "Eftersom fält {0} är aktiverad ska värdet för fält {1} vara mer än 1." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "Eftersom det finns befintliga godkäAda transaktioner mot artikel {0} kan man inte ändra värdet på {1}." @@ -5689,7 +5681,7 @@ msgstr "Tillgång Kategori Konto" msgid "Asset Category Name" msgstr "Tillgång Kategori Namn" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "Tillgång Kategori erfordras för Fast Tillgång post" @@ -6085,7 +6077,7 @@ msgstr "Tillgång {0} är inte godkänd. Godkänn tillgång innan du fortsätter msgid "Asset {0} must be submitted" msgstr "Tillgång {0} måste godkännas" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "Tillgång {assets_link} skapad för {item_code}" @@ -6123,11 +6115,11 @@ msgstr "Tillgångar" msgid "Assets Setup" msgstr "Tillgång Inställningar" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "Tillgångar har inte skapats för {item_code}. Skapa Tillgång manuellt." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "Tillgångar {assets_link} skapade för {item_code}" @@ -6200,7 +6192,7 @@ msgstr "Minst en råmaterial artikel måste finnas i lager post för typ {0}" msgid "At least one row is required for a financial report template" msgstr "Minst en rad erfordras för finans rapport mall" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "Minst ett Lager erfordras" @@ -6232,7 +6224,7 @@ msgstr "Rad {0}: Kvantitet erfordras för Artikel {1}" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "Rad {0}: Serie Nummer erfordras för Artikel {1}" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "Rad {0}: Serie och Parti Paket {1} år redan skapad. Ta bort värde från serie nummer eller parti nummer fält." @@ -6296,7 +6288,11 @@ msgstr "Egenskap Namn" msgid "Attribute Value" msgstr "Egenskap Värde" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "Egenskap värde {0} är inte giltigt för vald egenskap {1}." + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "Egenskap Tabell erfordras" @@ -6304,11 +6300,19 @@ msgstr "Egenskap Tabell erfordras" msgid "Attribute value: {0} must appear only once" msgstr "Egenskap Värde: {0} får endast visas en gång" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "Egenskap {0} är inaktiverad." + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "Egenskap {0} är inte giltigt för vald mall." + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "Egenskaper {0} valda flera gånger i Egenskap Tabell" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Egenskaper" @@ -6368,24 +6372,12 @@ msgstr "Auktoriserad Värde" msgid "Auto Create Exchange Rate Revaluation" msgstr "Automatiskt Skapa Valutaväxling Kurs Omvärdering" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "Automatiskt Skapa Inköp Följesedel" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "Automatiskt Skapa Serie Nummer och Parti Paket för Extern" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr " Automatiskt Skapa Underleverantör Order" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6504,6 +6496,18 @@ msgstr "Fel vid automatiskt skapande av användare" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "Automatiskt Stäng Besvarad Möjlighet efter ovan angivet antal dagar" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "Automatiskt skapa Inköp Följesedel" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "Automatiskt skapa Underleverantör Order" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6569,7 +6573,7 @@ msgstr "Automatiskt Behandla Uppskjutna Bokföring Poster" #. DocType 'Accounting Dimension Detail' #: erpnext/accounts/doctype/accounting_dimension_detail/accounting_dimension_detail.json msgid "Automatically post balancing accounting entry" -msgstr "Automatiskt skapa balans bokföring post" +msgstr "Automatiskt skapa saldo bokföring post" #. Label of the automatically_run_rules_on_unreconciled_transactions (Check) #. field in DocType 'Accounts Settings' @@ -6721,7 +6725,7 @@ msgstr "Tillgängligt för Användning Datum" msgid "Available for use date is required" msgstr "Tillgängligt för Användning Datum erfordras" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "Tillgänglig Kvantitet är {0}, behövs {1}" @@ -6820,7 +6824,7 @@ msgstr "BFS" msgid "BIN Qty" msgstr "Lager Kvantitet" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7093,7 +7097,7 @@ msgstr "Stycklista Webbplats Artikel" msgid "BOM Website Operation" msgstr "Stycklista Webbplats Åtgärd" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "Stycklista och Färdig Kvantitet erfordras för Demontering" @@ -7184,7 +7188,7 @@ msgstr "Retroaktivt hämta Råmaterial från Pågående Arbete Lager" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" +msgid "Backflush raw materials of subcontract based on" msgstr "Retroaktivt hämta Råmaterial från Underleverantör baserat på" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' @@ -7205,7 +7209,7 @@ msgstr "Saldo" msgid "Balance (Dr - Cr)" msgstr "Saldo (Dr - Cr)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Saldo ({0})" @@ -7736,11 +7740,11 @@ msgstr "Bank" msgid "Barcode Type" msgstr "Streck/QR Kod Typ" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "Streck/QR Kod {0} används redan i Artikel {1}" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "Streck/QR Kod {0} är inte giltig {1} kod" @@ -8107,12 +8111,12 @@ msgstr "Parti {0} och Lager" msgid "Batch {0} is not available in warehouse {1}" msgstr "Parti {0} är inte tillgängligt i lager {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "Parti {0} av Artikel {1} är förfallen." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "Parti {0} av Artikel {1} är Inaktiverad." @@ -8185,8 +8189,8 @@ msgstr "Faktura Nummer" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "Faktura för Avvisad Kvantitet i Inköp Faktura" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "Faktura för avvisad kvantitet i Inköp Faktura" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8526,8 +8530,11 @@ msgstr "Ramavtal Order Artikel" msgid "Blanket Order Rate" msgstr "Ramavtal Order Värde" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "Ramavtal Ordrar" @@ -9042,7 +9049,7 @@ msgstr "Inköp & Försäljning" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "Inköp måste väljas, om Gäller för är valt som {0}" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "Som standard är leverantör namn satt enligt angiven Leverantörs Namn. Om man vill att leverantörer ska namnges av Namngivning Serie Välj 'Namngivning Serie'." @@ -9407,7 +9414,7 @@ msgstr "Kan inte filtrera baserat på Verifikat nummer om grupperad efter Verifi msgid "Can only make payment against unbilled {0}" msgstr "Kan bara skapa betalning mot ofakturerad {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9463,9 +9470,9 @@ msgstr "Kan inte ändra Lager Konto Inställningar" msgid "Cannot Create Return" msgstr "Kan inte Skapa Retur" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "Kan inte Slå Samman" @@ -9493,7 +9500,7 @@ msgstr "Kan inte ändra {0} {1}, skapa ny istället." msgid "Cannot apply TDS against multiple parties in one entry" msgstr "Kan inte tillämpa TDS mot flera parter i en post" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "Kan inte vara Fast Tillgång artikel när Lager Register är skapad." @@ -9529,7 +9536,7 @@ msgstr "Kan inte avbryta denna Produktion Lager Post eftersom kvantitet av Produ msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "Det går inte att annullera detta dokument eftersom det är länkat till godkänd justering av tillgång värde {0}. Annullera justering av tillgång värde för att fortsätta." -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "Kan inte annullera detta dokument eftersom det är länkad med godkänd tillgång {asset_link}. Annullera att fortsätta." @@ -9537,7 +9544,7 @@ msgstr "Kan inte annullera detta dokument eftersom det är länkad med godkänd msgid "Cannot cancel transaction for Completed Work Order." msgstr "Kan inte annullera transaktion för Klart Arbetsorder." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "Kan inte ändra egenskap efter Lager transaktion. Skapa ny Artikel och överför kvantitet till ny Artikel" @@ -9549,7 +9556,7 @@ msgstr "Kan inte ändra Referens Dokument Typ" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "Kan inte ändra Service Stopp Datum för Artikel på rad {0}" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "Kan inte ändra Variant Egenskaper efter Lager transaktion.Skapa ny Artikel för att göra detta." @@ -9577,11 +9584,11 @@ msgstr "Kan inte konvertera till Grupp eftersom Konto Typ är vald." msgid "Cannot covert to Group because Account Type is selected." msgstr "Kan inte konvertera till Grupp eftersom Konto Typ valts." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "Kan inte skapa Lager Reservation Poster för framtid daterade Inköp Följesedlar." -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "Kan inte skapa plocklista för Försäljning Order {0} eftersom den har reserverad lager. Vänligen avboka lager för att skapa plocklista." @@ -9607,7 +9614,7 @@ msgstr "Kan inte ange som förlorad, eftersom Försäljning Offert är skapad." msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "Kan inte dra av när kategori angets \"Värdering\" eller \"Värdering och Total\"" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "Kan inte ta bort Valutaväxling Resultat rad" @@ -9644,7 +9651,7 @@ msgstr "Kan inte inaktivera {0} eftersom det kan leda till felaktig lager värde msgid "Cannot disassemble more than produced quantity." msgstr "Kan inte demontera mer än producerad kvantitet." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "Kan inte demontera {0} mot lager post {1}. Endast {2} tillgängligt för demontering." @@ -9652,8 +9659,8 @@ msgstr "Kan inte demontera {0} mot lager post {1}. Endast {2} tillgängligt för msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "Kan inte aktivera Lager Konto per Lager, eftersom det redan finns befintliga Lager Register Poster för {0} med Lager Konto per Lager. Avbryt lager transaktioner först och försök igen." -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "Kan inte säkerställa leverans efter Serie Nummer eftersom Artikel {0} lagts till med och utan säker leverans med serie nummer" @@ -9697,7 +9704,7 @@ msgstr "Kan inte ta emot från kund mot negativt utestående" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "Kan inte minska kvantitet än den som är på order eller inköp kvantitet" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9715,8 +9722,8 @@ msgstr "Kan inte hämta länk token. Se fellogg för mer information" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "Det går inte att välja en grupptyp Kundgrupp. Välj grupp som inte tillhör Kund Grupp." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9732,7 +9739,7 @@ msgstr "Kan inte ange som förlorad eftersom Försäljning Order är skapad." msgid "Cannot set authorization on basis of Discount for {0}" msgstr "Kan inte ange auktorisering på grund av Rabatt för {0}" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "Kan inte ange flera Artikel Standard för Bolag." @@ -10160,7 +10167,7 @@ msgstr "Ändring av Kund Grupp för vald Kund är inte tillåtet." #: erpnext/stock/doctype/item/item.js:16 msgid "Changing the valuation method to Moving Average will affect new transactions. If backdated entries are added, earlier FIFO-based entries will be reposted, which may change closing balances." -msgstr "Om värdering sätt ändras till MA kommer det att påverka nya transaktioner. Om retroaktiva poster läggs till kommer tidigare FIFO baserade poster att bokas om, vilket kan ändra utgående balanser." +msgstr "Om värdering sätt ändras till MA kommer det att påverka nya transaktioner. Om retroaktiva poster läggs till kommer tidigare FIFO baserade poster att bokas om, vilket kan ändra utgående saldo." #. Option for the 'Lead Type' (Select) field in DocType 'Lead' #: erpnext/crm/doctype/lead/lead.json @@ -10643,7 +10650,7 @@ msgstr "Stängning (Cr)" msgid "Closing (Dr)" msgstr "Stängning (Dr)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "Stängning (Öppning + Totalt)" @@ -11104,7 +11111,7 @@ msgstr "Bolag" #: 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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11386,7 +11393,7 @@ msgstr "Bolag" msgid "Company Abbreviation" msgstr "Bolag Förkortning" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "Bolag Förkortning (erfordrar installerad system)" @@ -11399,7 +11406,7 @@ msgstr "Bolag Förkortning får inte ha mer än 5 tecken" msgid "Company Account" msgstr "Bolag Konto" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "Bolag Konto Erfordras" @@ -11575,7 +11582,7 @@ msgstr "Bolag filter är inte angiven!" msgid "Company is mandatory" msgstr "Bolag Erfordras" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "Bolag Erfodras för Bolag Konto" @@ -11846,7 +11853,7 @@ msgstr "Konfigurera Konto" msgid "Configure Accounts for Bank Entry" msgstr "Konfigurera Konto för Bank Post" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "Konfigurera Bank Konto" @@ -11859,7 +11866,9 @@ msgstr "Konfigurera Kontoplan" msgid "Configure Product Assembly" msgstr "Konfigurera Artikel Produktion" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "Konfigurera Namngivning Serie" @@ -11877,13 +11886,13 @@ msgstr "Konfigurera regler för att spara tid vid avstämning av transaktioner." msgid "Configure settings for the banking module" msgstr "Konfigurera inställningar för bankmodul" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "Konfigurera åtgärd att stoppa transaktion eller varna om Marginal inte bibehålls." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "Konfigurera Standard Prislista vid skapande av Inköp Order. Artikel priser hämtas från denna Prislista." @@ -12061,7 +12070,7 @@ msgstr "Förbrukning Komponenter" msgid "Consumed" msgstr "Förbrukad" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "Förbrukad Belopp" @@ -12105,7 +12114,7 @@ msgstr "Förbrukade Artiklar Kostnad" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12278,10 +12287,6 @@ msgstr "Kontakt Person tillhör inte {0}" msgid "Contact:" msgstr "Kontakt:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Kontakt: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12459,7 +12464,7 @@ msgstr "Konvertering Faktor" msgid "Conversion Rate" msgstr "Konvertering Sats" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "Konvertering Faktor för Standard Enhet måste vara 1 på rad {0}" @@ -12731,7 +12736,7 @@ msgstr "Kostnadsfördelning / Processförlust" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12826,7 +12831,7 @@ msgid "Cost Center is required" msgstr "Resultat Enhet erfordras" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "Resultat Enhet erfodras på rad {0} i Moms Tabell för typ {1}" @@ -13164,7 +13169,7 @@ msgstr "Skapa Färdiga Artiklar" msgid "Create Grouped Asset" msgstr "Skapa Grupperad Tillgång" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "Skapa Inter Bolag Journal Post" @@ -13537,7 +13542,7 @@ msgstr "Skapa {0} {1} ?" msgid "Created By Migration" msgstr "Skapad av Migrering" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "Skapade {0} Resultatkort för {1} mellan:" @@ -13680,15 +13685,15 @@ msgstr "Skapande av {0} delvis klar.\n" msgid "Credit" msgstr "Kredit" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "Kredit (Transaktion)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "Kredit ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "Kredit Konto" @@ -13883,7 +13888,7 @@ msgstr "Kreditor Omsättningsgrad" msgid "Creditors" msgstr "Kreditorer" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "Krediter" @@ -14181,7 +14186,7 @@ msgstr "Aktuell Serie / Parti Paket" msgid "Current Serial No" msgstr "Aktuellt Serie Nummer" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "Nuvarande Namngivning Serie" @@ -14382,7 +14387,7 @@ msgstr "Anpassade Avgränsare" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15155,7 +15160,7 @@ msgstr "Datum att Bearbeta" msgid "Day Of Week" msgstr "Veckodag" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "Dag i månaden" @@ -15271,11 +15276,11 @@ msgstr "Handlare" msgid "Debit" msgstr "Debet" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "Debet (Transaktion)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "Debet ({0})" @@ -15285,7 +15290,7 @@ msgstr "Debet ({0})" msgid "Debit / Credit Note Posting Date" msgstr "Debet / Kredit Faktura Registrering Datum" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "Debet Konto" @@ -15396,7 +15401,7 @@ msgstr "Debet-Kredit överensstämmer ej" msgid "Debit/Credit" msgstr "Debet/Kredit" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "Debiteringar" @@ -15538,7 +15543,7 @@ msgstr "Standard Åldring Intervall" msgid "Default BOM" msgstr "Standard Stycklista" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "Standard Stycklista ({0}) måste vara aktiv för denna artikel eller dess mall" @@ -15895,15 +15900,15 @@ msgstr " Standard Distrikt" msgid "Default Unit of Measure" msgstr "Standard Enhet" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "Standard Enhet för Artikel {0} kan inte ändras eftersom det finns några transaktion(er) med annan Enhet. Man måste antingen annullera länkade dokument eller skapa ny artikel." -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "Standard Enhet för Artikel {0} kan inte ändras direkt eftersom man redan har skapat vissa transaktioner (s) med annan enhet. Man måste skapa ny Artikel för att använda annan standard enhet." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "Standard Enhet för Variant '{0}' måste vara samma som i Mall '{1}'" @@ -16204,7 +16209,7 @@ msgstr "Leverera sekundära artiklar" msgid "Delivered" msgstr "Levererad" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Levererad Belopp" @@ -16254,8 +16259,8 @@ msgstr "Levererade Artiklar Att Fakturera" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16266,11 +16271,11 @@ msgstr "Levererad Kvantitet" msgid "Delivered Qty (in Stock UOM)" msgstr "Levererad Kvantitet (i Lager Enhet)" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "Levererad kvantitet kan inte ökas med mer än {0} för artikel {1}" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "Levererad kvantitet kan inte minskas med mer än {0} för artikel {1}" @@ -16359,7 +16364,7 @@ msgstr "Leverans Ansvarig" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16884,7 +16889,7 @@ msgstr "Differens Konto i Artikel Inställningar" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "Differens konto måste vara konto av typ Tillgång/Skuld (Tillfällig Öppning), eftersom denna Lager Post är Öppning Post." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "Differens Konto måste vara Tillgång / Skuld Konto Typ, eftersom denna Inventering är Öppning Post" @@ -17048,11 +17053,9 @@ msgstr "Inaktivera Kumulativ Tröskel" msgid "Disable In Words" msgstr "Inaktivera i Ord" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "Inaktivera Senaste Inköp Pris" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "Inaktivera Öppning Saldo Beräkning" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17093,6 +17096,12 @@ msgstr "Inaktivera Serie Nummer och Parti Väljare" msgid "Disable Transaction Threshold" msgstr "Inaktivera Transaktion Tröskel" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "Inaktivera Senaste Inköp Pris" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17149,7 +17158,7 @@ msgstr "Demontera" msgid "Disassemble Order" msgstr "Demontering Order" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "Demontering kvantitet kan inte vara mindre än eller lika med 0." @@ -17674,6 +17683,12 @@ msgstr "Använd inte partivis värdering" msgid "Do Not Use Batchwise Valuation" msgstr "Använd inte Parti baserad Värdering" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "Hämta inte inköp pris från Serienummer" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17764,9 +17779,12 @@ msgstr "Dokument Sökning" msgid "Document Count" msgstr "Antal Dokument" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "Dokument Namngivning" @@ -17784,6 +17802,10 @@ msgstr "DocType" msgid "Document Type already used as a dimension" msgstr "Dokument Typ används redan som dimension" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "Dokumentation" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -17835,7 +17857,7 @@ msgstr "Dörrar" #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json #: erpnext/assets/doctype/asset_finance_book/asset_finance_book.json msgid "Double Declining Balance" -msgstr "Dubbel Avtagande Balans" +msgstr "Dubbel Avtagande Saldo" #: erpnext/public/js/utils/serial_no_batch_selector.js:247 msgid "Download CSV Template" @@ -18088,7 +18110,7 @@ msgstr "Kopiera Projekt med Uppgifter" msgid "Duplicate Sales Invoices found" msgstr "Dubbletter av Försäljning Fakturor hittades" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "Duplicerad Serienummer Fel" @@ -18208,8 +18230,8 @@ msgstr "System Användare" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "System kommer att skapa lager bokföring post för varje transaktion av denna artikel. Behåll inaktiverad för ej lager hanterade eller service artiklar." -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18432,7 +18454,7 @@ msgstr "E-post" msgid "Email Sent to Supplier {0}" msgstr "E-post Skickad till Leverantör {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "E-post adress erfordras för att skapa användare" @@ -18622,7 +18644,7 @@ msgstr "Användare ID" msgid "Employee cannot report to himself." msgstr "Personal kan inte rapportera till sig själv." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "Personal Erfordras" @@ -18630,7 +18652,7 @@ msgstr "Personal Erfordras" msgid "Employee is required while issuing Asset {0}" msgstr "Personal erfordras vid utfärdande av tillgångar {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "Personal {0} har redan länkad användare" @@ -18643,7 +18665,7 @@ msgstr "Personal {0} tillhör inte {1}" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "{0} arbetar för närvarande på en annan arbetsstation. Tilldela annan anställd." -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "Personal {0} hittades inte" @@ -18686,7 +18708,7 @@ msgstr "Aktivera Tid Bokning Schema" msgid "Enable Auto Email" msgstr "Aktivera Automatisk E-post" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "Aktivera Automatisk Ombeställning" @@ -19292,7 +19314,7 @@ msgstr "Fel: Denna tillgång har redan {0} avskrivning perioder bokade.\n" "\t\t\t\t\tStart datum för \"avskrivning\" måste vara minst {1} perioder efter \"tillgänglig för användning\" datum.\t\t\t\t\t\n" " Korrigera datum enligt detta." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "Fel: {0} är erfordrad fält" @@ -19338,7 +19360,7 @@ msgstr "Fritt Fabrik" msgid "Example URL" msgstr "Exempel URL" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "Exempel på länkad dokument: {0}" @@ -19367,7 +19389,7 @@ msgstr "Exempel: Serie Nummer {0} reserverad i {1}." msgid "Exception Budget Approver Role" msgstr "Godkännande Roll för Undantag i Budget" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "Överskrid Demontering" @@ -19726,7 +19748,7 @@ msgstr "Förväntad Värde Efter Användning" msgid "Expense" msgstr "Kostnader" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "Kostnad / Differens Konto ({0}) måste vara \"Resultat\" konto" @@ -19774,7 +19796,7 @@ msgstr "Kostnad / Differens Konto ({0}) måste vara \"Resultat\" konto" msgid "Expense Account" msgstr "Kostnad Konto" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "Kostnad Konto saknas" @@ -20237,7 +20259,7 @@ msgstr "Filter Totalt Noll Kvantitet" msgid "Filter by Reference Date" msgstr "Filtrera efter Referens Datum" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "Filtrera efter belopp" @@ -20567,7 +20589,7 @@ msgstr "Färdig Artikel Lager" msgid "Finished Goods based Operating Cost" msgstr "Färdiga Artiklar baserad Drift Kostnad" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "Färdig Artikel {0} stämmer inte med Arbetsorder {1}" @@ -20662,7 +20684,7 @@ msgstr "Skatteregler erfordras, ange Skatteregler i Bolag {0}" msgid "Fiscal Year" msgstr "Bokföringsår" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "Bokföringsår (erfordrar installerad System)" @@ -20726,7 +20748,7 @@ msgstr "Fast Tillgång Konto" msgid "Fixed Asset Defaults" msgstr "Fasta Tillgångar" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "Fast Tillgång Artikel får ej vara Lager Artikel." @@ -20876,7 +20898,7 @@ msgstr "För Bolag" msgid "For Item" msgstr "För Artikel" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "För Artikel {0} kan inte tas emot mer än {1} i kvantitet mot {2} {3}" @@ -20907,7 +20929,7 @@ msgstr "För Prislista" msgid "For Production" msgstr "För Produktion" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "För Kvantitet (Producerad Kvantitet) erfordras" @@ -20991,6 +21013,12 @@ msgstr "För artikel {0}endast {1} tillgång har skapats eller lä msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "För Artikel {0} pris måste vara positiv tal. Att tillåta negativa priser, aktivera {1} i {2}" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "För äldre serienummer, hämta inte inköp pris från serienummer och beräkna pris baserat på inköp transaktion" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "För åtgärd {0} på rad {1}, lägg till råmaterial eller ange Stycklista." @@ -21012,7 +21040,7 @@ msgstr "För projekt - {0}, uppdatera din status" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "För beräknade och förväntade kvantiteter kommer system att inkludera alla underordnade lager under vald överordnad lager." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "För Kvantitet {0} ska inte vara högre än tillåten kvantitet {1}" @@ -21021,7 +21049,7 @@ msgstr "För Kvantitet {0} ska inte vara högre än tillåten kvantitet {1}" msgid "For reference" msgstr "Referens" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "För rad {0} i {1}. Om man vill inkludera {2} i Artikel Pris, rader {3} måste också inkluderas" @@ -21045,7 +21073,7 @@ msgstr "För 'Tillämpa Regel på' villkor erfordras fält {0}" msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "För kundernas bekvämlighet kan dessa koder användas i utskriftsformat som Fakturor och Följesedlar" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "För artikel {0} förbrukad kvantitet ska vara {1} enligt stycklista {2}." @@ -21054,7 +21082,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 "För att ny {0} ska gälla, vill du radera nuvarande {1}?" -#: erpnext/controllers/stock_controller.py:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "För {0} finns inget kvantitet tillgängligt för retur i lager {1}." @@ -21667,7 +21695,7 @@ msgstr "G - D" msgid "GENERAL LEDGER" msgstr "BOKFÖRING REGISTER" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "Bokföring Konto" @@ -21679,7 +21707,7 @@ msgstr "Bokföring Register Saldo" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "Bokföring Register Post" @@ -22194,7 +22222,7 @@ msgstr "I Transit" msgid "Goods Transferred" msgstr "Överförd" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "Artiklarna redan mottagna mot extern post {0}" @@ -22377,7 +22405,7 @@ msgstr "Total summa måste stämma med summan av Betalning Referenser" msgid "Grant Commission" msgstr "Tillåt Provision" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "Högre än Belopp" @@ -23018,11 +23046,11 @@ msgstr "Hur ofta?" msgid "How many units of the final product this BOM makes." msgstr "Hur många enheter av färdig artikel som kan produceras från denna stycklista." -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" -msgstr "Hur ofta ska Projekt uppdateras baserat på Totalt Inköp Kostnad?" +msgid "How often should project be updated of Total Purchase Cost ?" +msgstr "Hur ofta ska projekt uppdateras baserat på Totalt Inköp Kostnad?" #. Label of the sales_update_frequency (Select) field in DocType 'Selling #. Settings' @@ -23177,7 +23205,7 @@ msgstr "Om åtgärd är uppdelad i underåtgärder kan de läggas till här." msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "Om vald, kommer inte Överordnad Lager Konto eller Bolag Standard att väljas i Transaktioner" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23247,7 +23275,7 @@ msgstr "Om aktiverat kommer systemet inte att tillämpa prisregel på följesede #. Description of the 'Pick Manually' (Check) field in DocType 'Pick List' #: erpnext/stock/doctype/pick_list/pick_list.json msgid "If enabled then system won't override the picked qty / batches / serial numbers / warehouse." -msgstr "Om aktiverad kommer system inte att åsidosätta plockat kvantitet / parti / serienummer / lager." +msgstr "Om aktiverad kommer system inte att åsidosätta plockad kvantitet / parti / serienummer / lager." #. Description of the 'Send Document Print' (Check) field in DocType 'Request #. for Quotation' @@ -23362,7 +23390,7 @@ msgstr "Om aktiverad kommer system att tillåta val av Enhet i försäljning och msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "Om aktiverad tillåter system att användare ändrar artiklar och deras kvantiteter i arbetsorder. System kommer inte att återställa kvantiteter enligt stycklista om användare har ändrat dem." -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23534,11 +23562,11 @@ msgstr "Om detta inte är önskvärt annullera motsvarande betalning post." msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "Om artikel har varianter, kan den inte väljas i Försäljning Order osv." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "Om 'Ja' kommer System att hindra dig från att skapa Inköp Faktura eller Faktura utan att först skapa Inköp Order.Vald konfiguration kan åsidosättas för viss Leverantör genom att aktivera kryssruta 'Tillåt skapande av Inköp Faktura utan Inköp Order' i Leverantör Inställningar." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "Om 'Ja' kommer System att hindra dig från att skapa Inköp Faktura utan att skapa Inköp Följesedel.Vald konfiguration kan åsidosättas för viss Leverantör genom att aktivera kryssruta 'Tillåt skapande av Inköp Faktura utan Inköp Följesedel' i Leverantör Inställningar. " @@ -23654,7 +23682,7 @@ msgstr "Ignorera Tom Lager" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "Ignorera Valutakurs omvärdering och Resultat Journaler" @@ -23706,7 +23734,7 @@ msgstr "Ignorera att Prissättning Regel är aktiverad. Det går inte att använ #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "Ignorera System Skapade Kredit / Debet Fakturor" @@ -23749,7 +23777,7 @@ msgstr "Ignorera Arbetsplats Tid Överlappning" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "Ignorerar gammal 'Är Öppning' fält i Bokföring Post som gör det möjligt att lägga till Öppning Saldo Post efter att system används vid skapande av rapporter" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "Bilden i beskrivningen har tagits bort. För att inaktivera detta beteende, inaktivera \"{0}\" i {1}." @@ -23763,6 +23791,7 @@ msgid "Implementation Partner" msgstr "Implementering Partner" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24116,7 +24145,7 @@ msgstr "Inkludera Standard Finans Register Tillgångar" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24370,7 +24399,7 @@ msgstr "Felaktig Saldo Kvantitet Efter Transaktion" msgid "Incorrect Batch Consumed" msgstr "Felaktig Parti Förbrukad" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "Felaktig vald (grupp) Lager för Ombeställning" @@ -24378,7 +24407,7 @@ msgstr "Felaktig vald (grupp) Lager för Ombeställning" msgid "Incorrect Company" msgstr "Felaktigt Bolag" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "Felaktig Komponent Kvantitet" @@ -24588,14 +24617,14 @@ msgstr "Initierad" msgid "Inspected By" msgstr "Kontrollerad Av" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "Kontroll Avvisad" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "Kontroll Erfordras" @@ -24612,7 +24641,7 @@ msgstr "Kontroll Erfordras före Leverans" msgid "Inspection Required before Purchase" msgstr "Kontroll Erfordras före Inköp" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "Kontroll Godkännande" @@ -24694,8 +24723,8 @@ msgstr "Otillräckliga Behörigheter" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "Otillräcklig Lager" @@ -24915,7 +24944,7 @@ msgstr "Interna Överföringar" msgid "Internal Work History" msgstr "Intern Arbetsliv Erfarenhet" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "Interna Överföringar kan endast göras i bolag standard valuta" @@ -25008,7 +25037,7 @@ msgstr "Ogiltig Leverans Datum" msgid "Invalid Discount" msgstr "Ogiltig Rabatt" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "Ogiltigt Rabatt Belopp" @@ -25038,7 +25067,7 @@ msgstr "Ogiltig Gruppera Efter" msgid "Invalid Item" msgstr "Ogiltig Artikel" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "Ogiltig Artikel Standard" @@ -25124,12 +25153,12 @@ msgstr "Ogiltig Schema" msgid "Invalid Selling Price" msgstr "Ogiltig Försäljning Pris" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "Felaktig Serie och Parti Paket" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "Ogiltig från och till lager" @@ -25166,7 +25195,7 @@ msgstr "Ogiltig filterformel. Kontrollera syntaxen." msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "Ogiltig förlorad anledning {0}, skapa ny förlorad anledning" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Ogiltig namngivning serie (. saknas) för {0}" @@ -25295,7 +25324,6 @@ msgstr "Faktura Annullering" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "Faktura Datum" @@ -25316,10 +25344,6 @@ msgstr "Faktura Dokument Typ Val Fel" msgid "Invoice Grand Total" msgstr "Fakturera Totalt Belopp" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "Faktura" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25841,13 +25865,13 @@ msgstr "Är Fantom Artikel" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "Erfordras Inköp Order för Inköp Faktura och Inköp Följesedel?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "Erfordras Inköp Order för Inköp Faktura & Inköp Kvitto?" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "Erfordras Inköp Följesedel för att skapa Inköp Faktura?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "Erfordras Inköp Kvitto för att skapa Inköp Faktura?" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -26119,7 +26143,7 @@ msgstr "Ärende" msgid "Issuing Date" msgstr "Utfärdande Datum" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "Det kan ta upp till några timmar för korrekta lagervärden att vara synliga efter sammanslagning av artiklar." @@ -26189,7 +26213,7 @@ msgstr "Kursiv text för delsummor eller anteckningar" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26236,6 +26260,7 @@ msgstr "Kursiv text för delsummor eller anteckningar" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26251,7 +26276,6 @@ msgstr "Kursiv text för delsummor eller anteckningar" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -27015,6 +27039,7 @@ msgstr "Artikel Producent" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -27025,7 +27050,6 @@ msgstr "Artikel Producent" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27285,11 +27309,11 @@ msgstr "Artikel Variant Inställningar" msgid "Item Variant {0} already exists with same attributes" msgstr "Artikel Variant {0} finns redan med samma attribut" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "Artikel Varianter uppdaterade" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "Artikel Lager baserad ombokning är aktiverad." @@ -27328,6 +27352,15 @@ msgstr "Artikel Webbshop Specifikation" msgid "Item Weight Details" msgstr "Artikel Vikt Detaljer" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "Artikelvis Förbrukning" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27357,7 +27390,7 @@ msgstr "Moms Detalj per Artikel" msgid "Item Wise Tax Details" msgstr "Artikel Moms Detaljer" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "Artikel Moms Detaljer stämmer inte överens med Moms och Avgifter på följande rader:" @@ -27377,11 +27410,11 @@ msgstr "Artikel och Lager" msgid "Item and Warranty Details" msgstr "Artikel och Garanti Information" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "Artikel för rad {0} matchar inte Material Begäran" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "Artikel har varianter." @@ -27411,7 +27444,7 @@ msgstr "Artikel Åtgärd" msgid "Item qty can not be updated as raw materials are already processed." msgstr "Artikel kvantitet kan inte uppdateras eftersom råmaterial redan är bearbetad." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "Artikel pris har ändrats till noll eftersom Tillåt Noll Grund Pris är vald för artikel {0}" @@ -27430,10 +27463,14 @@ msgstr "Grund Pris räknas om med hänsyn till landad kostnad verifikat belopp" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "Artikel värdering ombokning pågår. Rapport kan visa felaktig artikelvärde." -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "Artikel variant {0} finns med lika egenskap" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "Artikel med namn {0} hittades inte i Inköp Order" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "Artikel {0} har lagt till flera gånger under samma överordnad artikel {1} på rad {2} och {3}" @@ -27447,7 +27484,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "Artikel {0} kan inte skapas order för mer än {1} mot Ramavtal Order {2}." #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "Artikel {0} finns inte" @@ -27455,7 +27492,7 @@ msgstr "Artikel {0} finns inte" msgid "Item {0} does not exist in the system or has expired" msgstr "Artikel finns inte {0} i system eller har förfallit" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "Artikel {0} finns inte." @@ -27471,15 +27508,15 @@ msgstr "Artikel {0} är redan returnerad" msgid "Item {0} has been disabled" msgstr "Artikel {0} är inaktiverad" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "Artikel {0} har ingen serie nummer. Endast serie nummer artiklar kan ha leverans baserat på serie nummer" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "Artikel {0} har inga ändringar i levererad kvantitet. Inaktivera denna rad om du inte vill uppdatera dess kvantitet." -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "Artikel {0} har nått slut på sin livslängd {1}" @@ -27491,19 +27528,23 @@ msgstr "Artikel {0} ignorerad eftersom det inte är Lager Artikel" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "Artikel {0} är redan reserverad/levererad mot Försäljning Order {1}." -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "Artikel {0} är anullerad" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "Artikel {0} är inaktiverad" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "Artikel {0} är inte direkt leverans artikel. Endast direkt leverans artiklar kan ha Levererad Kvantitet uppdaterad." + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "Artikel {0} är inte serialiserad Artikel" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "Artikel {0} är inte Lager Artikel" @@ -27511,7 +27552,11 @@ msgstr "Artikel {0} är inte Lager Artikel" msgid "Item {0} is not a subcontracted item" msgstr "Artikel {0} är inte underleverantör artikel" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "Artikel {0} är inte mall artikel." + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "Artikel {0} är inte aktiv eller livslängd har uppnåtts" @@ -27527,7 +27572,7 @@ msgstr "Artikel {0} måste vara Ej Lager Artikel" msgid "Item {0} must be a non-stock item" msgstr "Artikel {0} får inte vara Lager Artikel" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "Artikel {0} hittades inte i \"Råmaterial Levererad\" tabell i {1} {2}" @@ -27543,7 +27588,7 @@ msgstr "Artikel {0}: Order Kvantitet {1} kan inte vara lägre än minimum order msgid "Item {0}: {1} qty produced. " msgstr "Artikel {0}: {1} Kvantitet producerad ." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "Artikel {} finns inte." @@ -27653,7 +27698,7 @@ msgstr "Artiklar för Råmaterial Begäran" msgid "Items not found." msgstr "Artiklar hittades inte." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "Artikel Pris har ändrats till noll eftersom Tillåt Noll Grund Pris är vald för följande artiklar: {0}" @@ -28286,7 +28331,7 @@ msgstr "Senast skannad Lager" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "Senaste Lager Transaktion för Artikel {0} på Lager {1} var den {2}." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "Senast Synkroniserad Transaktion" @@ -28564,7 +28609,7 @@ msgstr "Förklaring" msgid "Length (cm)" msgstr "Längd (cm)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "Lägre än Belopp" @@ -28705,7 +28750,7 @@ msgstr "Länkade Fakturor" msgid "Linked Location" msgstr "Länkad Plats" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "Länkad med godkända dokument" @@ -29100,11 +29145,6 @@ msgstr "Underhåll Tillgång" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "Bibehåll Samma Marginal under hela Interna Transaktionen" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "Bibehåll Inköp Marginal" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29116,6 +29156,11 @@ msgstr "Lager Hantera" msgid "Maintain same rate throughout sales cycle" msgstr "Bibehåll Försäljning Marginal" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "Bibehåll Inköp Marginal" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29312,7 +29357,7 @@ msgid "Major/Optional Subjects" msgstr "Valfri Ämne" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29481,8 +29526,8 @@ msgstr "Erfodrad Sektion" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29541,8 +29586,8 @@ msgstr "Manuell post kan inte skapas! Inaktivera automatisk post för uppskjuten #: 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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29691,7 +29736,7 @@ msgstr "Produktion Datum" msgid "Manufacturing Manager" msgstr "Produktion Ansvarig" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "Produktion Kvantitet erfordras" @@ -29967,7 +30012,7 @@ msgstr "Material Förbrukning" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "Material Förbrukning för Produktion" @@ -30038,6 +30083,7 @@ msgstr "Material Kvitto" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30144,11 +30190,11 @@ msgstr "Material Begäran Plan Artikel" msgid "Material Request Type" msgstr "Material Begäran Typ" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "Material Begäran är redan skapad för order kvantitet" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "Material Begäran är inte skapad eftersom kvantitet för Råmaterial är redan tillgänglig." @@ -30263,7 +30309,7 @@ msgstr "Material Överförd för Produktion" msgid "Material Transferred for Manufacturing" msgstr "Material Överförd för Produktion" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30392,11 +30438,11 @@ msgstr "Maximum Betalning Belopp" msgid "Maximum Producible Items" msgstr "Maximalt antal artiklar att producera" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "Maximum Prov - {0} kan behållas för Parti {1} och Artikel {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "Maximum Prov - {0} har redan behållits för Parti {1} och Artikel {2} i Parti {3}." @@ -30840,11 +30886,11 @@ msgstr "Övrigt" msgid "Miscellaneous Expenses" msgstr "Diverse Kostnader" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "Felavstämd" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "Saknas" @@ -30882,7 +30928,7 @@ msgstr "Saknade Filter" msgid "Missing Finance Book" msgstr "Finans Register Saknas" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "Färdig Artikel Saknas" @@ -30890,11 +30936,11 @@ msgstr "Färdig Artikel Saknas" msgid "Missing Formula" msgstr "Formel Saknas" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "Saknad Artikel" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "Parameter Saknas" @@ -30938,10 +30984,6 @@ msgstr "Värde Saknas" msgid "Mixed Conditions" msgstr "Blandade Villkor" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "Mobil: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31210,7 +31252,7 @@ msgstr "Flera bolag fält tillgängliga: {0}. Välj manuellt." msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "Flera Bokföringsår finns för datum {0}. Ange Bolag under Bokföringsår" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "Flera artiklar kan inte väljas som färdiga artiklar" @@ -31289,27 +31331,20 @@ msgstr "Namngiven Plats" msgid "Naming Series Prefix" msgstr "Namngivning Serie Prefix" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "Namngivning Serie & Pris Inställningar" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "Namngivning Serie för {0}" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "Namngivning Serie erfodras" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "Namngivning Serie alternativ" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "Namngivning Serie uppdaterad" @@ -31357,16 +31392,16 @@ msgstr "Behöv Statistik" msgid "Negative Batch Report" msgstr "Negativ Parti Rapport" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "Negativ Kvantitet är inte tillåtet" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "Negativt Lager Fel" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "Negativ Grund Pris är inte tillåtet" @@ -31980,7 +32015,7 @@ msgstr "Ingen Kassa Profil hittad. Skapa ny Kassa Profil" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "Ingen Behörighet" @@ -31993,7 +32028,7 @@ msgstr "Inga inköp Order skapades" msgid "No Records for these settings." msgstr "Inga Poster för dessa inställningar." -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "Inget valt" @@ -32038,7 +32073,7 @@ msgstr "Inga Ej Avstämda Betalningar hittades för denna parti" msgid "No Work Orders were created" msgstr "Inga Arbetsordrar skapades" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "Inga bokföring poster för följande Lager" @@ -32051,7 +32086,7 @@ msgstr "Inga konto konfigurerade" msgid "No accounts found." msgstr "Inga konton hittades." -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "Ingen aktiv Stycklista hittades för Artikel {0}. Leverans efter Serie Nummer kan inte garanteras" @@ -32063,7 +32098,7 @@ msgstr "Inga extra fält tillgängliga" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "Ingen tillgänglig kvantitet att reservera för artikel {0} i lager {1}" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "Inga bankkonton hittades" @@ -32071,7 +32106,7 @@ msgstr "Inga bankkonton hittades" msgid "No bank statements imported yet" msgstr "Inga kontoutdrag importerade ännu" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "Inga banktransaktioner hittades" @@ -32165,7 +32200,7 @@ msgstr "Inga fler underordnade till Vänster" msgid "No more children on Right" msgstr "Inga fler underordnade till Höger" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "Ingen namngivning serie definierad" @@ -32340,7 +32375,7 @@ msgstr "Inga regler inställda ännu" msgid "No stock available for this batch." msgstr "Inget lager tillgängligt för denna parti." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "Inga Lager Register Poster skapade. Ange kvantitet eller grund pris för artiklar på rätt sätt och försök igen." @@ -32432,7 +32467,7 @@ msgstr "Ej Nollvärde" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "Ej Fantom Stycklista kan inte skapas för ej lagerförd artikel {0}." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "Ingen av Artiklar har någon förändring i kvantitet eller värde." @@ -32536,7 +32571,7 @@ msgstr "Ej Auktoriserad eftersom {0} överskrider gränserna" msgid "Not authorized to edit frozen Account {0}" msgstr "Ej Tillåtet redigera låst konto {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "Ej konfigurerad" @@ -32582,7 +32617,7 @@ msgstr "Obs: Betalning post kommer inte skapas eftersom \"Kassa eller Bank Konto msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "Obs: Detta Resultat Enhet är en Grupp. Kan inte skapa bokföring poster mot Grupper." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "Obs: För att slå samman artiklar skapar separat lager avstämning för gamla artikel {0}" @@ -33059,7 +33094,7 @@ msgstr "Endast en av insättningar eller uttag ska inte vara noll när Exklusive msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "Endast en operation kan ha \"Är Slutgiltig Färdig Artikel\" angiven när \"Spåra Halvfärdiga Artiklar\" är aktiverat." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "Endast en {0} post kan skapas mot Arbetsorder {1}" @@ -33211,7 +33246,7 @@ msgstr "Öppna Inställningar" msgid "Open {0} in a new tab" msgstr "Öppna {0} i ny flik" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "Öppning" @@ -33370,16 +33405,16 @@ msgstr "Öppning Försäljning Fakturor är skapade." #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Öppning Lager" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "Öppning Lager post skapad med noll grund pris: {0}" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "Öppning Lager post skapad: {0}" @@ -33736,7 +33771,7 @@ msgstr "Tillval.Kommer att användas att filtrera i olika transaktioner." msgid "Optional. Used with Financial Report Template" msgstr "Valfri. Används med Finans Rapport Mall" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "Alternativt kan antal siffror anges i serie med hjälp av punkt (.) följt av hash (#). Till exempel betyder '.####' att serie kommer att ha fyra siffror. Standardvärde är fem siffror." @@ -33870,7 +33905,7 @@ msgstr "Order Kvantitet" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "Order" @@ -34078,7 +34113,7 @@ msgstr "Utestående (Bolag Valuta)" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34136,7 +34171,7 @@ msgstr "Extern Order" msgid "Over Billing Allowance (%)" msgstr "Över Fakturering Tillåtelse (%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "Överfakturering Tillåtelse för Inköp Följesedel Artikel {0} ({1}) överskreds med {2}%" @@ -34154,7 +34189,7 @@ msgstr "Över Leverans/Följesedel Tillåtelse (%)" msgid "Over Picking Allowance" msgstr "Över Plock Tillåtelse" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "Över Följesedel" @@ -34397,7 +34432,6 @@ msgstr "Kassa Fält" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "Kassa Faktura" @@ -34668,7 +34702,7 @@ msgstr "Packad Artikel" msgid "Packed Items" msgstr "Packade Artiklar" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "Packade artiklar kan inte överföras internt" @@ -35116,7 +35150,7 @@ msgstr "Delvis Mottagen" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35252,7 +35286,7 @@ msgstr "Delar Per Million" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35378,7 +35412,7 @@ msgstr "Parti Stämmer Ej" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35464,7 +35498,7 @@ msgstr "Parti Specifik Artikel" #: 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:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35767,7 +35801,6 @@ msgstr "Betalning Poster {0} är brutna" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -36025,7 +36058,7 @@ msgstr "Betalning Referenser" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36104,10 +36137,6 @@ msgstr "Betalning Schema baserad Betalning Begäran kan inte skapas eftersom bet msgid "Payment Schedules" msgstr "Betalning Scheman" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "Betalningsstatus" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37128,7 +37157,7 @@ msgstr "Ange Prioritet" msgid "Please Set Supplier Group in Buying Settings." msgstr "Ange Leverantör Grupp i Inköp Inställningar." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "Specificera Konto" @@ -37160,11 +37189,11 @@ msgstr "Lägg till Tillfällig Öppning Konto i Kontoplan" msgid "Please add an account for the Bank Entry rule." msgstr "Lägg till konto för Bank Post regel." -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "Lägg till åtminstone en Namngivning Serie." -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "Lägg till minst en Serie Nr / Parti Nr" @@ -37184,7 +37213,7 @@ msgstr "Lägg till konto i rot nivå Bolag - {}" msgid "Please add {1} role to user {0}." msgstr "Lägg till roll {1} till användare {0}." -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "Justera kvantitet eller redigera {0} för att fortsätta." @@ -37291,7 +37320,7 @@ msgstr "Skapa Inköp från intern Försäljning eller Följesedel" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "Skapa Inköp Följesdel eller Inköp Faktura för Artikel {0}" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "Ta bort Artikel Paket {0} innan sammanslagning av {1} med {2}" @@ -37360,11 +37389,11 @@ msgstr "Ange Växel Belopp Konto" msgid "Please enter Approving Role or Approving User" msgstr "Ange Godkännande Roll eller Godkännande Användare" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "Vänligen ange Parti Nummer" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "Ange Resultat Enhet" @@ -37376,7 +37405,7 @@ msgstr "Ange Leverans Datum" msgid "Please enter Employee Id of this sales person" msgstr "Ange Anställning ID för denna Säljare" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "Ange Kostnad Konto" @@ -37421,7 +37450,7 @@ msgstr "Ange Referens Datum" msgid "Please enter Root Type for account- {0}" msgstr "Ange Konto Klass för konto {0}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "Vänligen ange Serienummer" @@ -37498,7 +37527,7 @@ msgstr "Ange första leverans datum" msgid "Please enter the phone number first" msgstr "Ange Telefon Nummer" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "Ange {schedule_date}." @@ -37612,12 +37641,12 @@ msgstr "Spara Försäljning Order innan du lägger till ett leverans schema." msgid "Please select Template Type to download template" msgstr "Välj Mall Typ att ladda ner mall" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "Välj Tillämpa Rabatt på" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "Välj Stycklista mot Artikel {0}" @@ -37633,13 +37662,13 @@ msgstr "Välj Bank Konto" msgid "Please select Category first" msgstr "Välj Kategori" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "Välj Avgift Typ" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "Välj Bolag" @@ -37648,7 +37677,7 @@ msgstr "Välj Bolag" msgid "Please select Company and Posting Date to getting entries" msgstr "Välj Bolag och Registrering Datum för att hämta poster" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "Välj Bolag" @@ -37697,7 +37726,7 @@ msgstr "Välj Periodisk Bokföring Post Differens Konto" msgid "Please select Posting Date before selecting Party" msgstr "Välj Registrering Datum före val av Parti" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "Välj Registrering Datum" @@ -37705,11 +37734,11 @@ msgstr "Välj Registrering Datum" msgid "Please select Price List" msgstr "Välj Prislista" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "Välj Kvantitet mot Artikel {0}" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "Välj Prov Lager i Lager Inställningar" @@ -37762,7 +37791,7 @@ msgstr "Välj Inköp Order." msgid "Please select a Supplier" msgstr "Välj Leverantör" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "Välj Lager" @@ -37823,7 +37852,7 @@ msgstr "Välj rad att skapa Ombokning Post" msgid "Please select a supplier for fetching payments." msgstr "Välj Leverantör för att hämta betalningar." -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "Välj transaktion." @@ -37843,7 +37872,7 @@ msgstr "Välj Artikel Kod innan du anger Lager." msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "Välj minst ett filter: Artikel Kod, Parti eller Serie Nummer." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "Välj minst en artikel för att uppdatera levererad kvantitet." @@ -37950,7 +37979,7 @@ msgstr "Välj giltig dokument typ." msgid "Please select weekly off day" msgstr "Välj Ledig Veckodag" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "Välj {0}" @@ -38090,7 +38119,7 @@ msgstr "Ange faktisk efterfråga eller försäljning prognos för att skapa plan msgid "Please set an Address on the Company '%s'" msgstr "Ange adress för Bolag '%s'" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "Ange Kostnad konto i Artikel Inställningar" @@ -38134,7 +38163,7 @@ msgstr "Ange Standard Konstnad Konto för Bolag {0}" msgid "Please set default UOM in Stock Settings" msgstr "Ange Standard Enhet i Lager Inställningar" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "Ange Standard Kostnad för sålda artiklar i bolag {0} för bokning av avrundning av vinst och förlust under lager överföring" @@ -38253,7 +38282,7 @@ msgstr "Ange {0} först." msgid "Please specify at least one attribute in the Attributes table" msgstr "Ange minst en Egenskap i Egenskap Tabell" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "Ange antingen Kvantitet eller Grund Pris eller båda" @@ -38424,7 +38453,7 @@ msgstr "Datum" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38449,7 +38478,7 @@ msgstr "Datum" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38564,7 +38593,7 @@ msgstr "Registrering Datum och Tid" msgid "Posting Time" msgstr "Registrering Tid" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "Registrering Datum och Tid erfordras" @@ -38743,6 +38772,12 @@ msgstr "Förebyggande Service" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "Förhindrar automatisk reservation av lager kvantitet från försäljning order vid bearbetning av försäljning returer." +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "Förhindrar att system automatiskt använder pris från senaste inköp transaktion när nya inköp ordrar eller transaktioner skapas." + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39036,7 +39071,9 @@ msgstr "Pris eller Artikel Rabatt Tabeller erfodras" msgid "Price per Unit (Stock UOM)" msgstr "Pris per Styck (Lager Enhet)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40391,6 +40428,7 @@ msgstr "Inköp Kostnad för Artikel {0}" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40427,6 +40465,12 @@ msgstr "Inköp Faktura Förskott" msgid "Purchase Invoice Item" msgstr "Inköp Faktura Artikel" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "Inköp Faktura Inställningar" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40478,6 +40522,7 @@ msgstr "Inköp Fakturor" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40487,7 +40532,7 @@ msgstr "Inköp Fakturor" #: 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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40604,7 +40649,7 @@ msgstr "Inköp Order {0} skapad" msgid "Purchase Order {0} is not submitted" msgstr "Inköp Order {0} ej godkänd" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "Inköp Ordrar" @@ -40667,6 +40712,7 @@ msgstr "Inköp Prislista" #: 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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40681,7 +40727,7 @@ msgstr "Inköp Prislista" msgid "Purchase Receipt" msgstr "Inköp Följesedel" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40947,7 +40993,6 @@ msgstr "K4" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41535,7 +41580,7 @@ msgstr "Kvalitet Granskning" msgid "Quality Review Objective" msgstr "Kvalitet Granskning Avsikt" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "Kvantiteter uppdaterade." @@ -41596,7 +41641,7 @@ msgstr "Kvantiteter uppdaterade." #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41790,7 +41835,7 @@ msgstr "Dataförfrågning Sökväg Sträng" msgid "Queue Size should be between 5 and 100" msgstr "Kö Storlek ska vara mellan 5 och 100" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "Snabb Journal Post" @@ -41845,7 +41890,7 @@ msgstr "Offert/Potentiell Kund %" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -42008,7 +42053,6 @@ msgstr "Initierad av (E-post)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42418,8 +42462,8 @@ msgstr "Råmaterial till Kund" msgid "Raw SQL" msgstr "Rå SQL" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "Kvantitet förbrukade råvaror kommer att valideras baserat på antal som erfordras enligt Färdig Artikel Stycklista" @@ -42827,11 +42871,10 @@ msgstr "Avstäm Bank Transaktion" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43355,7 +43398,7 @@ msgstr "Avvisad Serie och Parti Paket" msgid "Rejected Warehouse" msgstr "Avvisad Lager" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "Avvisad lager och Accepterad lager kan inte vara samma." @@ -43405,7 +43448,7 @@ msgid "Remaining Balance" msgstr "Återstående Saldo" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43459,7 +43502,7 @@ msgstr "Anmärkning" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43498,7 +43541,7 @@ msgstr "Ta bort noll antal" msgid "Remove item if charges is not applicable to that item" msgstr "Ta bort artikel om avgifter inte är tillämpliga för den" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "Borttagna Artiklar med inga förändringar i Kvantitet eller Värde." @@ -43903,6 +43946,7 @@ msgstr "Information Begäran" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44176,7 +44220,7 @@ msgstr "Reservera för Undermontering" msgid "Reserved" msgstr "Reserverad" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "Reserverad Parti Konflikt" @@ -44789,7 +44833,7 @@ msgstr "Intäkter som erhållits i förskott (t.ex. årsprenumeration) sparas h msgid "Reversal Of" msgstr "Återföring Av" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "Omvänd Journal Post" @@ -44938,10 +44982,7 @@ msgstr "Roll Godkänd att Över Leverera/Ta Emot" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "Roll Godkänd att Åsidosätta Stopp Åtgärd" @@ -44956,8 +44997,11 @@ msgstr "Roll Godkänd att Åsidosätta Kredit Gräns" msgid "Role allowed to bypass period restrictions." msgstr "Roll som tillåts kringgå periodbegränsningar." +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "Roll Godkänd att Åsidosätta Stopp Åtgärd" @@ -45158,8 +45202,8 @@ msgstr "Avrundning Förlust Tillåtelse" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "Avrundning Förlust Tillåtelse ska vara mellan 0 och 1" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "Avrundning Resultat Post för Lager Överföring" @@ -45186,11 +45230,11 @@ msgstr "Åtgärd Ordning Benämning" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "Rad # {0}: Kan inte returnera mer än {1} för Artikel {2}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "Rad # {0}: Lägg till serie och partipaket för artikel {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "Rad # {0}: Ange kvantitet för artikel {1} eftersom den inte är noll." @@ -45216,7 +45260,7 @@ msgstr "Rad # {0} (Betalning Tabell): Belopp måste vara negativ" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "Rad # {0} (Betalning Tabell): Belopp måste vara positiv" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "Rad # {0}: Återbeställning Post finns redan för lager {1} med återbeställning typ {2}." @@ -45417,7 +45461,7 @@ msgstr "Rad # {0}: Duplikat Post i Referenser {1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "Rad # {0}: Förväntad Leverans Datum kan inte vara före Inköp Datum" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "Rad # {0}: Kostnad Konto inte angiven för Artikel {1}. {2}" @@ -45477,7 +45521,7 @@ msgstr "Rad #{0}: Fält Från Tid och Till Tid erfordras" msgid "Row #{0}: Item added" msgstr "Rad # {0}: Artikel Lagt till" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "Rad #{0}: Artikel {1} kan inte överföras mer än {2} mot {3} {4}" @@ -45505,7 +45549,7 @@ msgstr "Rad #{0}: Artikel {1} i lager {2}: Tillgänglig {3}, Behövs {4}." msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "Rad #{0}: Artikel {1} är inte Kund Försedd Artikel." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "Rad # {0}: Artikel {1} är inte Serialiserad/Parti Artikel. Det kan inte ha Serie Nummer / Parti Nummer mot det." @@ -45558,7 +45602,7 @@ msgstr "Rad # {0}: Endast {1} tillgänglig att reservera för artikel {2} " msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "Rad #{0}: Ingående Ackumulerad Avskrivning måste vara lägre än eller lika med {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "Rad # {0}: Åtgärd {1} är inte Klar för {2} Kvantitet färdiga artiklar i Arbetsorder {3}. Uppdatera drift status via Jobbkort {4}." @@ -45583,7 +45627,7 @@ msgstr "Rad #{0}: Välj Färdig Artikel mot vilken denna Kund Försedd Artikel s msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Rad #{0}: Välj Underenhet Lager" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "Rad # {0}: Ange Ombeställning Kvantitet" @@ -45609,15 +45653,15 @@ msgstr "Rad # {0}: Kvantitet måste vara psitivt tal" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "Rad # {0}: Kvantitet ska vara mindre än eller lika med tillgänglig kvantitet att reservera (verklig antal - reserverad antal) {1} för artikel {2} mot parti {3} i lager {4}." -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "Rad #{0}: Kvalitet Kontroll erfordras för artikel {1}" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "Rad #{0}: Kvalitet Kontroll {1} är inte godkänd för artikel: {2}" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "Rad #{0}: Kvalitet Kontroll {1} avvisades för artikel {2}" @@ -45648,11 +45692,11 @@ msgstr "Rad # {0}: Kvantitet att reservera för Artikel {1} ska vara högre än msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "Rad #{0}: Pris måste vara samma som {1}: {2} ({3} / {4}) " -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "Rad # {0}: Referens Dokument Typ måste vara Inköp Order, Inköp Faktura eller Journal Post" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "Rad # {0}: Referens Dokument Typ måste vara Försäljning Order, Försäljning Faktura, Journal Post eller Påmminelse" @@ -45698,7 +45742,7 @@ msgstr "Rad #{0}: Försäljningspriset för artikel {1} är lägre än dess {2}. msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "Rad #{0}: Sekvens ID måste vara {1} eller {2} för Åtgärd {3}." -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "Rad # {0}: Serie Nummer {1} tillhör inte Parti {2}" @@ -45746,11 +45790,11 @@ msgstr "Rad #{0}: Lager {1} för artikel {2} får inte vara Kund Lager." msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "Rad #{0}: Lager {1} för artikel {2} måste vara samma som Lager {3} i Arbetsorder." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "Rad #{0}: Från och Till Lager kan inte vara samma för Material Överföring" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "Rad #{0}: Från, Till och Lager Dimensioner kan inte vara exakt samma för Material Överföring" @@ -45803,11 +45847,11 @@ msgstr "Rad #{0}: Lager kvantitet {1} ({2}) för artikel {3} får inte överstig msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "Rad #{0}: Lager måste vara samma som Kund Lager {1} från länkad Intern Underleverantör Order" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "Rad # {0}: Parti {1} har förfallit." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "Rad # {0}: Lager {1} är inte underordnad till grupp lager {2}" @@ -45835,7 +45879,7 @@ msgstr "Rad #{0}: Avdrag Belopp {1} stämmer inte med beräknad belopp {2}." msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "Rad #{0}: Arbetsorder finns för hel eller delvis kvantitet av artikel {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "Rad # {0}: Man kan inte använda Lager Dimension '{1}' i Lager Avstämning för att ändra kvantitet eller Värderingssats. Lager Avstämning med Lager Dimensioner är endast avsedd för att utföra öppningsposter." @@ -45871,23 +45915,23 @@ msgstr "Rad # {1}: Lager erfordras för lager artikel {0}" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "Rad #{idx}: Kan inte välja Leverantör Lager medan råmaterial levereras till underleverantör." -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "Rad # #{idx}: Artikel Pris är uppdaterad enligt Värderingssats eftersom det är intern lager överföring." -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "Rad #{idx}: Ange plats för tillgång artikel {item_code}." -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "Rad #{idx}: Mottaget Kvantitet måste vara lika med Godkänd + Avvisad Kvantitet för Artikel {item_code}." -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "Rad #{idx}: {field_label} kan inte vara negativ för artikel {item_code}." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "Rad #{idx}: {field_label} erfordras." @@ -45895,7 +45939,7 @@ msgstr "Rad #{idx}: {field_label} erfordras." msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "Rad #{idx}: {from_warehouse_field} och {to_warehouse_field} kan inte vara samma." -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "Rad #{idx}: {schedule_date} kan inte vara före {transaction_date}." @@ -45960,7 +46004,7 @@ msgstr "Rad # {}: {}" msgid "Row #{}: {} {} does not exist." msgstr "Rad # {}: {} {} finns inte." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "Rad # {}: {} {} tillhör inte bolag {}. Välj giltig {}." @@ -45976,7 +46020,7 @@ msgstr "Rad # {0}: Åtgärd erfodras mot Råmaterial post {1}" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "Rad {0} plockad kvantitet är mindre än önskad kvantitet, extra {1} {2} erfordras." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "Rad # {0}: Artikel {1} hittades inte i tabellen \"Råmaterial Levererad\" i {2} {3}" @@ -46008,7 +46052,7 @@ msgstr "Rad # {0}: Tilldelad belopp {1} måste vara lägre än eller lika med ut msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "Rad # {0}: Tilldelad belopp {1} måste vara lägre än eller lika med återstående betalning belopp {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "Rad {0}: Eftersom {1} är aktiverat kan råmaterial inte läggas till {2} post. Använd {3} post för att förbruka råmaterial." @@ -46067,7 +46111,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "Rad # {0}: Antingen Följesedel eller Packad Artikel Referens erfordras" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "Rad # {0}: Valutaväxling Kurs erfordras" @@ -46108,7 +46152,7 @@ msgstr "Rad # {0}: Från Tid och till Tid erfordras." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "Rad # {0}: Från Tid och till Tid av {1} överlappar med {2}" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "Rad # {0}: Från Lager erfordras för interna överföringar" @@ -46232,7 +46276,7 @@ msgstr "Rad # {0}: Kvantitet måste vara högre än 0." msgid "Row {0}: Quantity cannot be negative." msgstr "Rad {0}: Kvantitet kan inte vara negativ." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "Rad # {0}: Kvantitet är inte tillgänglig för {4} på lager {1} vid registrering tid för post ({2} {3})" @@ -46244,11 +46288,11 @@ msgstr "Rad {0}: Försäljning Faktura {1} har redan skapats för {2}" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "Rad {0}: Skift kan inte ändras eftersom avskrivning redan är behandlad" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "Rad # {0}: Underleverantör Artikel erfordras för Råmaterial {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "Rad # {0}: Till Lager erfordras för interna överföringar" @@ -46272,7 +46316,7 @@ msgstr "Rad {0}: {3} Konto {1} tillhör inte bolag {2}" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "Rad # {0}: För att ange periodicitet för {1} måste skillnaden mellan från och till datum vara större än eller lika med {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "Rad {0}: Överförd kvantitet får inte vara högre än begärd kvantitet." @@ -46325,7 +46369,7 @@ msgstr "Rad # {0}: {2} Artikel {1} finns inte i {2} {3}" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "Rad # {1}: Kvantitet ({0}) kan inte vara bråkdel. För att tillåta detta, inaktivera '{2}' i Enhet {3}." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "Rad {idx}: Tillgång Namngivning Serie erfordras för att automatiskt skapa tillgångar för artikel {item_code}." @@ -46355,7 +46399,7 @@ msgstr "Rader med samma Konto Poster kommer slås samman i Bokföring Register" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "Rader med dubbla förfallodatum hittades i andra rader: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "Rader: {0} har \"Betalning Post\" som referens typ. Detta ska inte anges manuellt." @@ -46421,7 +46465,7 @@ msgstr "Regelutvärdering slutförd" msgid "Rules evaluation started" msgstr "Regelutvärdering påbörjad" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "Regler för Namngivning Serie Konfigurering" @@ -46719,7 +46763,7 @@ msgstr "Försäljning Inköp Pris" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46893,7 +46937,7 @@ msgstr "Försäljning Möjligheter efter Källa" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -47016,8 +47060,8 @@ msgstr "Försäljning Order erfordras för Artikel {0}" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "Försäljning Order {0} finns redan mot Kund Inköp Order {1}. För att tillåta flera Försäljning Ordrar, aktivera {2} i {3}" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "Försäljning Order {0} är inte tillgänglig för produktion" @@ -47428,7 +47472,7 @@ msgstr "Samma Artikel" msgid "Same day" msgstr "Samma dag" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "Samma artikel och lager kombination är redan angivna." @@ -47465,7 +47509,7 @@ msgstr "Prov Lager" msgid "Sample Size" msgstr "Prov Kvantitet" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "Prov Kvantitet {0} kan inte vara högre än mottagen kvantitet {1}" @@ -47756,7 +47800,7 @@ msgstr "Sök efter Artikel Kod, Serie Nummer eller Streck/QR Kod" msgid "Search company..." msgstr "Sök bolag..." -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "Sök transaktioner" @@ -47901,7 +47945,7 @@ msgstr "Välj Märke..." msgid "Select Columns and Filters" msgstr "Välj Kolumner och Filter" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "Välj Bolag" @@ -48597,7 +48641,7 @@ msgstr "Serienummer Intervall" msgid "Serial No Reserved" msgstr "Serienummer Reserverad" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "Serienummer Serie Överlappning" @@ -48658,7 +48702,7 @@ msgstr "Serie Nummer erfordras" msgid "Serial No is mandatory for Item {0}" msgstr "Serie Nummer erfordras för Artikel {0}" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "Serie Nummer {0} finns redan" @@ -48944,7 +48988,7 @@ msgstr "Serienummer är inte tillgängliga för artikel {0} under lager {1}. Fö #: 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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48970,7 +49014,7 @@ msgstr "Serienummer är inte tillgängliga för artikel {0} under lager {1}. Fö #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49368,12 +49412,6 @@ msgstr "Till Lager" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "Ange Grund Pris Baserad på Från Lager" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "Ange Grund Pris för Avvisad Material" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "Välj Lager" @@ -49479,6 +49517,12 @@ msgstr "Ange detta värde som 0 för att inaktivera funktion." msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "Ange regler för att automatiskt klassificera transaktioner. Dra och släpp regler för att ändra deras prioritet." +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "Ange Grund Pris för Avvisade Material" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "Ange {0} i Tillgång Kategori {1} för Bolag {2}" @@ -49977,7 +50021,7 @@ msgstr "Visa Saldo i Kontoplan" msgid "Show Barcode Field in Stock Transactions" msgstr "Visa Streck/QR Kod Fält i Lager Transaktioner" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "Visa Avbrutna Poster" @@ -49985,7 +50029,7 @@ msgstr "Visa Avbrutna Poster" msgid "Show Completed" msgstr "Visa Klar" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "Visa Kredit / Debet i Bolag Valuta" @@ -50068,7 +50112,7 @@ msgstr "Visa Länkade Försäljning Följesedlar" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "Visa Nettovärde i Parti Konto" @@ -50080,7 +50124,7 @@ msgstr "Visa Endast Exakt Belopp" msgid "Show Open" msgstr "Visa Öppna" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "Visa Öppning Poster" @@ -50093,11 +50137,6 @@ msgstr "Visa Öppning och Stängning Saldo" msgid "Show Operations" msgstr "Visa Åtgärder" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "Visa Betala Knapp i Portal" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "Visa Betalning Detaljer" @@ -50113,7 +50152,7 @@ msgstr "Visa Betalning Villkor" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "Visa Anmärkningar" @@ -50180,6 +50219,11 @@ msgstr "Visa endast Kassa" msgid "Show only the Immediate Upcoming Term" msgstr "Visa endast Omedelbart Kommande Villkor" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "Visa betala knapp i Inköp Order Portal" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "Visa väntande poster" @@ -50468,11 +50512,11 @@ msgstr "Från Produktion Post" msgid "Source Stock Entry (Manufacture)" msgstr "Från Produktion Post (Produktion)" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "Från Lager Post {0} tillhör arbetsorder {1}, inte {2}. Använd produktion post från samma Arbetsorder." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "Från Lager Post {0} har inte färdig artikel kvantitet" @@ -50538,7 +50582,7 @@ msgstr "Lager {0} måste vara samma som Kund Lager {1} i Intern Underleverantör msgid "Source and Target Location cannot be same" msgstr "Hämta och Lämna Plats kan inte vara samma" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "Från och Till Lager kan inte vara samma för rad {0}" @@ -50552,8 +50596,8 @@ msgid "Source of Funds (Liabilities)" msgstr "Skulder" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "Från Lager erfordras för rad {0}" @@ -50718,8 +50762,8 @@ msgstr "Standard Klassade Kostnader" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "Standard Försäljning" @@ -51052,7 +51096,7 @@ msgstr "Lagerstängning Logg" msgid "Stock Details" msgstr "Lager Detaljer" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "Lager Poster redan skapade för Arbetsorder {0}: {1}" @@ -51323,7 +51367,7 @@ msgstr "Lager Mottagen men ej Fakturerad Konto" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51335,7 +51379,7 @@ msgstr "Inventering" msgid "Stock Reconciliation Item" msgstr "Inventering Post" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "Lager Inventeringar" @@ -51373,7 +51417,7 @@ msgstr "Lager Ombokning Inställningar" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51401,7 +51445,7 @@ msgstr "Lager Reservation Poster Annullerade" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "Lager Reservation Poster Skapade" @@ -51783,7 +51827,7 @@ msgstr "Stoppad Arbetsorder kan inte annulleras, Ångra först för att annuller #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "Butiker" @@ -51861,10 +51905,6 @@ msgstr "Underåtgärder" msgid "Sub Procedure" msgstr "Underprocedur" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "Delsumma" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "Underenhet Referenser saknas. Hämta underenheter och råmaterial igen." @@ -52081,7 +52121,7 @@ msgstr "Intern Order Service Artikel" msgid "Subcontracting Order" msgstr "Underleverantör Order" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52107,7 +52147,7 @@ msgstr "Order Service Artikel" msgid "Subcontracting Order Supplied Item" msgstr "Order Levererad Artikel" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "Order {0} skapad." @@ -52196,7 +52236,7 @@ msgstr "Underleverantör Inställningar" msgid "Subdivision" msgstr "Underavdelning" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "Godkännande Misslyckades" @@ -52371,7 +52411,7 @@ msgstr "Avstämd" msgid "Successfully Set Supplier" msgstr "Leverantör vald" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "Lager Enhet ändrad, ändra konvertering faktor för ny enhet." @@ -52527,6 +52567,7 @@ msgstr "Levererad Kvantitet" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52568,8 +52609,8 @@ msgstr "Levererad Kvantitet" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52617,6 +52658,12 @@ msgstr "Leverantör Adresser och Kontakter" msgid "Supplier Contact" msgstr "Leverantör Kontakt" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "Leverantörens Standard Inställningar" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52711,7 +52758,7 @@ msgstr "Leverantör Faktura Datum" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "Leverantör Faktura Nummer" @@ -52991,19 +53038,10 @@ msgstr "Leverantör av Varor eller Tjänster" msgid "Supplier {0} not found in {1}" msgstr "Leverantör {0} hittas inte i {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Leverantör(er)" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "Inköp Statistik per Leverantör" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53065,7 +53103,7 @@ msgstr "Support Team" msgid "Support Tickets" msgstr "Support Ärende" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "Variabler som stöds:" @@ -53325,8 +53363,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "Lager {0} måste vara samma som Leverans Lager {1} i Intern Underleverantör Order." #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "Till Lager erfordras för rad {0}" @@ -53795,7 +53833,7 @@ msgstr "Moms avdragen endast för belopp som överstiger kumulativ tröskel" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "Moms Belopp" @@ -53956,7 +53994,7 @@ msgstr "Moms och Avgifter Avdragna" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "Moms och Avgifter Avdragna (Bolag Valuta)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "Momsrad #{0}: {1} kan inte vara lägre än {2}" @@ -54146,7 +54184,6 @@ msgstr "Villkor Mall" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54338,7 +54375,7 @@ msgstr "Åtkomst till Inköp Offert från Portal är inaktiverad. För att till msgid "The BOM which will be replaced" msgstr "Stycklista före" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "Parti {0} har negativ parti kvantitet {1}. För att åtgärda detta, gå till Parti Inställningar och aktivera Räkna om Parti Kvantitet. Om problemet kvarstår, skapa intern post." @@ -54382,7 +54419,7 @@ msgstr "Betalning Villkor på rad {0} är eventuellt dubblett." 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 "Plocklista med Lager Reservation kan inte uppdateras. Om ändringar behöver göras rekommenderas annullering av befintlig Lager Reservation innan uppdatering av Plocklista." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "Process Förlust Kvantitet är återställd enligt Jobbkort Process Förlust Kvantitet" @@ -54398,7 +54435,7 @@ msgstr "Serie Nummer på rad #{0}: {1} är inte tillgänglig i lager {2}." msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "Serienummer {0} är reserverad för {1} {2} och får inte användas för någon annan transaktion." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "Serie och Parti Paket {0} är inte giltigt för denna transaktion. \"Typ av Transaktion\" ska vara \"Extern\" istället för \"Intern\" i Serie och Parti Paket {0}" @@ -54434,7 +54471,7 @@ msgstr "Bankkonto är inaktiverad. Aktivera det" msgid "The bank account is not a company account. Please select a company account" msgstr "Bank konto är inte bolag konto. Välj bolag konto" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "Parti {0} är redan reserverad i {1} {2}. Därför kan vi inte gå vidare med {3} {4}, som skapas mot {5} {6}." @@ -54540,7 +54577,7 @@ msgstr "Följande partier är utgångna, fyll på dem:
{0}" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "Följande avbrutna återpublicering poster finns för {0}:

{1}

Radera dessa poster innan du fortsätter." -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "Följande raderade egenskaper finns i varianter men inte i mall. Antingen ta bort varianter eller behålla egenskaper i mall." @@ -54585,15 +54622,15 @@ msgstr "Helgdag {0} är inte mellan Från Datum och Till Datum" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "Faktura är inte fullt tilldelad eftersom det finns skillnad på {0}." -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "Artikel {item} är inte angiven som {type_of} artikel. Du kan aktivera det som {type_of} artikel från dess Artikel Inställningar." -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "Artiklar {0} och {1} finns i följande {2}:" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "Artiklar {items} är inte angivna som {type_of} artiklar. Du kan aktivera dem som {type_of} artiklar från deras Artikel Inställningar." @@ -54749,7 +54786,7 @@ msgstr "Aktier finns inte med {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "Lager för artikel {0} i {1} lager var negativt {2}. Skapa positiv post {3} före {4} och {5} för att bokföra rätt grund pris. För mer information, läs dokumentation ." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "Lager är reserverad för följande Artiklar och Lager, ta bort reservation till {0} Lager Inventering :

{1}" @@ -54771,11 +54808,11 @@ msgstr "System kommer att försöka automatiskt stämma av part till bank transa 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 "System kommer att skapa Försäljning Faktura eller Kassa Faktura från Kassa baserat på denna inställning. För transaktioner med stora volymer rekommenderas att Kassa Faktura används." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "Uppgift är i kö som bakgrund jobb. Om det finns problem med behandling i bakgrund kommer system att lägga till kommentar om fel i denna Lager Inventering och återgå till Utkast status." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "Uppgift är i kö som ett bakgrund jobb. Om det finns några problem med bearbetning i bakgrund kommer system att lägga till kommentar om fel på denna Lager Inventering och återgå till Godkänd status" @@ -54847,7 +54884,7 @@ msgstr "{0} ({1}) måste vara lika med {2} ({3})" msgid "The {0} contains Unit Price Items." msgstr "{0} innehåller Enhet Pris Artiklar." -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "Prefix {0} '{1}' finns redan. Ändra serienummer, annars blir det dubblett post." @@ -54900,7 +54937,7 @@ msgstr "Det finns inga poster i system där klarering datum är före bokföring msgid "There are no slots available on this date" msgstr "Det finns inga lediga tider för detta datum" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "Det finns inga transaktioner i system för vald bankkonto och datum som stämmer med filter." @@ -54944,7 +54981,7 @@ msgstr "Det finns ingen Parti mot {0}: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "Det finns en ej avstämd transaktion före {0}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "Det måste finnas minst en färdig artikel i denna Lager Post" @@ -55000,11 +55037,11 @@ msgstr "Artikel är variant av {0} (Mall)." msgid "This Month's Summary" msgstr "Månads Översikt" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "Denna Inköp Order har lagts ut helt på underleverantörsleverantör." -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "Denna Försäljning Order har lagts ut helt på underleverantörsleverantör." @@ -55805,7 +55842,7 @@ msgstr "För att inkludera delmontering kostnader och sekundära artiklar i Fär msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "Att inkludera moms på rad {0} i artikel pris, moms i rader {1} måste också inkluderas" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "Att slå samman, måste följande egenskaper vara samma för båda artiklar" @@ -55840,7 +55877,7 @@ msgstr "Att använda annan finans register, inaktivera \"Inkludera Standard Fina #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "Att använda annan finans register, inaktivera \"Inkludera Standard Finans Register Tillgångar\"" @@ -55991,7 +56028,7 @@ msgstr "Totala Tilldelningar" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Totalt Belopp" @@ -56414,7 +56451,7 @@ msgstr "Totalt Betalning Begäran kan inte överstiga {0} belopp" msgid "Total Payments" msgstr "Totala Betalningar" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "Plockad Kvantitet {0} är mer än order kvantitet {1}. Du kan ange överplock tillåtelse i Lager Inställningar." @@ -56446,7 +56483,7 @@ msgstr "Totalt Inköp Kostnad (via Inköp Faktura)" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Totalt Kvantitet" @@ -56832,7 +56869,7 @@ msgstr "Spårning URL" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56843,7 +56880,7 @@ msgstr "Transaktion" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "Transaktion Valuta" @@ -57515,11 +57552,11 @@ msgstr "UAE VAT Inställningar" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57591,7 +57628,7 @@ msgstr "Enhet Konvertering Faktor erfordras på rad {0}" msgid "UOM Name" msgstr "Enhet Namn" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "Enhet Konvertering Faktor erfordras för Enhet: {0} för Artikel: {1}" @@ -57667,7 +57704,7 @@ msgstr "Kunde inte att hitta resultatkort från {0}. Du måste ha stående resul msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "Kunde inte att hitta tider under de kommande {0} dagarna för åtgärd {1}. Öka \"Kapacitet Planering för (Dagar)\" i {2}." -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "Kan inte hitta variabel:" @@ -57786,7 +57823,7 @@ msgstr "Enhet" msgid "Unit of Measure (UOM)" msgstr "Enhet" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "Enhet {0} är angiven mer än en gång i Konvertering Faktor Tabell" @@ -57906,10 +57943,9 @@ msgid "Unreconcile Transaction" msgstr "Ångra Transaktion" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "Ej Avstämd" @@ -57932,10 +57968,6 @@ msgstr "Ej Avstämda Poster" msgid "Unreconciled Transactions" msgstr "Ej Avstämda Transaktioner" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "Avstämning ångrad" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57981,7 +58013,7 @@ msgstr "Ej Schemalagd" msgid "Unsecured Loans" msgstr "Osäkrade Lån" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "Ångra Avstämd Betalning Begäran" @@ -58196,12 +58228,6 @@ msgstr "Uppdatera Lager" msgid "Update Type" msgstr "Uppdatering Typ" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "Inköp Uppdatering Intervall" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58242,7 +58268,7 @@ msgstr "Uppdaterad {0} Finans Rapport Rad(er) med ny kategori namn" msgid "Updating Costing and Billing fields against this Project..." msgstr "Uppdaterar Kostnad och Fakturering fält för Projekt..." -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "Uppdaterar Varianter..." @@ -58700,12 +58726,6 @@ msgstr "Validera Tillämpad Regel" msgid "Validate Components and Quantities Per BOM" msgstr "Validera Komponenter och Kvantitet per Stycklista" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "Validera Förbrukad Kvantitet (Enligt Stycklista)" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58729,6 +58749,12 @@ msgstr "Validera Prissättning Regel" msgid "Validate Stock on Save" msgstr "Validera Lager på Spara" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "Validera Förbrukad Kvantitet (Enligt Stycklista)" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58835,11 +58861,11 @@ msgstr "Grund Pris Saknas" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "Grund Pris för Artikel {0} erfordras att skapa bokföring poster för {1} {2}." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "Grund Pris erfordras om Öppning Lager anges" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "Grund Pris erfordras för Artikel {0} på rad {1}" @@ -58849,7 +58875,7 @@ msgstr "Grund Pris erfordras för Artikel {0} på rad {1}" msgid "Valuation and Total" msgstr "Grund Pris och Totalt" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "Grund Pris för Kund Försedda Artiklar angavs till noll." @@ -58999,7 +59025,7 @@ msgstr "Avvikelse ({})" msgid "Variant" msgstr "Variant" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "Variant Egenskap Fel" @@ -59018,7 +59044,7 @@ msgstr "Variant Stycklista" msgid "Variant Based On" msgstr "Variant Baserad På" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "Variant Baserad På kan inte ändras" @@ -59036,7 +59062,7 @@ msgstr "Variant Fält" msgid "Variant Item" msgstr "Variant Artikel" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "Variant Artiklar" @@ -59417,7 +59443,7 @@ msgstr "Verifikat Namn" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59457,7 +59483,7 @@ msgstr "Kvantitet" #. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "Verifikat Undertyp" @@ -59489,7 +59515,7 @@ msgstr "Verifikat Undertyp" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59724,7 +59750,7 @@ msgstr "Lagret {0} finns inte" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "Lager {0} är inte tillåtet för Försäljning Order {1}, det ska vara {2}" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "Lager {0} är inte länkad till något konto. Ange konto i lager post eller ange standard konto för lager i bolag {1}." @@ -59771,7 +59797,7 @@ msgstr "Lager med befintlig transaktion kan inte konverteras till Register." #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59827,6 +59853,12 @@ msgstr "Varna för nya Inköp Offerter" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "Varna eller stoppa om artikel pris ändras i följesedlar och försäljning fakturor som skapas från försäljning order." +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "Varna eller stoppa om artikelpris ändras i Inköp Faktura eller Inköp Kvitto som skapas från Inköp Order." + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "Varning - Rad # {0}: Fakturerbara timmar är fler än Faktiska Timmar" @@ -60010,7 +60042,7 @@ msgstr "Webbshop Specifikationer" msgid "Website:" msgstr "Webbplats:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "Årets Vecka" @@ -60384,7 +60416,7 @@ msgstr "Arbetsorder Förbrukad Material" msgid "Work Order Item" msgstr "Arbetsorder Artikel" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "Avvikande Arbetsorder" @@ -60446,11 +60478,11 @@ msgstr "Arbetsorder inte skapad" msgid "Work Order {0} created" msgstr "Arbetsorder {0} skapad" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "Arbetsorder {0} har inte producerad kvantitet" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "Arbetsorder {0}: Jobbkort hittades inte för Åtgärd {1}" @@ -60766,11 +60798,11 @@ msgstr "År Namn" msgid "Year Start Date" msgstr "Start Datum" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "Årtal med 2 siffror" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "Årtal med 4 siffror" @@ -60823,7 +60855,7 @@ msgstr "Du kan också kopiera och klistra in den här länken i din webbläsare" msgid "You can also set default CWIP account in Company {}" msgstr "Du kan också ange standard Kapital Arbete Pågår konto i Bolag {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "Du kan också använda variabler i namngivning serie namn genom att placera dem mellan (.) punkter" @@ -60977,6 +61009,10 @@ msgstr "Du har inte behörighet att skapa bolag adress. Kontakta Systemansvarig. msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "Du har inte behörighet att uppdatera bolag detaljer. Kontakta Systemansvarig." +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "Du har inte behörighet att uppdatera Mottagen Kvantitet Dokument för artikel {0}" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "Du har inte behörighet att uppdatera detta dokument. Kontakta Systemansvarig." @@ -61005,7 +61041,7 @@ msgstr "Du har aktiverat {0} och {1} i {2}. Detta kan leda till att priser från msgid "You have entered a duplicate Delivery Note on Row" msgstr "Du har angett dubblett Försäljning Följesedel på Rad" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "Du har inte lagt till några bank konto i ditt bolag." @@ -61013,7 +61049,7 @@ msgstr "Du har inte lagt till några bank konto i ditt bolag." msgid "You have not performed any reconciliations in this session yet." msgstr "Du har inte utfört några avstämningar i denna sessionen ännu." -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "Du måste aktivera automatisk ombeställning i lager inställningar för att behålla ombeställning nivåer." @@ -61084,8 +61120,11 @@ msgstr "Noll Sats" msgid "Zero quantity" msgstr "Noll Kvantitet" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "Artikelrader med Noll Kvantitet" @@ -61197,7 +61236,7 @@ msgstr "exchangerate.host" msgid "fieldname" msgstr "Fält Namn " -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "fältnamn i dokument, t.ex." @@ -61415,6 +61454,10 @@ msgstr "valda transaktioner" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "unik t.ex. SPARA20 Används för att få rabatt" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "uppdaterade levererad kvantitet för artikel {0} till {1}" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "avvikelse" @@ -61473,7 +61516,8 @@ msgstr "{0} Kupong som användes är {1}. Tillåten kvantitet är förbrukad" msgid "{0} Digest" msgstr "{0} Översikt" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "{0} Namngivning Serie" @@ -61493,7 +61537,7 @@ msgstr "{0} Åtgärder: {1}" msgid "{0} Request for {1}" msgstr "{0} Begäran för {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} Behåll Prov är baserad på Parti. välj Har Parti Nummer att behålla prov på Artikel" @@ -61606,7 +61650,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} angiven två gånger under Artikel Moms" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "{0} angiven två gånger {1} under Artikel Moms" @@ -61774,7 +61818,7 @@ msgstr "{0} parameter är ogiltig" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} betalning poster kan inte filtreras efter {1}" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "{0} kvantitet av artikel {1} tas emot i Lager {2} med kapacitet {3}." @@ -61787,7 +61831,7 @@ msgstr "{0} till {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "{0} transaktioner kommer att importeras till system. Granska information nedan och klicka på knapp \"Importera\" för att fortsätta." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "{0} enheter är reserverade för Artikel {1} i Lager {2}, ta bort reservation för {3} Lager Inventering." @@ -61989,7 +62033,7 @@ msgstr "{0} {1}: Konto {2} är inaktiv" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: Bokföring Post för {2} kan endast skapas i valuta: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: Resultat Enhet erfordras för Artikel {2}" @@ -62075,23 +62119,23 @@ msgstr "{0}: {1} finns inte" msgid "{0}: {1} is a group account." msgstr "{0}: {1} är grupp konto." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} måste vara mindre än {2}" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "{count} Tillgångar skapade för {item_code}" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} är annullerad eller stängd." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "{item_name} Prov Kvantitet ({sample_size}) kan inte vara högre än accepterad kvantitete ({accepted_quantity})" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "{ref_doctype} {ref_name} är {status}." diff --git a/erpnext/locale/th.po b/erpnext/locale/th.po index e6c71e7e919..59bf240ceae 100644 --- a/erpnext/locale/th.po +++ b/erpnext/locale/th.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:21\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:21\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Thai\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr " ส่วนประกอบย่อย" msgid " Summary" msgstr " สรุป" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"สินค้าที่ลูกค้าจัดเตรียมให้\" ไม่สามารถเป็นสินค้าที่ซื้อได้เช่นกัน" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"รายการที่ลูกค้าจัดเตรียมไว้\" ไม่สามารถมีอัตราการประเมินค่าได้" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "ไม่สามารถยกเลิกการเลือก \"เป็นสินทรัพย์ถาวร\" ได้ เนื่องจากมีบันทึกสินทรัพย์อยู่ในรายการ" @@ -302,7 +302,7 @@ msgstr "กรุณากรอก 'ตั้งแต่วันที่'" msgid "'From Date' must be after 'To Date'" msgstr "จากวันที่ ต้องอยู่หลัง ถึงวันที่" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "มีหมายเลขซีเรียล ไม่สามารถเป็น ใช่ สำหรับสินค้าที่ไม่ใช่สต็อก" @@ -338,7 +338,7 @@ msgstr "อัปเดตสต็อก ไม่สามารถเลื msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "อัปเดตสต็อก ไม่สามารถเลือกได้สำหรับการขายสินทรัพย์ถาวร" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "บัญชี '{0}' ถูกใช้โดย {1} แล้ว ใช้บัญชีอื่น" @@ -1099,7 +1099,7 @@ msgstr "ต้องกำหนดคนขับเพื่อดำเนิ msgid "A logical Warehouse against which stock entries are made." msgstr "คลังสินค้าเชิงตรรกะที่ใช้บันทึกรายการสต็อก" -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "เกิดความขัดแย้งในชุดการตั้งชื่อขณะสร้างหมายเลขลำดับต่อเนื่อง กรุณาเปลี่ยนชุดการตั้งชื่อสำหรับรายการนี้ {0}" @@ -1311,7 +1311,7 @@ msgstr "จำเป็นต้องมีคีย์การเข้าถ msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "ตาม CEFACT/ICG/2010/IC013 หรือ CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "ตามรายการวัตถุดิบ (BOM) {0}, สินค้า '{1}' ไม่มีอยู่ในรายการบันทึกสต็อก" @@ -1981,8 +1981,8 @@ msgstr "รายการทางบัญชี" msgid "Accounting Entry for Asset" msgstr "รายการทางบัญชีสำหรับสินทรัพย์" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "รายการทางบัญชีสำหรับ LCV ในรายการสต็อก {0}" @@ -1990,7 +1990,7 @@ msgstr "รายการทางบัญชีสำหรับ LCV ใน msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "รายการทางบัญชีสำหรับใบสำคัญต้นทุนที่ดินสำหรับ SCR {0}" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "รายการทางบัญชีสำหรับบริการ" @@ -2003,16 +2003,16 @@ msgstr "รายการทางบัญชีสำหรับบริก #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "รายการทางบัญชีสำหรับสต็อก" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "รายการทางบัญชีสำหรับ {0}" @@ -2310,12 +2310,6 @@ msgstr "การดำเนินการหากไม่มีการส msgid "Action If Quality Inspection Is Rejected" msgstr "การดำเนินการหากการตรวจสอบคุณภาพถูกปฏิเสธ" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "การดำเนินการหากไม่รักษาอัตราเดิม" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "การดำเนินการเริ่มต้น" @@ -2374,6 +2368,12 @@ msgstr "การดำเนินการหากงบประมาณป msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "การดำเนินการหากอัตราเดียวกันไม่ได้รับการรักษาไว้ตลอดการทำธุรกรรมภายใน" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2641,7 +2641,7 @@ msgstr "เวลาจริงเป็นชั่วโมง (จากแ msgid "Actual qty in stock" msgstr "จำนวนจริงในสต็อก" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "ไม่สามารถรวมภาษีประเภทจริงในอัตราของรายการในแถว {0}" @@ -2655,7 +2655,7 @@ msgstr "จำนวนเฉพาะกิจ" msgid "Add / Edit Prices" msgstr "เพิ่ม / แก้ไขราคา" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "เพิ่มคอลัมน์ในสกุลเงินของรายการธุรกรรม" @@ -2809,7 +2809,7 @@ msgstr "เพิ่มหมายเลขซีเรียล / หมาย msgid "Add Serial / Batch No (Rejected Qty)" msgstr "เพิ่มหมายเลขซีเรียล/ชุดการผลิต (จำนวนที่ถูกปฏิเสธ)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -3054,7 +3054,7 @@ msgstr "จำนวนส่วนลดเพิ่มเติม" msgid "Additional Discount Amount (Company Currency)" msgstr "จำนวนส่วนลดเพิ่มเติม (สกุลเงินบริษัท)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "จำนวนส่วนลดเพิ่มเติม ({discount_amount}) ไม่สามารถเกินจำนวนทั้งหมดก่อนส่วนลดดังกล่าว ({total_before_discount})" @@ -3343,7 +3343,7 @@ msgstr "ปรับจำนวน" msgid "Adjustment Against" msgstr "การปรับปรุงหักล้าง" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "การปรับปรุงตามอัตราใบแจ้งหนี้ซื้อ" @@ -3456,7 +3456,7 @@ msgstr "ประเภทบัตรกำนัลล่วงหน้า" msgid "Advance amount" msgstr "จำนวนเงินล่วงหน้า" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "จำนวนเงินล่วงหน้าไม่สามารถมากกว่า {0} {1}" @@ -3525,7 +3525,7 @@ msgstr "คัดค้าน" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "เทียบกับบัญชี" @@ -3643,7 +3643,7 @@ msgstr "อ้างอิงใบแจ้งหนี้ผู้จัดจ #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "อ้างอิงใบสำคัญ" @@ -3667,7 +3667,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "อ้างอิงประเภทใบสำคัญ" @@ -3948,7 +3948,7 @@ msgstr "การสื่อสารทั้งหมดรวมถึงท msgid "All items are already requested" msgstr "สินค้าทุกรายการถูกร้องขอแล้ว" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "สินค้าทุกรายการถูกออกใบแจ้งหนี้/คืนแล้ว" @@ -3956,7 +3956,7 @@ msgstr "สินค้าทุกรายการถูกออกใบแ msgid "All items have already been received" msgstr "ได้รับสินค้าทุกรายการแล้ว" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "สินค้าทุกรายการสำหรับใบสั่งงานนี้ถูกโอนย้ายแล้ว" @@ -4005,7 +4005,7 @@ msgstr "จัดสรร" msgid "Allocate Advances Automatically (FIFO)" msgstr "จัดสรรเงินทดรองจ่ายอัตโนมัติ (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "จัดสรรจำนวนเงินที่ชำระ" @@ -4015,7 +4015,7 @@ msgstr "จัดสรรจำนวนเงินที่ชำระ" msgid "Allocate Payment Based On Payment Terms" msgstr "จัดสรรการชำระเงินตามเงื่อนไขการชำระเงิน" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "จัดสรรคำขอชำระเงิน" @@ -4045,7 +4045,7 @@ msgstr "จัดสรรแล้ว" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4166,15 +4166,15 @@ msgstr "อนุญาตในการคืนสินค้า" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "อนุญาตการโอนย้ายภายในตามราคาตลาด" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "อนุญาตให้เพิ่มสินค้าหลายครั้งในหนึ่งธุรกรรม" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "อนุญาตให้เพิ่มสินค้าหลายครั้งในหนึ่งธุรกรรม" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4203,12 +4203,6 @@ msgstr "อนุญาตสต็อกติดลบ" msgid "Allow Negative Stock for Batch" msgstr "อนุญาตให้สต็อกติดลบสำหรับชุดการผลิต" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "อนุญาตอัตราติดลบสำหรับสินค้า" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4421,8 +4415,11 @@ msgstr "อนุญาตใบแจ้งหนี้หลายสกุล msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4514,7 +4511,7 @@ msgstr "อนุญาตให้ทำธุรกรรมกับ" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "บทบาทหลักที่อนุญาตคือ 'ลูกค้า' และ 'ผู้จัดจำหน่าย' กรุณาเลือกหนึ่งในบทบาทเหล่านี้เท่านั้น" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4711,7 +4708,7 @@ msgstr "ถามเสมอ" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4741,7 +4738,6 @@ msgstr "ถามเสมอ" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4911,10 +4907,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "จำนวนเงินในสกุลเงินของบัญชี" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "จำนวนเงิน (ตัวอักษร)" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5534,7 +5526,7 @@ msgstr "เนื่องจากฟิลด์ {0} ถูกเปิดใ msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "เนื่องจากฟิลด์ {0} ถูกเปิดใช้งาน ค่าของฟิลด์ {1} ควรมากกว่า 1" -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "เนื่องจากมีธุรกรรมที่ส่งแล้วที่เกี่ยวข้องกับรายการ {0} คุณไม่สามารถเปลี่ยนค่าของ {1} ได้" @@ -5684,7 +5676,7 @@ msgstr "บัญชีหมวดหมู่สินทรัพย์" msgid "Asset Category Name" msgstr "ชื่อหมวดหมู่สินทรัพย์" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "หมวดหมู่สินทรัพย์เป็นฟิลด์บังคับสำหรับรายการสินทรัพย์ถาวร" @@ -6080,7 +6072,7 @@ msgstr "สินทรัพย์ {0} ยังไม่ได้รับก msgid "Asset {0} must be submitted" msgstr "สินทรัพย์ {0} ต้องถูกส่ง" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "สินทรัพย์ {assets_link} ถูกสร้างสำหรับ {item_code}" @@ -6118,11 +6110,11 @@ msgstr "สินทรัพย์" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "สินทรัพย์ไม่ได้ถูกสร้างสำหรับ {item_code} คุณจะต้องสร้างสินทรัพย์ด้วยตนเอง" -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "สินทรัพย์ {assets_link} ถูกสร้างสำหรับ {item_code}" @@ -6195,7 +6187,7 @@ msgstr "ต้องมีวัตถุดิบอย่างน้อยห msgid "At least one row is required for a financial report template" msgstr "จำเป็นต้องมีอย่างน้อยหนึ่งแถวสำหรับแม่แบบรายงานทางการเงิน" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "ต้องระบุคลังสินค้าอย่างน้อยหนึ่งแห่ง" @@ -6227,7 +6219,7 @@ msgstr "ที่แถว {0}: ปริมาณเป็นสิ่งจำ msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "ที่แถว {0}: หมายเลขซีเรียลเป็นสิ่งจำเป็นสำหรับสินค้า {1}" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "ที่แถว {0}: ชุดซีเรียลและชุดการผลิต {1} ถูกสร้างขึ้นแล้ว กรุณาลบค่าออกจากช่องหมายเลขซีเรียลหรือหมายเลขชุดการผลิต" @@ -6291,7 +6283,11 @@ msgstr "ชื่อคุณลักษณะ" msgid "Attribute Value" msgstr "ค่าคุณลักษณะ" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "ตารางคุณลักษณะเป็นสิ่งจำเป็น" @@ -6299,11 +6295,19 @@ msgstr "ตารางคุณลักษณะเป็นสิ่งจำ msgid "Attribute value: {0} must appear only once" msgstr "ค่าคุณลักษณะ: {0} ต้องปรากฏเพียงครั้งเดียว" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "คุณลักษณะ {0} ถูกเลือกหลายครั้งในตารางคุณลักษณะ" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "คุณลักษณะ" @@ -6363,24 +6367,12 @@ msgstr "มูลค่าที่ได้รับอนุมัติ" msgid "Auto Create Exchange Rate Revaluation" msgstr "สร้างการตีราคาอัตราแลกเปลี่ยนใหม่โดยอัตโนมัติ" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "สร้างใบรับสินค้าอัตโนมัติ" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "สร้างชุดซีเรียลและชุดการผลิตอัตโนมัติสำหรับขาออก" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "สร้างใบสั่งจ้างเหมาช่วงอัตโนมัติ" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6499,6 +6491,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "ปิดโอกาสทางการขายที่ตอบกลับแล้วโดยอัตโนมัติหลังจากจำนวนวันที่ระบุไว้ข้างต้น" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6716,7 +6720,7 @@ msgstr "วันที่พร้อมใช้งาน" msgid "Available for use date is required" msgstr "ต้องระบุวันที่พร้อมใช้งาน" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "ปริมาณที่มีอยู่คือ {0} คุณต้องการ {1}" @@ -6815,7 +6819,7 @@ msgstr "BFS" msgid "BIN Qty" msgstr "ปริมาณในช่องเก็บ" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7088,7 +7092,7 @@ msgstr "รายการ BOM บนเว็บไซต์" msgid "BOM Website Operation" msgstr "การดำเนินการ BOM บนเว็บไซต์" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "ปริมาณ BOM และสินค้าสำเร็จรูปเป็นข้อมูลที่จำเป็นสำหรับการถอดประกอบ" @@ -7179,8 +7183,8 @@ msgstr "เบิกจ่ายวัตถุดิบจากคลังส #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "เบิกจ่ายวัตถุดิบของงานเหมาช่วงตาม" +msgid "Backflush raw materials of subcontract based on" +msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7200,7 +7204,7 @@ msgstr "ยอดคงเหลือ" msgid "Balance (Dr - Cr)" msgstr "ยอดคงเหลือ (เดบิต - เครดิต)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "ยอดคงเหลือ ({0})" @@ -7731,11 +7735,11 @@ msgstr "การธนาคาร" msgid "Barcode Type" msgstr "ประเภทบาร์โค้ด" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "บาร์โค้ด {0} ถูกใช้แล้วในสินค้า {1}" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "บาร์โค้ด {0} ไม่ใช่รหัส {1} ที่ถูกต้อง" @@ -8102,12 +8106,12 @@ msgstr "แบทช์ {0} และคลังสินค้า" msgid "Batch {0} is not available in warehouse {1}" msgstr "แบทช์ {0} ไม่มีในคลังสินค้า {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "แบทช์ {0} ของสินค้า {1} หมดอายุแล้ว" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "แบทช์ {0} ของสินค้า {1} ถูกปิดใช้งาน" @@ -8180,8 +8184,8 @@ msgstr "เลขที่บิล" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "เรียกเก็บเงินสำหรับปริมาณที่ถูกปฏิเสธในใบแจ้งหนี้ซื้อ" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8521,8 +8525,11 @@ msgstr "รายการในใบสั่งซื้อแบบครอ msgid "Blanket Order Rate" msgstr "อัตราในใบสั่งซื้อแบบครอบคลุม" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -9037,7 +9044,7 @@ msgstr "การซื้อและขาย" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "ต้องเลือก 'การซื้อ' หาก 'ใช้สำหรับ' ถูกเลือกเป็น {0}" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "โดยค่าเริ่มต้น ชื่อซัพพลายเออร์จะถูกตั้งค่าตามชื่อซัพพลายเออร์ที่ป้อน หากคุณต้องการให้ซัพพลายเออร์ถูกตั้งชื่อตาม ชุดการตั้งชื่อ ให้เลือกตัวเลือก 'ชุดการตั้งชื่อ'" @@ -9402,7 +9409,7 @@ msgstr "ไม่สามารถกรองตามเลขที่ใบ msgid "Can only make payment against unbilled {0}" msgstr "สามารถชำระเงินได้เฉพาะกับ {0} ที่ยังไม่ได้เรียกเก็บเงิน" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9458,9 +9465,9 @@ msgstr "ไม่สามารถเปลี่ยนการตั้งค msgid "Cannot Create Return" msgstr "ไม่สามารถสร้างรายการคืนสินค้าได้" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "ไม่สามารถรวมได้" @@ -9488,7 +9495,7 @@ msgstr "ไม่สามารถแก้ไข {0} {1} ได้ กรุ msgid "Cannot apply TDS against multiple parties in one entry" msgstr "ไม่สามารถใช้หัก ณ ที่จ่ายกับหลายคู่ค้าในรายการเดียวได้" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "ไม่สามารถเป็นสินทรัพย์ถาวรได้เนื่องจากมีการสร้างบัญชีแยกประเภทสต็อกแล้ว" @@ -9524,7 +9531,7 @@ msgstr "ไม่สามารถยกเลิกการบันทึก msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "ไม่สามารถยกเลิกเอกสารนี้ได้ เนื่องจากเอกสารนี้เชื่อมโยงกับการปรับปรุงมูลค่าสินทรัพย์ที่ยื่นไว้แล้ว {0}กรุณายกเลิกการปรับปรุงมูลค่าสินทรัพย์เพื่อดำเนินการต่อ" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "ไม่สามารถยกเลิกเอกสารนี้ได้เนื่องจากเชื่อมโยงกับสินทรัพย์ที่ส่งแล้ว {asset_link} กรุณายกเลิกสินทรัพย์เพื่อดำเนินการต่อ" @@ -9532,7 +9539,7 @@ msgstr "ไม่สามารถยกเลิกเอกสารนี้ msgid "Cannot cancel transaction for Completed Work Order." msgstr "ไม่สามารถยกเลิกธุรกรรมสำหรับใบสั่งงานที่เสร็จสมบูรณ์แล้วได้" -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "ไม่สามารถเปลี่ยนคุณลักษณะได้หลังจากมีธุรกรรมสต็อกแล้ว ให้สร้างสินค้าใหม่และโอนสต็อกไปยังสินค้าใหม่" @@ -9544,7 +9551,7 @@ msgstr "ไม่สามารถเปลี่ยนประเภทเอ msgid "Cannot change Service Stop Date for item in row {0}" msgstr "ไม่สามารถเปลี่ยนวันที่หยุดให้บริการสำหรับสินค้าในแถวที่ {0}" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "ไม่สามารถเปลี่ยนคุณสมบัติตัวแปรได้หลังจากมีธุรกรรมสต็อกแล้ว คุณจะต้องสร้างสินค้าใหม่เพื่อทำเช่นนี้" @@ -9572,11 +9579,11 @@ msgstr "ไม่สามารถแปลงเป็นกลุ่มได msgid "Cannot covert to Group because Account Type is selected." msgstr "ไม่สามารถแปลงเป็นกลุ่มได้เนื่องจากมีการเลือกประเภทบัญชีไว้" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "ไม่สามารถสร้างรายการสำรองสต็อกสำหรับใบรับสินค้าที่ลงวันที่ในอนาคตได้" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "ไม่สามารถสร้างรายการเลือกสินค้าสำหรับใบสั่งขาย {0} ได้เนื่องจากมีการสำรองสต็อกไว้ กรุณายกเลิกการสำรองสต็อกเพื่อสร้างรายการเลือกสินค้า" @@ -9602,7 +9609,7 @@ msgstr "ไม่สามารถประกาศเป็น 'สูญห msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "ไม่สามารถหักได้เมื่อหมวดหมู่อยู่ใน 'การประเมินค่า' หรือ 'การประเมินค่าและยอดรวม'" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "ไม่สามารถลบแถวกำไร/ขาดทุนจากอัตราแลกเปลี่ยนได้" @@ -9639,7 +9646,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "ไม่สามารถถอดประกอบเกินกว่าปริมาณที่ผลิตได้" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9647,8 +9654,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "ไม่สามารถเปิดใช้งานบัญชีสินค้าคงคลังแบบรายรายการได้ เนื่องจากมีรายการบัญชีสต็อกคงเหลืออยู่แล้วสำหรับบริษัท {0} โดยใช้บัญชีสินค้าคงคลังแบบแยกตามคลังสินค้า กรุณายกเลิกรายการธุรกรรมสต็อกก่อนแล้วลองใหม่อีกครั้ง" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "ไม่สามารถรับประกันการจัดส่งด้วยหมายเลขซีเรียลได้ เนื่องจากสินค้า {0} ถูกเพิ่มทั้งแบบมีและไม่มีการรับประกันการจัดส่งด้วยหมายเลขซีเรียล" @@ -9692,7 +9699,7 @@ msgstr "ไม่สามารถรับเงินจากลูกค้ msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "ไม่สามารถลดปริมาณได้น้อยกว่าปริมาณที่สั่งหรือซื้อ" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9710,8 +9717,8 @@ msgstr "ไม่สามารถดึงโทเค็นลิงก์ไ msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9727,7 +9734,7 @@ msgstr "ไม่สามารถตั้งเป็น 'สูญหาย' msgid "Cannot set authorization on basis of Discount for {0}" msgstr "ไม่สามารถตั้งค่าการอนุมัติตามส่วนลดสำหรับ {0} ได้" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "ไม่สามารถตั้งค่าเริ่มต้นของสินค้าหลายรายการสำหรับบริษัทเดียวได้" @@ -10638,7 +10645,7 @@ msgstr "ปิด (เครดิต)" msgid "Closing (Dr)" msgstr "ปิด (เดบิต)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "ปิด (เปิด + ทั้งหมด)" @@ -11099,7 +11106,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11381,7 +11388,7 @@ msgstr "บริษัท" msgid "Company Abbreviation" msgstr "ตัวย่อบริษัท" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11394,7 +11401,7 @@ msgstr "ตัวย่อบริษัทต้องมีความยา msgid "Company Account" msgstr "บัญชีบริษัท" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "บัญชีบริษัทเป็นสิ่งที่จำเป็น" @@ -11570,7 +11577,7 @@ msgstr "" msgid "Company is mandatory" msgstr "ต้องระบุบริษัท" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "ต้องระบุบริษัทสำหรับบัญชีบริษัท" @@ -11841,7 +11848,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11854,7 +11861,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "กำหนดค่าการประกอบผลิตภัณฑ์" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11872,13 +11881,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "กำหนดค่าการดำเนินการให้หยุดธุรกรรมหรือเพียงแค่เตือนหากไม่รักษาอัตราเดิมไว้" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "กำหนดค่ารายการราคาเริ่มต้นเมื่อสร้างธุรกรรมการซื้อใหม่ ราคาของสินค้าจะถูกดึงมาจากรายการราคานี้" @@ -12056,7 +12065,7 @@ msgstr "" msgid "Consumed" msgstr "ใช้ไปแล้ว" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "จำนวนที่ใช้ไป" @@ -12100,7 +12109,7 @@ msgstr "ต้นทุนสินค้าที่ใช้ไป" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12273,10 +12282,6 @@ msgstr "ผู้ติดต่อไม่ได้เป็นของ {0}" msgid "Contact:" msgstr "ผู้ติดต่อ:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "ติดต่อ: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12454,7 +12459,7 @@ msgstr "ปัจจัยการแปลง" msgid "Conversion Rate" msgstr "อัตราการแปลง" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "ปัจจัยการแปลงสำหรับหน่วยวัดเริ่มต้นต้องเป็น 1 ในแถว {0}" @@ -12726,7 +12731,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12821,7 +12826,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "ต้องการศูนย์ต้นทุนในแถว {0} ในตารางภาษีสำหรับประเภท {1}" @@ -13159,7 +13164,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "สร้างสินทรัพย์กลุ่ม" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "สร้างรายการสมุดรายวันระหว่างบริษัท" @@ -13532,7 +13537,7 @@ msgstr "สร้าง {0} {1} ?" msgid "Created By Migration" msgstr "สร้างโดยการย้ายข้อมูล" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "สร้าง {0} scorecards สำหรับ {1} ระหว่าง:" @@ -13675,15 +13680,15 @@ msgstr "การสร้าง {0} สำเร็จบางส่วน\n" msgid "Credit" msgstr "เครดิต" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "เครดิต (ธุรกรรม)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "เครดิต ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "บัญชีเครดิต" @@ -13878,7 +13883,7 @@ msgstr "อัตราส่วนการหมุนเวียนของ msgid "Creditors" msgstr "เจ้าหนี้" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14176,7 +14181,7 @@ msgstr "ชุดซีเรียล / แบทช์ปัจจุบัน msgid "Current Serial No" msgstr "หมายเลขซีเรียลปัจจุบัน" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14377,7 +14382,7 @@ msgstr "ตัวคั่นที่กำหนดเอง" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15150,7 +15155,7 @@ msgstr "วันที่ดำเนินการ" msgid "Day Of Week" msgstr "วันในสัปดาห์" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15266,11 +15271,11 @@ msgstr "ตัวแทนจำหน่าย" msgid "Debit" msgstr "เดบิต" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "เดบิต (ธุรกรรม)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "เดบิต ({0})" @@ -15280,7 +15285,7 @@ msgstr "เดบิต ({0})" msgid "Debit / Credit Note Posting Date" msgstr "วันที่บันทึกใบแจ้งหนี้/ใบลดหนี้" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "บัญชีเดบิต" @@ -15391,7 +15396,7 @@ msgstr "เดบิต-เครดิตไม่ตรงกัน" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15533,7 +15538,7 @@ msgstr "ช่วงอายุการเสื่อมสภาพเริ msgid "Default BOM" msgstr "BOM เริ่มต้น" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "BOM เริ่มต้น ({0}) ต้องเปิดใช้งานสำหรับสินค้านี้หรือเทมเพลตของมัน" @@ -15890,15 +15895,15 @@ msgstr "เขตพื้นที่เริ่มต้น" msgid "Default Unit of Measure" msgstr "หน่วยวัดเริ่มต้น" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "ไม่สามารถเปลี่ยนหน่วยวัดเริ่มต้นสำหรับสินค้า {0} ได้โดยตรงเนื่องจากคุณได้ทำธุรกรรมกับหน่วยวัดอื่นไปแล้ว คุณต้องยกเลิกเอกสารที่เชื่อมโยงหรือสร้างสินค้าใหม่" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "ไม่สามารถเปลี่ยนหน่วยวัดเริ่มต้นสำหรับสินค้า {0} ได้โดยตรงเนื่องจากคุณได้ทำธุรกรรมกับหน่วยวัดอื่นไปแล้ว คุณจะต้องสร้างสินค้าใหม่เพื่อใช้หน่วยวัดเริ่มต้นที่แตกต่างกัน" -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "หน่วยวัดเริ่มต้นสำหรับตัวแปร '{0}' ต้องเหมือนกับในเทมเพลต '{1}'" @@ -16199,7 +16204,7 @@ msgstr "" msgid "Delivered" msgstr "จัดส่งแล้ว" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "จำนวนที่จัดส่งแล้ว" @@ -16249,8 +16254,8 @@ msgstr "รายการที่จัดส่งที่ต้องเร #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16261,11 +16266,11 @@ msgstr "ปริมาณที่จัดส่งแล้ว" msgid "Delivered Qty (in Stock UOM)" msgstr "ปริมาณที่จัดส่งแล้ว (ในหน่วยสต็อก)" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16354,7 +16359,7 @@ msgstr "ผู้จัดการการจัดส่ง" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16879,7 +16884,7 @@ msgstr "บัญชีผลต่างในตารางสินค้า msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "บัญชีผลต่างต้องเป็นบัญชีประเภทสินทรัพย์/หนี้สิน (ยอดยกมา) เนื่องจากรายการสต็อกนี้เป็นรายการยอดยกมา" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "บัญชีผลต่างต้องเป็นบัญชีประเภทสินทรัพย์/หนี้สิน เนื่องจากรายการกระทบยอดสต็อกนี้เป็นรายการยอดยกมา" @@ -17043,11 +17048,9 @@ msgstr "ปิดใช้งานเกณฑ์สะสม" msgid "Disable In Words" msgstr "ปิดใช้งานจำนวนเงินตัวอักษร" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "ปิดใช้งานอัตราซื้อล่าสุด" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17088,6 +17091,12 @@ msgstr "ปิดใช้งานตัวเลือกหมายเลข msgid "Disable Transaction Threshold" msgstr "ปิดการใช้งานเกณฑ์การทำธุรกรรม" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17144,7 +17153,7 @@ msgstr "ถอดประกอบ" msgid "Disassemble Order" msgstr "ใบสั่งถอดประกอบ" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "จำนวนชิ้นส่วนที่ต้องถอดประกอบไม่สามารถน้อยกว่าหรือเท่ากับ0 ได้" @@ -17669,6 +17678,12 @@ msgstr "ห้ามใช้การประเมินค่าตามแ msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17759,9 +17774,12 @@ msgstr "ค้นหาเอกสาร" msgid "Document Count" msgstr "จำนวนเอกสาร" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17779,6 +17797,10 @@ msgstr "ประเภทเอกสาร " msgid "Document Type already used as a dimension" msgstr "ประเภทเอกสารถูกใช้เป็นมิติแล้ว" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "เอกสารประกอบ" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18083,7 +18105,7 @@ msgstr "โครงการซ้ำพร้อมงาน" msgid "Duplicate Sales Invoices found" msgstr "พบใบแจ้งหนี้ขายซ้ำ" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "หมายเลขซีเรียลซ้ำกัน" @@ -18203,8 +18225,8 @@ msgstr "รหัสผู้ใช้ ERPNext" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18427,7 +18449,7 @@ msgstr "ใบเสร็จอีเมล" msgid "Email Sent to Supplier {0}" msgstr "ส่งอีเมลถึงผู้จัดจำหน่าย {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18617,7 +18639,7 @@ msgstr "รหัสผู้ใช้พนักงาน" msgid "Employee cannot report to himself." msgstr "พนักงานไม่สามารถรายงานต่อตัวเองได้" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18625,7 +18647,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "จำเป็นต้องมีพนักงานในขณะที่ออกสินทรัพย์ {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18638,7 +18660,7 @@ msgstr "พนักงาน {0} ไม่ได้เป็นพนักง msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "พนักงาน {0} กำลังทำงานอยู่ที่สถานีงานอื่น โปรดกำหนดพนักงานคนอื่น" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18681,7 +18703,7 @@ msgstr "เปิดใช้งานการจัดตารางนัด msgid "Enable Auto Email" msgstr "เปิดใช้งานอีเมลอัตโนมัติ" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "เปิดใช้งานการสั่งซื้อใหม่อัตโนมัติ" @@ -19282,7 +19304,7 @@ msgstr "ข้อผิดพลาด: สินทรัพย์นี้ม "\t\t\t\t\tวันที่ `เริ่มคิดค่าเสื่อมราคา` ต้องอยู่หลังวันที่ `พร้อมใช้งาน` อย่างน้อย {1} รอบ\n" "\t\t\t\t\tกรุณาแก้ไขวันที่ให้ถูกต้อง" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "ข้อผิดพลาด: {0} เป็นฟิลด์บังคับ" @@ -19328,7 +19350,7 @@ msgstr "รับมอบหน้าโรงงาน" msgid "Example URL" msgstr "ตัวอย่าง URL" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "ตัวอย่างของเอกสารที่เชื่อมโยง: {0}" @@ -19358,7 +19380,7 @@ msgstr "ตัวอย่าง: หมายเลขซีเรียล {0} msgid "Exception Budget Approver Role" msgstr "บทบาทผู้อนุมัติงบประมาณข้อยกเว้น" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19717,7 +19739,7 @@ msgstr "มูลค่าที่คาดหวังหลังจากอ msgid "Expense" msgstr "ค่าใช้จ่าย" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "บัญชีค่าใช้จ่าย/ความแตกต่าง ({0}) ต้องเป็นบัญชี 'กำไรหรือขาดทุน'" @@ -19765,7 +19787,7 @@ msgstr "บัญชีค่าใช้จ่าย/ความแตกต msgid "Expense Account" msgstr "บัญชีค่าใช้จ่าย" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "บัญชีค่าใช้จ่ายหายไป" @@ -20228,7 +20250,7 @@ msgstr "กรองปริมาณรวมเป็นศูนย์" msgid "Filter by Reference Date" msgstr "กรองตามวันที่อ้างอิง" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20558,7 +20580,7 @@ msgstr "คลังสินค้าสำเร็จรูป" msgid "Finished Goods based Operating Cost" msgstr "ต้นทุนการดำเนินงานตามสินค้าสำเร็จรูป" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "สินค้าสำเร็จรูป {0} ไม่ตรงกับใบสั่งงาน {1}" @@ -20653,7 +20675,7 @@ msgstr "ระบอบการคลังเป็นสิ่งจำเป msgid "Fiscal Year" msgstr "ปีงบประมาณ" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20717,7 +20739,7 @@ msgstr "บัญชีสินทรัพย์ถาวร" msgid "Fixed Asset Defaults" msgstr "ค่าเริ่มต้นสินทรัพย์ถาวร" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "รายการสินทรัพย์ถาวรต้องเป็นรายการที่ไม่ใช่สต็อก" @@ -20867,7 +20889,7 @@ msgstr "สำหรับบริษัท" msgid "For Item" msgstr "สำหรับสินค้า" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "สำหรับสินค้า {0} ไม่สามารถรับเกินกว่า {1} หน่วยสำหรับ {2} {3}" @@ -20898,7 +20920,7 @@ msgstr "สำหรับรายการราคา" msgid "For Production" msgstr "สำหรับการผลิต" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "ต้องระบุปริมาณสำหรับ (ปริมาณที่ผลิต)" @@ -20982,6 +21004,12 @@ msgstr "สำหรับรายการ {0} มีเพียง Template Type to download template" msgstr "กรุณาเลือก ประเภทเทมเพลต เพื่อดาวน์โหลดเทมเพลต" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "โปรดเลือกใช้ส่วนลดใน" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "โปรดเลือก BOM สำหรับรายการ {0}" @@ -37624,13 +37653,13 @@ msgstr "โปรดเลือกบัญชีธนาคาร" msgid "Please select Category first" msgstr "โปรดเลือกหมวดหมู่ก่อน" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "โปรดเลือกประเภทค่าใช้จ่ายก่อน" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "โปรดเลือกบริษัท" @@ -37639,7 +37668,7 @@ msgstr "โปรดเลือกบริษัท" msgid "Please select Company and Posting Date to getting entries" msgstr "โปรดเลือกบริษัทและวันที่โพสต์เพื่อรับรายการ" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "โปรดเลือกบริษัทก่อน" @@ -37688,7 +37717,7 @@ msgstr "กรุณาเลือก บัญชีความแตกต msgid "Please select Posting Date before selecting Party" msgstr "โปรดเลือกวันที่โพสต์ก่อนเลือกคู่สัญญา" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "โปรดเลือกวันที่โพสต์ก่อน" @@ -37696,11 +37725,11 @@ msgstr "โปรดเลือกวันที่โพสต์ก่อน msgid "Please select Price List" msgstr "โปรดเลือกรายการราคา" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "โปรดเลือกปริมาณสำหรับรายการ {0}" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "โปรดเลือกคลังสินค้าสำหรับเก็บตัวอย่างในการตั้งค่าสต็อกก่อน" @@ -37753,7 +37782,7 @@ msgstr "โปรดเลือกคำสั่งซื้อจ้างช msgid "Please select a Supplier" msgstr "โปรดเลือกผู้จัดจำหน่าย" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "โปรดเลือกคลังสินค้า" @@ -37814,7 +37843,7 @@ msgstr "โปรดเลือกแถวเพื่อสร้างรา msgid "Please select a supplier for fetching payments." msgstr "โปรดเลือกผู้จัดจำหน่ายเพื่อดึงการชำระเงิน" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37834,7 +37863,7 @@ msgstr "โปรดเลือกรหัสรายการก่อนต msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "กรุณาเลือกอย่างน้อยหนึ่งตัวกรอง: รหัสสินค้า, ชุดการผลิต, หรือหมายเลขซีเรียล" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37941,7 +37970,7 @@ msgstr "โปรดเลือกประเภทเอกสารที่ msgid "Please select weekly off day" msgstr "โปรดเลือกวันหยุดประจำสัปดาห์" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "โปรดเลือก {0} ก่อน" @@ -38081,7 +38110,7 @@ msgstr "กรุณากำหนดความต้องการจริ msgid "Please set an Address on the Company '%s'" msgstr "กรุณาตั้งที่อยู่สำหรับบริษัท '%s'" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "โปรดตั้งค่าบัญชีค่าใช้จ่ายในตารางรายการ" @@ -38125,7 +38154,7 @@ msgstr "โปรดตั้งค่าบัญชีค่าใช้จ่ msgid "Please set default UOM in Stock Settings" msgstr "โปรดตั้งค่าหน่วยวัดเริ่มต้นในการตั้งค่าสต็อก" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "โปรดตั้งค่าบัญชีต้นทุนขายเริ่มต้นในบริษัท {0} สำหรับการบันทึกกำไรและขาดทุนจากการปัดเศษระหว่างการโอนสต็อก" @@ -38244,7 +38273,7 @@ msgstr "โปรดระบุ {0} ก่อน" msgid "Please specify at least one attribute in the Attributes table" msgstr "โปรดระบุอย่างน้อยหนึ่งแอตทริบิวต์ในตารางแอตทริบิวต์" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "โปรดระบุปริมาณหรืออัตราการประเมินมูลค่าหรือทั้งสองอย่าง" @@ -38415,7 +38444,7 @@ msgstr "โพสต์เมื่อ" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38440,7 +38469,7 @@ msgstr "โพสต์เมื่อ" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38555,7 +38584,7 @@ msgstr "วันที่และเวลาที่โพสต์" msgid "Posting Time" msgstr "เวลาที่โพสต์" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "วันที่และเวลาที่โพสต์เป็นสิ่งจำเป็น" @@ -38734,6 +38763,12 @@ msgstr "การบำรุงรักษาเชิงป้องกัน msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39027,7 +39062,9 @@ msgstr "ต้องการระดับส่วนลดราคาหร msgid "Price per Unit (Stock UOM)" msgstr "ราคาต่อหน่วย (หน่วยวัดสต็อก)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40382,6 +40419,7 @@ msgstr "ค่าใช้จ่ายในการซื้อสำหรั #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40418,6 +40456,12 @@ msgstr "การชำระเงินล่วงหน้าใบแจ้ msgid "Purchase Invoice Item" msgstr "รายการใบแจ้งหนี้ซื้อ" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40469,6 +40513,7 @@ msgstr "ใบแจ้งหนี้ซื้อ" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40478,7 +40523,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40595,7 +40640,7 @@ msgstr "ใบสั่งซื้อสินค้า {0} สร้างข msgid "Purchase Order {0} is not submitted" msgstr "คำสั่งซื้อ {0} ยังไม่ได้ส่ง" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "คำสั่งซื้อ" @@ -40658,6 +40703,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40672,7 +40718,7 @@ msgstr "รายการราคาซื้อ" msgid "Purchase Receipt" msgstr "ใบรับซื้อ" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40938,7 +40984,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41526,7 +41571,7 @@ msgstr "การทบทวนคุณภาพ" msgid "Quality Review Objective" msgstr "วัตถุประสงค์การทบทวนคุณภาพ" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41587,7 +41632,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41781,7 +41826,7 @@ msgstr "สตริงเส้นทางการค้นหา" msgid "Queue Size should be between 5 and 100" msgstr "ขนาดคิวควรอยู่ระหว่าง 5 ถึง 100" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "การป้อนข้อมูลในสมุดรายวันอย่างรวดเร็ว" @@ -41836,7 +41881,7 @@ msgstr "เปอร์เซ็นต์การอ้างอิง/กา #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41999,7 +42044,6 @@ msgstr "ผู้ดูแล (อีเมล)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42409,8 +42453,8 @@ msgstr "วัตถุดิบสู่ลูกค้า" msgid "Raw SQL" msgstr "SQL ดิบ" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "ปริมาณวัตถุดิบที่ใช้จะถูกตรวจสอบความถูกต้องตามปริมาณ FG BOM ที่ต้องการ" @@ -42818,11 +42862,10 @@ msgstr "กระทบยอดธุรกรรมธนาคาร" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43346,7 +43389,7 @@ msgstr "ชุดซีเรียลและแบทช์ที่ถูก msgid "Rejected Warehouse" msgstr "คลังสินค้าที่ถูกปฏิเสธ" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "คลังสินค้าที่ถูกปฏิเสธและคลังสินค้าที่รับไม่สามารถเป็นคลังเดียวกันได้" @@ -43396,7 +43439,7 @@ msgid "Remaining Balance" msgstr "ยอดคงเหลือที่เหลืออยู่" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43450,7 +43493,7 @@ msgstr "ข้อสังเกต" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43489,7 +43532,7 @@ msgstr "ลบจำนวนศูนย์" msgid "Remove item if charges is not applicable to that item" msgstr "ลบรายการหากค่าใช้จ่ายไม่สามารถใช้กับรายการนั้นได้" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "ลบรายการที่ไม่มีการเปลี่ยนแปลงในปริมาณหรือมูลค่าแล้ว" @@ -43894,6 +43937,7 @@ msgstr "คำขอข้อมูล" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44167,7 +44211,7 @@ msgstr "สำรองสำหรับการประกอบย่อย msgid "Reserved" msgstr "สงวนสิทธิ์" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "ความขัดแย้งของชุดข้อมูลที่จองไว้" @@ -44780,7 +44824,7 @@ msgstr "" msgid "Reversal Of" msgstr "การย้อนกลับของ" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "ย้อนกลับรายการสมุดรายวัน" @@ -44929,10 +44973,7 @@ msgstr "บทบาทที่อนุญาตให้ส่งมอบ/ #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "บทบาทที่อนุญาตให้แทนที่การหยุดการกระทำ" @@ -44947,8 +44988,11 @@ msgstr "บทบาทที่อนุญาตให้ข้ามขีด msgid "Role allowed to bypass period restrictions." msgstr "บทบาทที่ได้รับอนุญาตให้ข้ามข้อจำกัดด้านระยะเวลา" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45149,8 +45193,8 @@ msgstr "ค่าเผื่อการสูญเสียจากการ msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "ค่าเผื่อการสูญเสียจากการปัดเศษควรอยู่ระหว่าง 0 ถึง 1" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "การป้อนกำไร/ขาดทุนจากการปัดเศษสำหรับการโอนสต็อก" @@ -45177,11 +45221,11 @@ msgstr "ชื่อการกำหนดเส้นทาง" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "แถว # {0}: ไม่สามารถคืนมากกว่า {1} สำหรับรายการ {2}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "แถว # {0}: โปรดเพิ่มชุดซีเรียลและแบทช์สำหรับรายการ {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "แถว # {0}: โปรดป้อนปริมาณสำหรับรายการ {1} เนื่องจากไม่ใช่ศูนย์" @@ -45207,7 +45251,7 @@ msgstr "แถว #{0} (ตารางการชำระเงิน): จ msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "แถว #{0} (ตารางการชำระเงิน): จำนวนเงินต้องเป็นค่าบวก" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "แถว #{0}: มีรายการสั่งซื้อใหม่สำหรับคลังสินค้า {1} ที่มีประเภทการสั่งซื้อใหม่ {2} อยู่แล้ว" @@ -45408,7 +45452,7 @@ msgstr "แถว #{0}: รายการซ้ำในอ้างอิง { msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "แถว #{0}: วันที่ส่งมอบที่คาดไว้ไม่สามารถก่อนวันที่คำสั่งซื้อได้" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "แถว #{0}: ไม่ได้ตั้งค่าบัญชีค่าใช้จ่ายสำหรับรายการ {1} {2}" @@ -45468,7 +45512,7 @@ msgstr "แถว #{0}: ต้องการฟิลด์เวลาเร msgid "Row #{0}: Item added" msgstr "แถว #{0}: เพิ่มรายการแล้ว" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "แถว #{0}: รายการ {1} ไม่สามารถโอนได้มากกว่า {2} ต่อ {3} {4}" @@ -45496,7 +45540,7 @@ msgstr "แถว #{0}: รายการ {1} ในคลังสินค้ msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "แถว #{0}: รายการ {1} ไม่ใช่รายการที่ลูกค้าจัดหาให้" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "แถว #{0}: รายการ {1} ไม่ใช่รายการที่มีซีเรียล/แบทช์ ไม่สามารถมีหมายเลขซีเรียล/แบทช์ได้" @@ -45549,7 +45593,7 @@ msgstr "แถว #{0}: มีเพียง {1} ที่สามารถจ msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "แถว #{0}: การหักค่าเสื่อมราคาสะสมเริ่มต้นต้องน้อยกว่าหรือเท่ากับ {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "แถว #{0}: การดำเนินการ {1} ยังไม่เสร็จสิ้นสำหรับปริมาณ {2} ของสินค้าสำเร็จรูปในคำสั่งงาน {3} โปรดอัปเดตสถานะการดำเนินการผ่านบัตรงาน {4}" @@ -45574,7 +45618,7 @@ msgstr "แถว #{0}: กรุณาเลือกสินค้าสำ msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "แถว #{0}: โปรดเลือกคลังสินค้าย่อย" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "แถว #{0}: โปรดตั้งค่าปริมาณการสั่งซื้อใหม่" @@ -45600,15 +45644,15 @@ msgstr "ปริมาณต้องเป็นตัวเลขบวก" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "ปริมาณควรน้อยกว่าหรือเท่ากับปริมาณที่สามารถจองได้ (ปริมาณจริง - ปริมาณที่จอง) {1} สำหรับรายการ {2} ในแบทช์ {3} ในคลังสินค้า {4}" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "ต้องการการตรวจสอบคุณภาพสำหรับรายการ {1}" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "การตรวจสอบคุณภาพ {1} ยังไม่ได้ส่งสำหรับรายการ: {2}" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "การตรวจสอบคุณภาพ {1} ถูกปฏิเสธสำหรับรายการ {2}" @@ -45639,11 +45683,11 @@ msgstr "ปริมาณที่จะจองสำหรับรายก msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "อัตราต้องเท่ากับ {1}: {2} ({3} / {4})" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "ประเภทเอกสารอ้างอิงต้องเป็นหนึ่งในคำสั่งซื้อ, ใบแจ้งหนี้ซื้อ หรือรายการสมุดรายวัน" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "ประเภทเอกสารอ้างอิงต้องเป็นหนึ่งในคำสั่งขาย, ใบแจ้งหนี้ขาย, รายการสมุดรายวัน หรือการติดตามหนี้" @@ -45689,7 +45733,7 @@ msgstr "แถว #{0}: อัตราการขายสำหรับส msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "แถว #{0}: รหัสลำดับต้องเป็น {1} หรือ {2} สำหรับการดำเนินการ {3}." -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "หมายเลขซีเรียล {1} ไม่ได้อยู่ในแบทช์ {2}" @@ -45737,11 +45781,11 @@ msgstr "แถว #{0}: คลังสินค้าต้นทาง {1} ส msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "แถว #{0}: คลังสินค้าต้นทาง {1} สำหรับรายการ {2} ต้องเป็นคลังสินค้าต้นทางเดียวกันกับคลังสินค้าต้นทาง {3} ในใบสั่งงาน" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "แถว #{0}: แหล่งและเป้าหมายของคลังสินค้าไม่สามารถเป็นคลังเดียวกันได้สำหรับการโอนวัสดุ" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "แถว #{0}: แหล่งที่มา, คลังสินค้าเป้าหมาย และมิติของสินค้าคงคลังไม่สามารถเหมือนกันได้สำหรับการโอนย้ายวัสดุ" @@ -45794,11 +45838,11 @@ msgstr "แถว #{0}: จำนวนคงคลัง {1} ({2}) สำหร msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "แถว #{0}: คลังสินค้าเป้าหมายต้องเป็นคลังสินค้าของลูกค้า {1} จากใบสั่งซื้อจากผู้รับเหมาช่วงที่เชื่อมโยง" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "แบทช์ {1} หมดอายุแล้ว" -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "คลังสินค้า {1} ไม่ใช่คลังสินค้าย่อยของคลังสินค้ากลุ่ม {2}" @@ -45826,7 +45870,7 @@ msgstr "แถว #{0}: จำนวนเงินที่หักไว้ { msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "แถว #{0}: ใบสั่งงานมีอยู่สำหรับจำนวนทั้งหมดหรือบางส่วนของรายการ {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "คุณไม่สามารถใช้มิติสินค้าคงคลัง '{1}' ในการกระทบยอดสต็อกเพื่อแก้ไขปริมาณหรืออัตราการประเมินมูลค่า การกระทบยอดสต็อกด้วยมิติสินค้าคงคลังมีไว้สำหรับการทำรายการเปิดเท่านั้น" @@ -45862,23 +45906,23 @@ msgstr "คลังสินค้าเป็นสิ่งจำเป็น msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "ไม่สามารถเลือกคลังสินค้าผู้จัดจำหน่ายขณะจัดหาวัตถุดิบให้กับผู้รับจ้างช่วง" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "อัตรารายการได้รับการอัปเดตตามอัตราการประเมินมูลค่าเนื่องจากเป็นการโอนสต็อกภายใน" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "โปรดป้อนตำแหน่งสำหรับรายการสินทรัพย์ {item_code}" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "ปริมาณที่ได้รับต้องเท่ากับปริมาณที่ยอมรับ + ปริมาณที่ปฏิเสธสำหรับรายการ {item_code}" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "{field_label} ไม่สามารถเป็นค่าลบสำหรับรายการ {item_code}" -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "{field_label} เป็นสิ่งจำเป็น" @@ -45886,7 +45930,7 @@ msgstr "{field_label} เป็นสิ่งจำเป็น" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "{from_warehouse_field} และ {to_warehouse_field} ไม่สามารถเป็นคลังเดียวกันได้" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "{schedule_date} ไม่สามารถก่อน {transaction_date} ได้" @@ -45951,7 +45995,7 @@ msgstr "แถว #{}: {}" msgid "Row #{}: {} {} does not exist." msgstr "{} {} ไม่มีอยู่" -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "{} {} ไม่ได้เป็นของบริษัท {} โปรดเลือก {} ที่ถูกต้อง" @@ -45967,7 +46011,7 @@ msgstr "แถว {0} : ต้องการการดำเนินกา msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "แถว {0} ปริมาณที่เลือกน้อยกว่าปริมาณที่ต้องการ ต้องการเพิ่มเติม {1} {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "แถว {0}# รายการ {1} ไม่พบในตาราง 'วัตถุดิบที่จัดหา' ใน {2} {3}" @@ -45999,7 +46043,7 @@ msgstr "แถว {0}: จำนวนเงินที่จัดสรร {1 msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "แถว {0}: จำนวนเงินที่จัดสรร {1} ต้องน้อยกว่าหรือเท่ากับจำนวนเงินที่เหลืออยู่ {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "แถว {0}: เนื่องจาก {1} ถูกเปิดใช้งาน วัตถุดิบไม่สามารถเพิ่มในรายการ {2} ได้ ใช้รายการ {3} เพื่อใช้วัตถุดิบ" @@ -46058,7 +46102,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "แถว {0}: ต้องการการอ้างอิงรายการใบส่งของหรือรายการที่บรรจุ" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "แถว {0}: อัตราแลกเปลี่ยนเป็นสิ่งจำเป็น" @@ -46099,7 +46143,7 @@ msgstr "แถว {0}: เวลาเริ่มต้นและเวลา msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "แถว {0}: เวลาเริ่มต้นและเวลาสิ้นสุดของ {1} ทับซ้อนกับ {2}" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "แถว {0}: คลังสินค้าเริ่มต้นเป็นสิ่งจำเป็นสำหรับการโอนภายใน" @@ -46223,7 +46267,7 @@ msgstr "แถว {0}: ปริมาณต้องมากกว่า 0" msgid "Row {0}: Quantity cannot be negative." msgstr "แถว {0}: ปริมาณไม่สามารถเป็นค่าลบได้" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "แถว {0}: ไม่มีปริมาณสำหรับ {4} ในคลังสินค้า {1} ณ เวลาที่โพสต์รายการ ({2} {3})" @@ -46235,11 +46279,11 @@ msgstr "แถว {0}: ใบแจ้งหนี้การขาย {1} ไ msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "แถว {0}: ไม่สามารถเปลี่ยนกะได้เนื่องจากการหักค่าเสื่อมราคาได้ถูกประมวลผลแล้ว" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "แถว {0}: รายการจ้างช่วงเป็นสิ่งจำเป็นสำหรับวัตถุดิบ {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "แถว {0}: คลังสินค้าเป้าหมายเป็นสิ่งจำเป็นสำหรับการโอนภายใน" @@ -46263,7 +46307,7 @@ msgstr "แถว {0}: บัญชี {3} {1} ไม่ได้เป็นข msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "แถว {0}: ในการตั้งค่าความถี่ {1} ความแตกต่างระหว่างวันที่เริ่มต้นและสิ้นสุดต้องมากกว่าหรือเท่ากับ {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "แถว {0}: ปริมาณที่โอนไม่สามารถมากกว่าปริมาณที่ขอได้" @@ -46316,7 +46360,7 @@ msgstr "แถว {0}: รายการ {2} {1} ไม่มีอยู่ใ msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "แถว {1}: ปริมาณ ({0}) ไม่สามารถเป็นเศษส่วนได้ หากต้องการอนุญาต ให้ปิดใช้งาน '{2}' ในหน่วยวัด {3}" -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "แถว {idx}: ชุดการตั้งชื่อสินทรัพย์เป็นสิ่งจำเป็นสำหรับการสร้างสินทรัพย์อัตโนมัติสำหรับรายการ {item_code}" @@ -46346,7 +46390,7 @@ msgstr "แถวที่มีหัวบัญชีเดียวกัน msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "พบแถวที่มีวันที่ครบกำหนดซ้ำในแถวอื่น: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "แถว: {0} มี 'Payment Entry' เป็น reference_type ซึ่งไม่ควรตั้งค่าด้วยตนเอง" @@ -46412,7 +46456,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46709,7 +46753,7 @@ msgstr "อัตราการขายที่เข้ามา" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46883,7 +46927,7 @@ msgstr "โอกาสการขายตามแหล่งที่มา #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -47006,8 +47050,8 @@ msgstr "ต้องการคำสั่งขายสำหรับรา msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "คำสั่งขาย {0} มีอยู่แล้วสำหรับคำสั่งซื้อของลูกค้า {1} หากต้องการอนุญาตคำสั่งขายหลายรายการ ให้เปิดใช้งาน {2} ใน {3}" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47418,7 +47462,7 @@ msgstr "รายการเดียวกัน" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "การรวมกันของรายการและคลังสินค้าเดียวกันถูกป้อนแล้ว" @@ -47455,7 +47499,7 @@ msgstr "คลังสินค้าที่เก็บตัวอย่า msgid "Sample Size" msgstr "ขนาดตัวอย่าง" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "ปริมาณตัวอย่าง {0} ไม่สามารถมากกว่าปริมาณที่ได้รับ {1}" @@ -47746,7 +47790,7 @@ msgstr "ค้นหาด้วยรหัสสินค้า, หมาย msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47891,7 +47935,7 @@ msgstr "เลือกแบรนด์..." msgid "Select Columns and Filters" msgstr "เลือกคอลัมน์และตัวกรอง" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "เลือกบริษัท" @@ -48587,7 +48631,7 @@ msgstr "หมายเลขประจำเครื่อง ช่วง" msgid "Serial No Reserved" msgstr "หมายเลขซีเรียลสงวนไว้" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "หมายเลขซีเรียล ซ้ำกันในชุด" @@ -48648,7 +48692,7 @@ msgstr "หมายเลขซีเรียลเป็นข้อบัง msgid "Serial No is mandatory for Item {0}" msgstr "หมายเลขซีเรียลเป็นสิ่งที่จำเป็นสำหรับรายการ {0}" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "หมายเลขซีเรียล {0} มีอยู่แล้ว" @@ -48934,7 +48978,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48960,7 +49004,7 @@ msgstr "หมายเลขซีเรียลไม่พร้อมใช #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49358,12 +49402,6 @@ msgstr "ตั้งค่าคลังสินค้าเป้าหมา msgid "Set Valuation Rate Based on Source Warehouse" msgstr "ตั้งค่าอัตราการประเมินมูลค่าตามคลังสินค้าแหล่งที่มา" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "ตั้งค่าอัตราการประเมินมูลค่าสำหรับวัสดุที่ถูกปฏิเสธ" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "ตั้งค่าคลังสินค้า" @@ -49469,6 +49507,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "ตั้งค่า {0} ในหมวดหมู่สินทรัพย์ {1} สำหรับบริษัท {2}" @@ -49967,7 +50011,7 @@ msgstr "แสดงยอดคงเหลือในผังบัญชี msgid "Show Barcode Field in Stock Transactions" msgstr "แสดงฟิลด์บาร์โค้ดในธุรกรรมสต็อก" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "แสดงรายการที่ถูกยกเลิก" @@ -49975,7 +50019,7 @@ msgstr "แสดงรายการที่ถูกยกเลิก" msgid "Show Completed" msgstr "แสดงที่เสร็จสมบูรณ์" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "แสดงเครดิต/เดบิตในสกุลเงินของบริษัท" @@ -50058,7 +50102,7 @@ msgstr "แสดงใบส่งของที่เชื่อมโยง #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "แสดงมูลค่าสุทธิในบัญชีคู่สัญญา" @@ -50070,7 +50114,7 @@ msgstr "" msgid "Show Open" msgstr "แสดงที่เปิดอยู่" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "แสดงรายการเปิด" @@ -50083,11 +50127,6 @@ msgstr "แสดงยอดคงเหลือเปิดและปิด msgid "Show Operations" msgstr "แสดงการดำเนินการ" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "แสดงปุ่มชำระเงินในพอร์ทัลคำสั่งซื้อ" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "แสดงรายละเอียดการชำระเงิน" @@ -50103,7 +50142,7 @@ msgstr "แสดงตารางการชำระเงินในพิ #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "แสดงข้อสังเกต" @@ -50170,6 +50209,11 @@ msgstr "แสดงเฉพาะ POS" msgid "Show only the Immediate Upcoming Term" msgstr "แสดงเฉพาะเงื่อนไขที่กำลังจะมาถึงทันที" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "แสดงรายการที่ค้างอยู่" @@ -50458,11 +50502,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50528,7 +50572,7 @@ msgstr "คลังสินค้าต้นทาง {0} ต้องเป msgid "Source and Target Location cannot be same" msgstr "ตำแหน่งต้นทางและเป้าหมายไม่สามารถเหมือนกันได้" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "คลังสินค้าต้นทางและเป้าหมายไม่สามารถเหมือนกันสำหรับแถว {0}" @@ -50542,8 +50586,8 @@ msgid "Source of Funds (Liabilities)" msgstr "แหล่งเงินทุน (หนี้สิน)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "คลังสินค้าต้นทางเป็นสิ่งจำเป็นสำหรับแถว {0}" @@ -50708,8 +50752,8 @@ msgstr "ค่าใช้จ่ายที่มีอัตรามาตร #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "การขายมาตรฐาน" @@ -51042,7 +51086,7 @@ msgstr "บันทึกการปิดสต็อก" msgid "Stock Details" msgstr "รายละเอียดสินค้าคงคลัง" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "รายการสต็อกถูกสร้างขึ้นแล้วสำหรับคำสั่งงาน {0}: {1}" @@ -51313,7 +51357,7 @@ msgstr "ได้รับสินค้าแล้วแต่ยังไม #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51325,7 +51369,7 @@ msgstr "การกระทบยอดสต็อก" msgid "Stock Reconciliation Item" msgstr "รายการกระทบยอดสต็อก" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "การกระทบยอดสต็อก" @@ -51363,7 +51407,7 @@ msgstr "การตั้งค่าโพสต์สต็อกใหม่ #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51391,7 +51435,7 @@ msgstr "ยกเลิกรายการจองสต็อกแล้ว #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "สร้างรายการจองสต็อกแล้ว" @@ -51773,7 +51817,7 @@ msgstr "ไม่สามารถยกเลิกคำสั่งหยุ #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "ร้านค้า" @@ -51851,10 +51895,6 @@ msgstr "การปฏิบัติการย่อย" msgid "Sub Procedure" msgstr "กระบวนย่อย" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "ยอดรวมก่อนภาษี" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "มีการอ้างอิงรายการย่อยที่ขาดหายไป กรุณาดึงชุดย่อยและวัตถุดิบอีกครั้ง" @@ -52071,7 +52111,7 @@ msgstr "บริการรับเหมาช่วงคำสั่งซ msgid "Subcontracting Order" msgstr "คำสั่งจ้างช่วง" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52097,7 +52137,7 @@ msgstr "รายการบริการคำสั่งจ้างช่ msgid "Subcontracting Order Supplied Item" msgstr "รายการที่จัดหาสำหรับคำสั่งจ้างช่วง" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "คำสั่งจ้างช่วง {0} ถูกสร้างขึ้นแล้ว" @@ -52186,7 +52226,7 @@ msgstr "" msgid "Subdivision" msgstr "การแบ่งย่อย" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "การส่งล้มเหลว" @@ -52361,7 +52401,7 @@ msgstr "กระทบยอดสำเร็จ" msgid "Successfully Set Supplier" msgstr "ตั้งค่าผู้จัดจำหน่ายสำเร็จ" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "เปลี่ยนหน่วยวัดสต็อกสำเร็จ โปรดกำหนดปัจจัยการแปลงใหม่สำหรับหน่วยวัดใหม่" @@ -52517,6 +52557,7 @@ msgstr "จำนวนที่จัดหา" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52558,8 +52599,8 @@ msgstr "จำนวนที่จัดหา" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52607,6 +52648,12 @@ msgstr "ที่อยู่และข้อมูลติดต่อขอ msgid "Supplier Contact" msgstr "ผู้ติดต่อผู้จัดจำหน่าย" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52701,7 +52748,7 @@ msgstr "วันที่ใบแจ้งหนี้ผู้จัดจำ #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "หมายเลขใบแจ้งหนี้ผู้จัดจำหน่าย" @@ -52981,19 +53028,10 @@ msgstr "ผู้จัดจำหน่ายสินค้าและบร msgid "Supplier {0} not found in {1}" msgstr "ไม่พบผู้จัดจำหน่าย {0} ใน {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "ผู้จัดจำหน่าย" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "การวิเคราะห์การขายตามผู้จัดจำหน่าย" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53055,7 +53093,7 @@ msgstr "ทีมสนับสนุน" msgid "Support Tickets" msgstr "ตั๋วการสนับสนุน" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53315,8 +53353,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "คลังสินค้าเป้าหมาย {0} ต้องเป็นคลังสินค้าเดียวกันกับคลังสินค้าปลายทาง {1} ในรายการสินค้าขาเข้าตามสัญญาช่วง" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "คลังสินค้าเป้าหมายเป็นข้อบังคับสำหรับแถว {0}" @@ -53785,7 +53823,7 @@ msgstr "หักภาษี ณ ที่จ่าย เฉพาะส่ว #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "จำนวนเงินที่ต้องเสียภาษี" @@ -53946,7 +53984,7 @@ msgstr "ภาษีและค่าธรรมเนียมที่ถู msgid "Taxes and Charges Deducted (Company Currency)" msgstr "ภาษีและค่าธรรมเนียมที่ถูกหัก (สกุลเงินของบริษัท)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "ข้อพิพาทเรื่องภาษี #{0}: {1} ไม่สามารถน้อยกว่า {2}ได้" @@ -54136,7 +54174,6 @@ msgstr "แม่แบบเงื่อนไข" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54328,7 +54365,7 @@ msgstr "การเข้าถึงเพื่อขอใบเสนอร msgid "The BOM which will be replaced" msgstr "BOM ที่จะถูกแทนที่" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "ชุดการผลิต {0} มีปริมาณชุดการผลิตติดลบ {1}เพื่อแก้ไขปัญหานี้ ให้ไปที่ชุดการผลิตและคลิกที่ คำนวณปริมาณชุดการผลิตใหม่ หากปัญหายังคงอยู่ ให้สร้างรายการขาเข้า" @@ -54372,7 +54409,7 @@ msgstr "เงื่อนไขการชำระเงินในแถว msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "รายการเลือกที่มีรายการจองสินค้าคงคลังไม่สามารถอัปเดตได้ หากคุณต้องการทำการเปลี่ยนแปลง เราขอแนะนำให้ยกเลิกการจองสินค้าคงคลังที่มีอยู่ก่อนทำการอัปเดตรายการเลือก" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "ปริมาณการสูญเสียกระบวนการได้ถูกตั้งค่าใหม่ตามปริมาณการสูญเสียกระบวนการในบัตรงาน" @@ -54388,7 +54425,7 @@ msgstr "หมายเลขซีเรียลที่แถว #{0}: {1} msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "หมายเลขซีเรียล {0} ถูกสงวนไว้สำหรับ {1} {2} และไม่สามารถใช้กับธุรกรรมอื่นใดได้" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "บันเดิลหมายเลขประจำเครื่องและชุดการผลิต {0} ไม่สามารถใช้ได้กับรายการนี้. 'ประเภทของรายการ' ควรเป็น 'ส่งออก' แทนที่จะเป็น 'นำเข้า' ในบันเดิลหมายเลขประจำเครื่องและชุดการผลิต {0}" @@ -54424,7 +54461,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "ชุดการผลิต {0} ได้ถูกจองไว้แล้วใน {1} {2}ดังนั้น ไม่สามารถดำเนินการกับ {3} {4}ซึ่งถูกสร้างขึ้นตาม {5} {6}ได้" @@ -54530,7 +54567,7 @@ msgstr "แบทช์ต่อไปนี้หมดอายุแล้ว msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "รายการโพสต์ซ้ำที่ถูกยกเลิกต่อไปนี้ยังคงมีอยู่สำหรับ {0}:

{1}

กรุณาลบรายการเหล่านี้ก่อนดำเนินการต่อ" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "คุณลักษณะที่ถูกลบต่อไปนี้มีอยู่ในตัวแปรแต่ไม่อยู่ในแม่แบบ คุณสามารถลบตัวแปรหรือเก็บคุณลักษณะไว้ในแม่แบบ" @@ -54574,15 +54611,15 @@ msgstr "วันหยุดใน {0} ไม่อยู่ระหว่า msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "รายการ {item} ไม่ได้ถูกทำเครื่องหมายเป็นรายการ {type_of} คุณสามารถเปิดใช้งานเป็นรายการ {type_of} ได้จากมาสเตอร์รายการ" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "รายการ {0} และ {1} มีอยู่ใน {2} ต่อไปนี้:" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "รายการ {items} ไม่ได้ถูกทำเครื่องหมายเป็นรายการ {type_of} คุณสามารถเปิดใช้งานเป็นรายการ {type_of} ได้จากมาสเตอร์รายการของพวกเขา" @@ -54738,7 +54775,7 @@ msgstr "หุ้นไม่มีอยู่กับ {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "สต็อกสำหรับรายการ {0} ในคลังสินค้า {1} เป็นลบเมื่อวันที่ {2} คุณควรสร้างรายการบวก {3} ก่อนวันที่ {4} และเวลา {5} เพื่อโพสต์อัตราการประเมินมูลค่าที่ถูกต้อง สำหรับรายละเอียดเพิ่มเติม โปรดอ่าน เอกสาร." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "สต็อกถูกจองไว้สำหรับรายการและคลังสินค้าต่อไปนี้ ยกเลิกการจองเพื่อ {0} การกระทบยอดสต็อก:

{1}" @@ -54760,11 +54797,11 @@ 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 "ระบบจะสร้างใบแจ้งหนี้การขายหรือใบแจ้งหนี้ POS จากอินเทอร์เฟซ POS ตามการตั้งค่านี้ สำหรับการทำธุรกรรมที่มีปริมาณมาก แนะนำให้ใช้ใบแจ้งหนี้ POS" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "งานถูกจัดคิวเป็นงานพื้นหลัง หากมีปัญหาในการประมวลผลในพื้นหลัง ระบบจะเพิ่มความคิดเห็นเกี่ยวกับข้อผิดพลาดในกระทบยอดสต็อกนี้และเปลี่ยนกลับไปยังสถานะร่าง" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "งานถูกจัดคิวเป็นงานพื้นหลัง หากมีปัญหาในการประมวลผลในพื้นหลัง ระบบจะเพิ่มความคิดเห็นเกี่ยวกับข้อผิดพลาดในกระทบยอดสต็อกนี้และเปลี่ยนกลับไปยังสถานะที่ส่งแล้ว" @@ -54836,7 +54873,7 @@ msgstr "{0} ({1}) ต้องเท่ากับ {2} ({3})" msgid "The {0} contains Unit Price Items." msgstr "{0} มีรายการราคาต่อหน่วย" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "{1}คำนำหน้า ' {0} ' (' ') มีอยู่แล้ว กรุณาเปลี่ยนหมายเลขซีเรียลซีรีส์ มิฉะนั้นคุณจะได้รับข้อผิดพลาดการบันทึกซ้ำ" @@ -54889,7 +54926,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "ไม่มีช่องว่างให้บริการในวันที่นี้" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54933,7 +54970,7 @@ msgstr "ไม่พบชุดข้อมูลที่ตรงกับ {0 msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "ต้องมีสินค้าสำเร็จรูปอย่างน้อย 1 รายการในรายการสต็อกนี้" @@ -54989,11 +55026,11 @@ msgstr "รายการนี้เป็นตัวแปรของ {0} ( msgid "This Month's Summary" msgstr "สรุปเดือนนี้" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "ใบสั่งซื้อใบนี้ได้ถูกมอบหมายให้ผู้รับเหมาช่วงดำเนินการทั้งหมดแล้ว" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "ใบสั่งขายนี้ได้รับการว่าจ้างช่วงเต็มจำนวนแล้ว" @@ -55794,7 +55831,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "เพื่อรวมภาษีในแถว {0} ในอัตรารายการ ต้องรวมภาษีในแถว {1} ด้วย" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "เพื่อรวม คุณสมบัติต่อไปนี้ต้องเหมือนกันสำหรับทั้งสองรายการ" @@ -55829,7 +55866,7 @@ msgstr "เพื่อใช้สมุดการเงินที่แต #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "เพื่อใช้สมุดการเงินที่แตกต่าง โปรดยกเลิกการเลือก 'รวมรายการ FB เริ่มต้น'" @@ -55980,7 +56017,7 @@ msgstr "รวมการจัดสรร" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "จำนวนเงินรวม" @@ -56403,7 +56440,7 @@ msgstr "จำนวนคำขอชำระเงินรวมต้อง msgid "Total Payments" msgstr "รวมการชำระเงิน" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "ปริมาณที่เลือกทั้งหมด {0} มากกว่าปริมาณที่สั่ง {1} คุณสามารถตั้งค่าค่าเผื่อการเลือกเกินในการตั้งค่าสต็อก" @@ -56435,7 +56472,7 @@ msgstr "รวมต้นทุนการซื้อ (ผ่านใบแ #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "รวมปริมาณ" @@ -56821,7 +56858,7 @@ msgstr "URL การติดตาม" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56832,7 +56869,7 @@ msgstr "ธุรกรรม" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "สกุลเงินของธุรกรรม" @@ -57504,11 +57541,11 @@ msgstr "การตั้งค่าภาษีมูลค่าเพิ่ #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57580,7 +57617,7 @@ msgstr "จำเป็นต้องมีตัวคูณการแปล msgid "UOM Name" msgstr "ชื่อหน่วยวัด" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "ปัจจัยการแปลงหน่วยที่ต้องการสำหรับหน่วย: {0} ในรายการ: {1}" @@ -57656,7 +57693,7 @@ msgstr "ไม่สามารถหาคะแนนเริ่มต้น msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "ไม่สามารถหาช่วงเวลาภายใน {0} วันถัดไปสำหรับการดำเนินการ {1} ได้ โปรดเพิ่ม 'การวางแผนความจุสำหรับ (วัน)' ใน {2}" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "ไม่สามารถหาตัวแปรได้:" @@ -57775,7 +57812,7 @@ msgstr "หน่วยวัด" msgid "Unit of Measure (UOM)" msgstr "หน่วยวัด (UOM)" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "หน่วยวัด {0} ถูกป้อนมากกว่าหนึ่งครั้งในตารางปัจจัยการแปลง" @@ -57895,10 +57932,9 @@ msgid "Unreconcile Transaction" msgstr "ยกเลิกการกระทบยอดธุรกรรม" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "ยังไม่ได้กระทบยอด" @@ -57921,10 +57957,6 @@ msgstr "รายการที่ยังไม่ได้กระทบย msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57970,7 +58002,7 @@ msgstr "ยังไม่ได้กำหนดเวลา" msgid "Unsecured Loans" msgstr "สินเชื่อแบบไม่มีหลักประกัน" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "ยกเลิกการตั้งค่าคำขอชำระเงินที่ตรงกัน" @@ -58185,12 +58217,6 @@ msgstr "อัปเดตสต็อก" msgid "Update Type" msgstr "อัปเดตประเภท" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "อัปเดตความถี่ของโครงการ" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58231,7 +58257,7 @@ msgstr "อัปเดต {0} รายงานทางการเงิน msgid "Updating Costing and Billing fields against this Project..." msgstr "อัปเดตข้อมูลต้นทุนและการเรียกเก็บเงินสำหรับโครงการนี้..." -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "กำลังอัปเดตตัวแปร..." @@ -58689,12 +58715,6 @@ msgstr "ตรวจสอบกฎที่ใช้" msgid "Validate Components and Quantities Per BOM" msgstr "ตรวจสอบส่วนประกอบและปริมาณต่อ BOM" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "ตรวจสอบปริมาณที่ใช้ (ตาม BOM)" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58718,6 +58738,12 @@ msgstr "ตรวจสอบกฎการกำหนดราคา" msgid "Validate Stock on Save" msgstr "ตรวจสอบสต็อกเมื่อบันทึก" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58824,11 +58850,11 @@ msgstr "ไม่มีอัตราการประเมินมูลค msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "อัตราการประเมินมูลค่าสำหรับรายการ {0} จำเป็นสำหรับการทำรายการบัญชีสำหรับ {1} {2}" -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "อัตราการประเมินมูลค่าเป็นสิ่งจำเป็นหากป้อนสต็อกเริ่มต้น" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "ต้องการอัตราการประเมินมูลค่าสำหรับรายการ {0} ที่แถว {1}" @@ -58838,7 +58864,7 @@ msgstr "ต้องการอัตราการประเมินมู msgid "Valuation and Total" msgstr "การประเมินมูลค่าและรวม" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "อัตราการประเมินมูลค่าสำหรับรายการที่ลูกค้าให้ถูกตั้งค่าเป็นศูนย์" @@ -58988,7 +59014,7 @@ msgstr "ความแปรปรวน ({})" msgid "Variant" msgstr "ตัวแปร" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "ข้อผิดพลาดของคุณลักษณะตัวแปร" @@ -59007,7 +59033,7 @@ msgstr "BOM ตัวแปร" msgid "Variant Based On" msgstr "ตัวแปรตาม" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "ตัวแปรตามไม่สามารถเปลี่ยนแปลงได้" @@ -59025,7 +59051,7 @@ msgstr "ฟิลด์ตัวแปร" msgid "Variant Item" msgstr "รายการตัวแปร" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "รายการตัวแปร" @@ -59406,7 +59432,7 @@ msgstr "ชื่อใบสำคัญ" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59446,7 +59472,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "ประเภทใบสำคัญย่อย" @@ -59478,7 +59504,7 @@ msgstr "ประเภทใบสำคัญย่อย" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59713,7 +59739,7 @@ msgstr "คลังสินค้า {0} ไม่มีอยู่" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "คลังสินค้า {0} ไม่ได้รับอนุญาตสำหรับคำสั่งขาย {1} ควรเป็น {2}" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "คลังสินค้า {0} ไม่ได้เชื่อมโยงกับบัญชีใด โปรดระบุบัญชีในระเบียนคลังสินค้าหรือกำหนดบัญชีสินค้าคงคลังเริ่มต้นในบริษัท {1}" @@ -59760,7 +59786,7 @@ msgstr "คลังสินค้าที่มีธุรกรรมอย #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59816,6 +59842,12 @@ msgstr "เตือนสำหรับคำขอใบเสนอราค msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "คำเตือน - แถว {0}: ชั่วโมงการเรียกเก็บเงินมากกว่าชั่วโมงจริง" @@ -59999,7 +60031,7 @@ msgstr "ข้อกำหนดเว็บไซต์" msgid "Website:" msgstr "เว็บไซต์:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60373,7 +60405,7 @@ msgstr "วัสดุที่ใช้ในคำสั่งงาน" msgid "Work Order Item" msgstr "รายการคำสั่งงาน" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60435,11 +60467,11 @@ msgstr "ไม่ได้สร้างคำสั่งงาน" msgid "Work Order {0} created" msgstr "ใบสั่งงาน {0} สร้าง" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "คำสั่งงาน {0}: ไม่พบการ์ดงานสำหรับการดำเนินการ {1}" @@ -60755,11 +60787,11 @@ msgstr "ชื่อปี" msgid "Year Start Date" msgstr "วันที่เริ่มปี" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60812,7 +60844,7 @@ msgstr "คุณยังสามารถคัดลอก-วางลิ msgid "You can also set default CWIP account in Company {}" msgstr "คุณยังสามารถตั้งค่าบัญชี CWIP เริ่มต้นในบริษัท {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60966,6 +60998,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60994,7 +61030,7 @@ msgstr "คุณได้เปิดใช้งาน {0} และ {1} ใ msgid "You have entered a duplicate Delivery Note on Row" msgstr "คุณได้ป้อนใบส่งของซ้ำในแถว" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -61002,7 +61038,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "คุณต้องเปิดใช้งานการสั่งซื้ออัตโนมัติในการตั้งค่าสต็อกเพื่อรักษาระดับการสั่งซื้อใหม่" @@ -61073,8 +61109,11 @@ msgstr "อัตราศูนย์" msgid "Zero quantity" msgstr "ปริมาณศูนย์" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61186,7 +61225,7 @@ msgstr "อัตราแลกเปลี่ยน.โฮสต์" msgid "fieldname" msgstr "ชื่อฟิลด์" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61404,6 +61443,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "ไม่ซ้ำ เช่น SAVE20 ใช้เพื่อรับส่วนลด" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "ความแปรปรวน" @@ -61462,7 +61505,8 @@ msgstr "คูปอง {0} ที่ใช้คือ {1} ปริมาณ msgid "{0} Digest" msgstr "สรุป {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61482,7 +61526,7 @@ msgstr "การดำเนินการ {0}: {1}" msgid "{0} Request for {1}" msgstr "คำขอ {0} สำหรับ {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "การเก็บตัวอย่าง {0} ขึ้นอยู่กับแบทช์ โปรดตรวจสอบว่ามีหมายเลขแบทช์เพื่อเก็บตัวอย่างของรายการ" @@ -61595,7 +61639,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} ป้อนสองครั้งในภาษีรายการ" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "{0} ป้อนสองครั้ง {1} ในภาษีรายการ" @@ -61763,7 +61807,7 @@ msgstr "พารามิเตอร์ {0} ไม่ถูกต้อง" msgid "{0} payment entries can not be filtered by {1}" msgstr "ไม่สามารถกรองรายการชำระเงิน {0} ด้วย {1} ได้" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "ปริมาณ {0} ของรายการ {1} กำลังถูกรับเข้าสู่คลังสินค้า {2} ที่มีความจุ {3}" @@ -61776,7 +61820,7 @@ msgstr "{0} ถึง {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "{0} หน่วยถูกจองไว้สำหรับรายการ {1} ในคลังสินค้า {2} โปรดยกเลิกการจองเพื่อ {3} การกระทบยอดสต็อก" @@ -61978,7 +62022,7 @@ msgstr "{0} {1}: บัญชี {2} ไม่ได้ใช้งาน" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: รายการบัญชีสำหรับ {2} สามารถทำได้เฉพาะในสกุลเงิน: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: ศูนย์ต้นทุนเป็นสิ่งจำเป็นสำหรับรายการ {2}" @@ -62064,23 +62108,23 @@ msgstr "{0}: {1} ไม่มีอยู่" msgid "{0}: {1} is a group account." msgstr "{0}: {1} เป็นบัญชีกลุ่ม" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} ต้องน้อยกว่า {2}" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "สร้างสินทรัพย์ {count} สำหรับ {item_code}" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} ถูกยกเลิกหรือปิดแล้ว" -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "ขนาดตัวอย่าง ({sample_size}) ของ {item_name} ต้องไม่เกินปริมาณที่ยอมรับได้ ({accepted_quantity})" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "{ref_doctype} {ref_name} มีสถานะ {status}" diff --git a/erpnext/locale/tr.po b/erpnext/locale/tr.po index 0af023251d0..9d87f19224e 100644 --- a/erpnext/locale/tr.po +++ b/erpnext/locale/tr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:21\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:21\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Turkish\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr " Alt Montaj" msgid " Summary" msgstr " Özet" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"Müşterinin Tedarik Ettiği Ürün\" aynı zamanda Satın Alma Ürünü olamaz." -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"Müşterinin Tedarik Ettiği Ürün\" Değerleme Oranına sahip olamaz." -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "Varlık kaydı yapıldığından, 'Sabit Varlık' seçimi kaldırılamaz." @@ -302,7 +302,7 @@ msgstr "'Başlangıç Tarihi' alanı zorunlu" msgid "'From Date' must be after 'To Date'" msgstr "Başlangıç Tarihi Bitiş Tarihinden önce olmalıdır" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "Stokta olmayan ürünün 'Seri No' değeri 'Evet' olamaz." @@ -338,7 +338,7 @@ msgstr "'Stok Güncelle' seçilemez çünkü ürünler {0} ile teslim edilmemiş msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "'Stoğu Güncelle' sabit varlık satışları için kullanılamaz" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "'{0}' hesabı zaten {1} tarafından kullanılıyor. Başka bir hesap kullanın." @@ -1099,7 +1099,7 @@ msgstr "Göndermek için bir sürücü ayarlanmalıdır." msgid "A logical Warehouse against which stock entries are made." msgstr "Stok girişlerinin yapıldığı mantıksal bir Depo." -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1311,7 +1311,7 @@ msgstr "Servis Sağlayıcı için Erişim Anahtarı gereklidir: {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "CEFACT/ICG/2010/IC013 veya CEFACT/ICG/2010/IC010 Standartına Göre" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "{0} Ürün Ağacı, ‘{1}’ ürünü stok girişinde eksik." @@ -1981,8 +1981,8 @@ msgstr "Muhasebe Girişleri" msgid "Accounting Entry for Asset" msgstr "Varlık İçin Muhasebe Girişi" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1990,7 +1990,7 @@ msgstr "" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Hizmet için Muhasebe Girişi" @@ -2003,16 +2003,16 @@ msgstr "Hizmet için Muhasebe Girişi" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Stok İçin Muhasebe Girişi" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "{0} için Muhasebe Girişi" @@ -2310,12 +2310,6 @@ msgstr "Kalite Belgesinin Gönderilmemesi Durumunda Yapılacak İşlem" msgid "Action If Quality Inspection Is Rejected" msgstr "Kalite Denetimi Reddedilirse Yapılacak İşlem" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "Fiyat Uyuşmazlığında Yapılacak İşlem" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "İşlem Başlatıldı" @@ -2374,6 +2368,12 @@ msgstr "Yıllık Bütçenin Toplam Gider Üzerinden Aşılması Durumunda Yapıl msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2641,7 +2641,7 @@ msgstr "Toplam Saat (Zaman Çizgelgesi)" msgid "Actual qty in stock" msgstr "Güncel Stok Miktarı" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "Gerçek tip vergi satırda Ürün fiyatına dahil edilemez {0}" @@ -2655,7 +2655,7 @@ msgstr "" msgid "Add / Edit Prices" msgstr "Fiyat Ekle / Düzenle" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "İşlem Para Birimini Ekle" @@ -2809,7 +2809,7 @@ msgstr "Seri / Parti No Ekle" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "Seri / Parti No Ekle (Reddedilen Miktar)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -3054,7 +3054,7 @@ msgstr "Ek İndirim Tutarı" msgid "Additional Discount Amount (Company Currency)" msgstr "Ek İndirim Tutarı" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -3339,7 +3339,7 @@ msgstr "" msgid "Adjustment Against" msgstr "Karşılığına Yapılan Düzenleme" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "Satın Alma Faturası oranına göre düzeltme" @@ -3452,7 +3452,7 @@ msgstr "" msgid "Advance amount" msgstr "Avans Tutarı" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "{0} Avans miktarı {1} tutarından fazla olamaz." @@ -3521,7 +3521,7 @@ msgstr "Karşılığında" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Hesap" @@ -3639,7 +3639,7 @@ msgstr "Tedarikçi Faturasına Karşı {0}" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "Fatura" @@ -3663,7 +3663,7 @@ msgstr "İlgili Belge No" #: erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "Fatura Türü" @@ -3944,7 +3944,7 @@ msgstr "Bu ve bunun üzerindeki tüm iletişimler yeni Sayıya taşınacaktır." msgid "All items are already requested" msgstr "Tüm ürünler zaten talep edildi" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "Tüm ürünler zaten Faturalandırıldı/İade Edildi" @@ -3952,7 +3952,7 @@ msgstr "Tüm ürünler zaten Faturalandırıldı/İade Edildi" msgid "All items have already been received" msgstr "Tüm ürünler zaten alındı" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Bu İş Emri için tüm öğeler zaten aktarıldı." @@ -4001,7 +4001,7 @@ msgstr "Ayrılan" msgid "Allocate Advances Automatically (FIFO)" msgstr "Avansları Otomatik Olarak Tahsis Et (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Ayrılan Ödeme Tutarı" @@ -4011,7 +4011,7 @@ msgstr "Ayrılan Ödeme Tutarı" msgid "Allocate Payment Based On Payment Terms" msgstr "Ödeme Koşullarına Göre Ödeme Tahsis Edin" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "Ödeme Talebini Tahsis Et" @@ -4041,7 +4041,7 @@ msgstr "Ayrılan" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4162,15 +4162,15 @@ msgstr "İadelere İzin Ver" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "İç Transferlerde Piyasa Fiyatına İzin Ver" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "Bir İşlemde Öğenin Birden Fazla Kez Eklenmesine İzin Ver" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "Öğenin Bir İşlemde Birden Fazla Kez Eklenmesine İzin Verin" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4199,12 +4199,6 @@ msgstr "Eksi Stoğa İzin Ver" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "Ürünler için Negatif oranlara izin ver" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4417,8 +4411,11 @@ msgstr "Tek Bir Cari Hesap İçin Çoklu Para Birimi Faturalarına İzin Ver" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4510,7 +4507,7 @@ msgstr "İşlem Yapma Yetkileri" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "İzin verilen birincil roller 'Müşteri' ve 'Tedarikçi'dir. Lütfen yalnızca bu rollerden birini seçin." -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4707,7 +4704,7 @@ msgstr "Her Zaman Sor" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4737,7 +4734,6 @@ msgstr "Her Zaman Sor" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4907,10 +4903,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "Hesap Para Birimindeki Tutar" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "Yazı ile Tutar" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5530,7 +5522,7 @@ msgstr "{0} alanı etkinleştirildiğinden, {1} alanı zorunludur." msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "{0} alanı etkinleştirildiğinden, {1} alanının değeri 1'den fazla olmalıdır." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "{0} Ürününe karşı mevcut gönderilmiş işlemler olduğundan, {1} değerini değiştiremezsiniz." @@ -5680,7 +5672,7 @@ msgstr "Varlık Kategorisi Hesabı" msgid "Asset Category Name" msgstr "Varlık Kategorisi Adı" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "Duran Varlık için Varlık Kategorisi zorunludur" @@ -6076,7 +6068,7 @@ msgstr "" msgid "Asset {0} must be submitted" msgstr "Varlık {0} kaydedilmelidir" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "" @@ -6114,11 +6106,11 @@ msgstr "Varlıklar" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "{item_code} için varlıklar oluşturulamadı. Varlığı manuel olarak oluşturmanız gerekecek." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "" @@ -6191,7 +6183,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "En az bir Depo zorunludur" @@ -6223,7 +6215,7 @@ msgstr "Satır {0}: {1} partisi için miktar zorunludur" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "Satır {0}: Seri No, {1} Ürünü için zorunludur" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "Satır {0}: Seri ve Toplu Paket {1} zaten oluşturuldu. Lütfen seri no veya toplu no alanlarından değerleri kaldırın." @@ -6287,7 +6279,11 @@ msgstr "Özellik İsmi" msgid "Attribute Value" msgstr "Özellik Değeri" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "Özellik tablosu zorunludur" @@ -6295,11 +6291,19 @@ msgstr "Özellik tablosu zorunludur" msgid "Attribute value: {0} must appear only once" msgstr "Özellik değeri: {0} yalnızca bir kez görünmelidir" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "Özellik {0}, Özellikler Tablosunda birden çok kez seçilmiş" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Özellikler" @@ -6359,24 +6363,12 @@ msgstr "Yetkilendirilmiş Değer" msgid "Auto Create Exchange Rate Revaluation" msgstr "Otomatik Döviz Kuru Değerleme Oluştur" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "İrsaliyeyi Otomatik Oluştur" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "Dışarıya Yönelik Otomatik Seri ve Toplu Paket Oluşturma" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "Alt Yüklenici Siparişini Otomatik Oluştur" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6495,6 +6487,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "Yukarıda belirtilen gün sayısından sonra Yanıtlanan Fırsatı Otomatik Kapat" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6712,7 +6716,7 @@ msgstr "" msgid "Available for use date is required" msgstr "Kullanıma Hazır Tarihi gereklidir" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "Mevcut miktar {0}, gereken {1}" @@ -6811,7 +6815,7 @@ msgstr "Genişlik Öncelikli Arama" msgid "BIN Qty" msgstr "Ürün Ağacı Miktarı" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7084,7 +7088,7 @@ msgstr "Ürün Ağacı Web Sitesi Ürünü" msgid "BOM Website Operation" msgstr "Ürün Ağacı Web Sitesi Operasyonu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7175,8 +7179,8 @@ msgstr "İşlemdeki Depodan Hammaddeleri Otomatik Kullan" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "Alt Yükleniciye Dayalı Hammadde Maliyetini Şuna göre yap" +msgid "Backflush raw materials of subcontract based on" +msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7196,7 +7200,7 @@ msgstr "Bakiye" msgid "Balance (Dr - Cr)" msgstr "Bakiye (Borç - Alacak)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Bakiye ({0})" @@ -7727,11 +7731,11 @@ msgstr "Banka İşlemleri" msgid "Barcode Type" msgstr "Barkod Türü" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "{0} barkodu zaten {1} ürününde kullanılmış" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "Barkod {0}, geçerli bir {1} kodu değil" @@ -8098,12 +8102,12 @@ msgstr "Parti {0} ve Depo" msgid "Batch {0} is not available in warehouse {1}" msgstr "{0} partisi {1} deposunda mevcut değil" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "{0} partisindeki {1} ürününün ömrü doldu." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "{0} partisindeki {1} isimli ürün devre dışı bırakıldı." @@ -8176,8 +8180,8 @@ msgstr "Fatura No" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "Alış Faturasındaki Reddedilen Miktar için Fatura" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8517,8 +8521,11 @@ msgstr "Açık Sipariş Ürünü" msgid "Blanket Order Rate" msgstr "Genel Sipariş Fiyatı" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -9033,7 +9040,7 @@ msgstr "Alış ve Satış" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "Eğer uygulanabilir {0} olarak seçilirse, Satın Alma işaretlenmelidir" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "Varsayılan olarak Tedarikçi Adı, girilen Tedarikçi Adına göre ayarlanır. Tedarikçilerin Adlandırma Serisi ile adlandırılmasını istiyorsanız 'Seri Adlandırma' seçeneğini seçin." @@ -9398,7 +9405,7 @@ msgstr "Belgelerle gruplandırılmışsa, Belge No ile filtreleme yapılamaz." msgid "Can only make payment against unbilled {0}" msgstr "Sadece faturalandırılmamış ödemeler yapılabilir {0}" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9454,9 +9461,9 @@ msgstr "" msgid "Cannot Create Return" msgstr "İade Oluşturulamıyor" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "Birleştirilemez" @@ -9484,7 +9491,7 @@ msgstr "{0} {1} değiştirilemiyor, lütfen bunu düzenlemek yerine yeni bir tan msgid "Cannot apply TDS against multiple parties in one entry" msgstr "Bir girişte birden fazla tarafa karşı Stopaj Vergisi uygulanamaz" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "Stok Defterine girişi olan bir kalem Sabit Varlık olarak ayarlanamaz." @@ -9520,7 +9527,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" @@ -9528,7 +9535,7 @@ msgstr "" msgid "Cannot cancel transaction for Completed Work Order." msgstr "Tamamlanan İş Emri için işlem iptal edilemez." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "Stok işlemi sonrasında Özellikler değiştirilemez. Yeni bir Ürün oluşturun ve stoğu yeni Ürüne aktarmayı deneyin." @@ -9540,7 +9547,7 @@ msgstr "Referans Belge Türü değiştirilemiyor." msgid "Cannot change Service Stop Date for item in row {0}" msgstr "{0} satırındaki öğe için Hizmet Durdurma Tarihi değiştirilemiyor" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "Stok işlemi sonrasında Varyant özellikleri değiştirilemez. Bunu yapmak için yeni bir Ürün oluşturmanız gerekecektir." @@ -9568,11 +9575,11 @@ msgstr "Hesap Türü seçili olduğundan Gruba dönüştürülemiyor." msgid "Cannot covert to Group because Account Type is selected." msgstr "Hesap Türü seçili olduğundan Gruba dönüştürülemiyor." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "İleri tarihli Alış İrsaliyeleri için Stok Rezervasyon Girişleri oluşturulamıyor." -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "Rezerve stok olduğundan {0} Satış Siparişi için bir Çekme Listesi oluşturulamıyor. Çekme Listesi oluşturmak için lütfen stok rezervini kaldırın." @@ -9598,7 +9605,7 @@ msgstr "Kayıp olarak belirtilemez, çünkü Fiyat Teklifi verilmiş." msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "'Değerleme' veya 'Değerleme ve Toplam' kategorisi için çıkarma işlemi yapılamaz." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "Kur Farkı Satırı Silinemiyor" @@ -9635,7 +9642,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9643,8 +9650,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "{0} Ürünü Seri No ile \"Teslimatı Sağla ile ve Seri No ile Teslimatı Sağla\" olmadan eklendiğinden, Seri No ile teslimat sağlanamaz." @@ -9688,7 +9695,7 @@ msgstr "Negatif bakiye karşılığında müşteriden teslim alınamıyor" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9706,8 +9713,8 @@ msgstr "Güncelleme için bağlantı token'ı alınamıyor. Daha fazla bilgi iç msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9723,7 +9730,7 @@ msgstr "Satış Siparişi verildiği için Kayıp olarak ayarlanamaz." msgid "Cannot set authorization on basis of Discount for {0}" msgstr "{0} için İndirim bazında yetkilendirme ayarlanamıyor" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "Bir şirket için birden fazla Ürün Varsayılanı belirlenemez." @@ -10634,7 +10641,7 @@ msgstr "Kapanış Alacağı" msgid "Closing (Dr)" msgstr "Kapanış Borcu" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "Kapanış (Açılış + Toplam)" @@ -11095,7 +11102,7 @@ msgstr "Şirketler" #: 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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11377,7 +11384,7 @@ msgstr "Şirket" msgid "Company Abbreviation" msgstr "Şirket Kısaltması" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11390,7 +11397,7 @@ msgstr "Şirket Kısaltması 5 karakterden uzun olamaz" msgid "Company Account" msgstr "Şirket Hesabı" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "" @@ -11566,7 +11573,7 @@ msgstr "" msgid "Company is mandatory" msgstr "Şirket zorunludur" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "Şirket hesabı için şirket zorunludur" @@ -11837,7 +11844,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11850,7 +11857,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "Ürün Montajını Yapılandırma" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11868,13 +11877,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "İşlemi durdurmak için eylemi yapılandırın veya aynı oran korunmazsa sadece uyarı verin." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "Yeni bir Satın Alma işlemi oluştururken varsayılan Fiyat Listesini yapılandırın. Ürün fiyatları bu Fiyat Listesinden alınacaktır." @@ -12052,7 +12061,7 @@ msgstr "" msgid "Consumed" msgstr "Tüketilen" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "Tüketilen Miktar" @@ -12096,7 +12105,7 @@ msgstr "" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12269,10 +12278,6 @@ msgstr "" msgid "Contact:" msgstr "Kişi:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Kişi: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12450,7 +12455,7 @@ msgstr "Dönüşüm Faktörü" msgid "Conversion Rate" msgstr "Dönüşüm Oranı" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "Varsayılan Ölçü Birimi için dönüşüm faktörü {0} satırında 1 olmalıdır" @@ -12722,7 +12727,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12817,7 +12822,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "{1} türü için Vergiler tablosundaki {0} satırında Maliyet Merkezi gereklidir" @@ -13155,7 +13160,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "Gruplandırılmış Varlık Oluştur" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "Şirketler Arası Defter Girişi Oluştur" @@ -13528,7 +13533,7 @@ msgstr "{0} {1} oluştur?" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "{1} için, şu tarih aralığında {0} adet puan kartı oluşturuldu:\n" @@ -13671,15 +13676,15 @@ msgstr "{0} oluşturulması kısmen başarılı.\n" msgid "Credit" msgstr "Alacak" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "Alacak (İşlem)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "Alacak ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "Alacak Hesabı" @@ -13874,7 +13879,7 @@ msgstr "" msgid "Creditors" msgstr "Alacaklılar" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14172,7 +14177,7 @@ msgstr "Mevcut Seri / Parti Paketi" msgid "Current Serial No" msgstr "Güncel Seri No" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14373,7 +14378,7 @@ msgstr "Özel Ayırıcılar" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15146,7 +15151,7 @@ msgstr "" msgid "Day Of Week" msgstr "Haftanın günü" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15262,11 +15267,11 @@ msgstr "Aracı" msgid "Debit" msgstr "Borç" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "Borç (İşlem)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "Borç ({0})" @@ -15276,7 +15281,7 @@ msgstr "Borç ({0})" msgid "Debit / Credit Note Posting Date" msgstr "" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "Borç Hesabı" @@ -15387,7 +15392,7 @@ msgstr "Borç-Alacak uyuşmazlığı" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15529,7 +15534,7 @@ msgstr "" msgid "Default BOM" msgstr "Varsayılan Ürün Ağacı" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "Bu ürün veya şablonu için varsayılan Ürün Ağacı ({0}) aktif olmalıdır" @@ -15886,15 +15891,15 @@ msgstr "Varsayılan Bölge" msgid "Default Unit of Measure" msgstr "Varsayılan Ölçü Birimi" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "{0} Ürünü için Varsayılan Ölçü Birimi doğrudan değiştirilemez çünkü zaten başka bir Ölçü Birimi ile bazı işlemler yaptınız. Ya bağlantılı belgeleri iptal etmeniz ya da yeni bir Ürün oluşturmanız gerekir." -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "Ürün {0} için Varsayılan Ölçü Birimi doğrudan değiştirilemez çünkü başka bir ölçü birimiyle işlem yapılmıştır. Farklı bir Varsayılan Ölçü Birimi kullanmak için yeni bir Ürün oluşturmanız gerekecek." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "Değişiklik için varsayılan ölçü birimi '{0}' şablondaki ile aynı olmalıdır '{1}'" @@ -16195,7 +16200,7 @@ msgstr "" msgid "Delivered" msgstr "Teslim Edildi" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Teslim Edilen Miktar" @@ -16245,8 +16250,8 @@ msgstr "Teslim Edilmiş Faturalandırılacak Ürünler" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16257,11 +16262,11 @@ msgstr "Teslim Edilen Miktar" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16350,7 +16355,7 @@ msgstr "Sevkiyat Yöneticisi" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16875,7 +16880,7 @@ msgstr "Kalemler Tablosundaki Fark Hesabı" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "Bu Stok Mutabakatı bir Hesap Açılış Kaydı olduğundan farklı hesabının aktif ya da pasif bir hesap tipi olması gerekmektedir" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "Fark Hesabı, bu Stok Mutabakatı bir Açılış Girişi olduğundan Varlık/Yükümlülük türü bir hesap olmalıdır" @@ -17039,11 +17044,9 @@ msgstr "" msgid "Disable In Words" msgstr "Yazı ile Alanını Devre Dışı Bırak" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "Son Alış Fiyatını Devre Dışı Bırak" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17084,6 +17087,12 @@ msgstr "Seri No ve Parti Seçiciyi Devre Dışı Bırak" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17140,7 +17149,7 @@ msgstr "Sök" msgid "Disassemble Order" msgstr "Sökme Emri" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17665,6 +17674,12 @@ msgstr "Toplu Değerleme Kullanma" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17755,9 +17770,12 @@ msgstr "Belgeleri Ara" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17775,6 +17793,10 @@ msgstr "Belge Türü" msgid "Document Type already used as a dimension" msgstr "Belge Türü zaten bir boyut olarak kullanılıyor" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "Dökümantasyon" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18079,7 +18101,7 @@ msgstr "Projeyi Görevlerle Çoğalt" msgid "Duplicate Sales Invoices found" msgstr "Yinelenen Satış Faturaları bulundu" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18199,8 +18221,8 @@ msgstr "ERP Kullanıcı ID" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18423,7 +18445,7 @@ msgstr "E-posta Makbuzu" msgid "Email Sent to Supplier {0}" msgstr "Tedarikçiye E-posta Gönderildi {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18613,7 +18635,7 @@ msgstr "Personel Kullanıcı ID" msgid "Employee cannot report to himself." msgstr "Personel kendisini rapor edemez." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18621,7 +18643,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "Varlık {0} verilirken personel seçimi gerekli" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18634,7 +18656,7 @@ msgstr "" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18677,7 +18699,7 @@ msgstr "Randevu Zamanlamayı Etkinleştirme" msgid "Enable Auto Email" msgstr "Otomatik E-postayı Etkinleştir" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "Otomatik Yeniden Siparişi Etkinleştir" @@ -19278,7 +19300,7 @@ msgstr "Hata: Bu varlık için zaten {0} amortisman dönemi ayrılmıştır.\n" "\t\t\t\t\tAmortisman başlangıç tarihi, `kullanıma hazır` tarihinden en az {1} dönem sonra olmalıdır.\n" "\t\t\t\t\tLütfen tarihleri buna göre düzeltin." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "Hata: {0} zorunlu bir alandır" @@ -19324,7 +19346,7 @@ msgstr "Fabrika Teslim " msgid "Example URL" msgstr "Örnek URL" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "Bağlantılı bir döküman örneği: {0}" @@ -19354,7 +19376,7 @@ msgstr "Örnek: Seri No {0} {1} adresinde ayrılmıştır." msgid "Exception Budget Approver Role" msgstr "İstisna Bütçe Onaylayıcı Rolü" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19713,7 +19735,7 @@ msgstr "Kullanım Ömrü Sonrası Beklenen Değer" msgid "Expense" msgstr "Gider" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "Gider / Fark hesabı ({0}) bir ‘Kar veya Zarar’ hesabı olmalıdır" @@ -19761,7 +19783,7 @@ msgstr "Gider / Fark hesabı ({0}) bir ‘Kar veya Zarar’ hesabı olmalıdır" msgid "Expense Account" msgstr "Gider Hesabı" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "Gider Hesabı Eksik" @@ -20224,7 +20246,7 @@ msgstr "Toplam Sıfır Miktarı Filtrele" msgid "Filter by Reference Date" msgstr "Referans Tarihine Göre Filtrele" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20554,7 +20576,7 @@ msgstr "Ürün Kabul Deposu" msgid "Finished Goods based Operating Cost" msgstr "Bitmiş Ürün Operasyon Maliyeti" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "Bitmiş Ürün {0} İş Emri {1} ile eşleşmiyor" @@ -20649,7 +20671,7 @@ msgstr "Vergi Sistemi zorunludur, lütfen {0} şirketinde vergi sistemini ayarla msgid "Fiscal Year" msgstr "Mali Yıl" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20713,7 +20735,7 @@ msgstr "Sabit Varlık Hesabı" msgid "Fixed Asset Defaults" msgstr "Sabit Varlık Varsayılanları" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "Sabit Varlık Kalemi stok dışı bir kalem olmalıdır." @@ -20863,7 +20885,7 @@ msgstr "Şirket Seçimi" msgid "For Item" msgstr "Ürün için" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "{0} Ürünü için {2} {3} karşılığında {1} miktarından fazla alınamaz." @@ -20894,7 +20916,7 @@ msgstr "Fiyat Listesi Seçimi" msgid "For Production" msgstr "Üretim için" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "Üretim Miktarı zorunludur" @@ -20978,6 +21000,12 @@ msgstr "" msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "{0} Ürünü için oran pozitif bir sayı olmalıdır. Negatif oranlara izin vermek için {2} sayfasında {1} ayarını etkinleştirin" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20999,7 +21027,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "{0} Miktarı izin verilen {1} miktarından büyük olmamalıdır" @@ -21008,7 +21036,7 @@ msgstr "{0} Miktarı izin verilen {1} miktarından büyük olmamalıdır" msgid "For reference" msgstr "Referans İçin" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "Satır {0} için {1} belgesi. Ürün fiyatına {2} masrafı dahil etmek için, satır {3} de dahil edilmelidir." @@ -21032,7 +21060,7 @@ msgstr "‘Başka Bir Kurala Uygula’ koşulu için {0} alanı zorunludur." msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "Müşterilere kolaylık sağlamak için bu kodlar Fatura ve İrsaliye gibi basılı formatlarda kullanılabilir" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -21041,7 +21069,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:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "{0} için {1} deposunda iade için stok bulunmamaktadır." @@ -21654,7 +21682,7 @@ msgstr "G - D" msgid "GENERAL LEDGER" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21666,7 +21694,7 @@ msgstr "Genel Muhasebe Bakiyesi" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "Genel Muhasebe Girişi" @@ -22181,7 +22209,7 @@ msgstr "Taşıma Halindeki Ürünler" msgid "Goods Transferred" msgstr "Transfer Edilen Mallar" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "{0} numaralı çıkış kaydına karşılık mallar zaten alınmış" @@ -22364,7 +22392,7 @@ msgstr "" msgid "Grant Commission" msgstr "Komisyona İzin Ver" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "Tutardan Büyük" @@ -23005,11 +23033,11 @@ msgstr "Sıklık" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" -msgstr "Projenin Toplam Satın Alma Maliyeti Güncelleme Sıklığı" +msgid "How often should project be updated of Total Purchase Cost ?" +msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling #. Settings' @@ -23164,7 +23192,7 @@ msgstr "Bir operasyon alt operasyonlara bölünmüşse buraya eklenebilir." msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "Boş bırakılırsa, işlemlerde Ana Depo Hesabı veya Şirket Varsayılanı dikkate alınacaktır." -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23347,7 +23375,7 @@ msgstr "" msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23519,11 +23547,11 @@ msgstr "Eğer bu istenmiyorsa lütfen ilgili Ödeme Girişini iptal edin." msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "Bu ürünün varyantları varsa, satış siparişlerinde vb. seçilemez." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "Bu seçenek 'Evet' olarak yapılandırılırsa, ERPNext önce bir Satınalma Siparişi oluşturmadan Satınalma Faturası veya Fişi oluşturmanızı engelleyecektir. Bu yapılandırma, Tedarikçi ana verisinde 'Satınalma Siparişi Olmadan Satınalma Faturası Oluşturulmasına İzin Ver' onay kutusunu etkinleştirerek belirli bir tedarikçi için geçersiz kılınabilir." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "Bu seçenek 'Evet' olarak yapılandırılırsa, ERPNext önce bir Satınalma Makbuzu oluşturmadan bir Satınalma Faturası oluşturmanızı engelleyecektir. Bu yapılandırma, Tedarikçi ana verisinde 'Satınalma Makbuzu Olmadan Satınalma Faturası Oluşturulmasına İzin Ver' onay kutusunu etkinleştirerek belirli bir tedarikçi için geçersiz kılınabilir." @@ -23639,7 +23667,7 @@ msgstr "Boş Stoku Yoksay" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "" @@ -23691,7 +23719,7 @@ msgstr "Fiyatlandırma Kuralını Yoksay etkinleştirildi. Kupon kodu uygulanam #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "Otomatik Oluşturulan Alacak ve Borçları Yoksay" @@ -23734,7 +23762,7 @@ msgstr "İş İstasyonu Zaman Çakışmasını Yoksay" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "Raporlar oluşturulurken sistemin kullanımda olduğu açılış bakiyesi sonrası eklemeye izin veren Defter Girişindeki eski Açılış mı alanını yok sayar" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23748,6 +23776,7 @@ msgid "Implementation Partner" msgstr "Uygulama Ortağı" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24101,7 +24130,7 @@ msgstr "Varsayılan FD Varlıklarını Dahil Et" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24355,7 +24384,7 @@ msgstr "İşlem Sonrası Yanlış Bakiye Miktarı" msgid "Incorrect Batch Consumed" msgstr "Yanlış Parti Tüketildi" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "Yeniden Sipariş İçin Depoda Yanlış Giriş (grup)" @@ -24363,7 +24392,7 @@ msgstr "Yeniden Sipariş İçin Depoda Yanlış Giriş (grup)" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "Yanlış Bileşen Miktarı" @@ -24573,14 +24602,14 @@ msgstr "Başlatıldı" msgid "Inspected By" msgstr "Kontrol Eden" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "Kalite Kontrol Rededildi" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "Kalite Kontrol Gerekli" @@ -24597,7 +24626,7 @@ msgstr "Teslim Almadan Önce Kontrol Gerekli" msgid "Inspection Required before Purchase" msgstr "Satın Almadan Önce Kontrol Gerekli" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "Kontrol Gönderimi" @@ -24679,8 +24708,8 @@ msgstr "Yetersiz Yetki" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "Yetersiz Stok" @@ -24900,7 +24929,7 @@ msgstr "İç Transferler" msgid "Internal Work History" msgstr "Firma İçindeki Geçmişi" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "Hesaplar arası transfer yalnızca şirketin varsayılan para biriminde yapılabilir" @@ -24993,7 +25022,7 @@ msgstr "Geçersiz Teslimat Tarihi" msgid "Invalid Discount" msgstr "Geçersiz İndirim" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -25023,7 +25052,7 @@ msgstr "Geçersiz Gruplama Ölçütü" msgid "Invalid Item" msgstr "Geçersiz Öğe" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "Geçersiz Ürün Varsayılanları" @@ -25109,12 +25138,12 @@ msgstr "Geçersiz Program" msgid "Invalid Selling Price" msgstr "Geçersiz Satış Fiyatı" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "Geçersiz Seri ve Parti" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25151,7 +25180,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "Geçersiz kayıp nedeni {0}, lütfen yeni bir kayıp nedeni oluşturun" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "{0} için geçersiz adlandırma serisi (. eksik)" @@ -25280,7 +25309,6 @@ msgstr "Fatura İptali" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "Fatura Tarihi" @@ -25301,10 +25329,6 @@ msgstr "" msgid "Invoice Grand Total" msgstr "Fatura Genel Toplamı" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "Fatura No" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25826,13 +25850,13 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "Alış Faturası ve İrsaliye oluşturmak için Satın Alma Siparişi gerekli mi?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "Alış Faturası oluşturmak için İrsaliye gerekli mi?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -26104,7 +26128,7 @@ msgstr "Sorunlar" msgid "Issuing Date" msgstr "Veriliş Tarihi" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "Ürünlerin birleştirilmesinden sonra doğru stok değerlerinin görünür hale gelmesi birkaç saat sürebilir." @@ -26174,7 +26198,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26221,6 +26245,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26236,7 +26261,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -27000,6 +27024,7 @@ msgstr "Üretici Firma" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -27010,7 +27035,6 @@ msgstr "Üretici Firma" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27270,11 +27294,11 @@ msgstr "Ürün Varyant Ayarları" msgid "Item Variant {0} already exists with same attributes" msgstr "Öğe Varyantı {0} aynı niteliklerle zaten mevcut" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "Ürün Varyantları Güncellendi" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "Ürün Deposu bazlı yeniden gönderim etkinleştirildi." @@ -27313,6 +27337,15 @@ msgstr "Ürün Web Sitesi Özellikleri" msgid "Item Weight Details" msgstr "Ürünün Ağırlığı" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27342,7 +27375,7 @@ msgstr "Ürün bazında Vergi Detayları" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27362,11 +27395,11 @@ msgstr "Ürün ve Depo" msgid "Item and Warranty Details" msgstr "Ürün ve Garanti Detayları" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "{0} satırındaki Kalem Malzeme Talebi ile eşleşmiyor" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "Ürünün varyantları mevcut." @@ -27396,7 +27429,7 @@ msgstr "Operasyon" msgid "Item qty can not be updated as raw materials are already processed." msgstr "Ürün miktarı güncellenemez çünkü hammaddeler zaten işlenmiş durumda." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "Aşağıdaki kalemler için Sıfır Değerlemeye İzin Ver işaretlendiğinden, fiyat sıfır olarak güncellenmiştir: {0}" @@ -27415,10 +27448,14 @@ msgstr "Ürün değerleme oranı, indirilmiş maliyet kuponu tutarı dikkate al msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "Ürün değerlemesi yeniden yapılıyor. Rapor geçici olarak yanlış değerleme gösterebilir." -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "Öğe Varyantı {0} aynı niteliklerle zaten mevcut" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27432,7 +27469,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "Ürün {0}, Toplu Sipariş {2} kapsamında {1} miktarından daha fazla sipariş edilemez." #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "{0} ürünü mevcut değil" @@ -27440,7 +27477,7 @@ msgstr "{0} ürünü mevcut değil" msgid "Item {0} does not exist in the system or has expired" msgstr "{0} Ürünü sistemde mevcut değil veya süresi dolmuş" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "{0} ürünü mevcut değil." @@ -27456,15 +27493,15 @@ msgstr "Ürün {0} zaten iade edilmiş" msgid "Item {0} has been disabled" msgstr "Ürün {0} Devre dışı bırakılmış" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "{0} Ürününe ait Seri Numarası yoktur. Yalnızca serileştirilmiş Ürünler Seri Numarasına göre teslimat yapılabilir" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "Ürün {0} {1} tarihinde kullanım süresinin sonuna gelmiştir." @@ -27476,19 +27513,23 @@ msgstr "{0} Stok Kalemi olmadığından, ürün yok sayılır" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "Ürün {0} zaten {1} Satış Siparişi karşılığında rezerve edilmiş/teslim edilmiştir." -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "Ürün {0} iptal edildi" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "{0} ürünü devre dışı bırakıldı" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "Ürün {0} bir serileştirilmiş Ürün değildir" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "Ürün {0} bir stok ürünü değildir" @@ -27496,7 +27537,11 @@ msgstr "Ürün {0} bir stok ürünü değildir" msgid "Item {0} is not a subcontracted item" msgstr "{0} Ürünü Alt Yüklenici Kalemi olmalıdır" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "Ürün {0} aktif değil veya kullanım süresinin sonuna gelindi" @@ -27512,7 +27557,7 @@ msgstr "Ürün {0} Stokta Olmayan Ürün olmalıdır" msgid "Item {0} must be a non-stock item" msgstr "{0} kalemi stok dışı bir ürün olmalıdır" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "Ürün {0}, {1} {2} içindeki ‘Tedarik Edilen Ham Maddeler’ tablosunda bulunamadı." @@ -27528,7 +27573,7 @@ msgstr "{0} ürünü {1} adetten daha az sipariş edilemez. Bu ayar ürün sayfa msgid "Item {0}: {1} qty produced. " msgstr "{0} Ürünü {1} adet üretildi. " -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "{0} Ürünü mevcut değil." @@ -27638,7 +27683,7 @@ msgstr "Hammadde Talebi için Ürünler" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "Aşağıdaki kalemler için Sıfır Değerleme Oranına İzin Ver işaretlendiğinden kalem oranı sıfır olarak güncellenmiştir: {0}" @@ -28271,7 +28316,7 @@ msgstr "" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "{1} deposundaki {0} adlı ürün için son Stok İşlemi {2} tarihinde gerçekleşti." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28550,7 +28595,7 @@ msgstr "Defter" msgid "Length (cm)" msgstr "Uzunluk (cm)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "Tutardan Az" @@ -28691,7 +28736,7 @@ msgstr "Bağlı Faturalar" msgid "Linked Location" msgstr "Bağlantılı Konum" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "Gönderilen belgelerle bağlantılı" @@ -29086,11 +29131,6 @@ msgstr "Varlık Bakımı" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "Satın Alma Süreci Boyunca Aynı Fiyatı Koru" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29102,6 +29142,11 @@ msgstr "Stok Yönetimi" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29298,7 +29343,7 @@ msgid "Major/Optional Subjects" msgstr "Bölüm" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29467,8 +29512,8 @@ msgstr "Zorunlu Bölüm" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29527,8 +29572,8 @@ msgstr "Manuel giriş oluşturulamaz! Hesap ayarlarında ertelenmiş muhasebe i #: 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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29677,7 +29722,7 @@ msgstr "Üretim Tarihi" msgid "Manufacturing Manager" msgstr "Üretim Müdürü" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "Üretim Miktarı zorunludur" @@ -29953,7 +29998,7 @@ msgstr "Malzeme Tüketimi" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "Üretim İçin Malzeme Tüketimi" @@ -30024,6 +30069,7 @@ msgstr "Stok Girişi" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30130,11 +30176,11 @@ msgstr "Malzeme Talebi Planı Ürünü" msgid "Material Request Type" msgstr "Malzeme Talep Türü" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "Hammaddeler için miktar zaten mevcut olduğundan Malzeme Talebi oluşturulmadı." @@ -30249,7 +30295,7 @@ msgstr "Üretim İçin Transfer Edilen Hammadde" msgid "Material Transferred for Manufacturing" msgstr "Üretim için Aktarılan Hammadde" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30378,11 +30424,11 @@ msgstr "Maksimum Ödeme Tutarı" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "Maksimum Numuneler - {0} Parti {1} ve Ürün {2} için saklanabilir." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "Maksimum Numuneler - {0} zaten {1} Partisi ve {3}Partisi için {2} Ürünü için saklandı." @@ -30826,11 +30872,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "Çeşitli Giderler" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "Uyuşmazlık" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "Eksik" @@ -30868,7 +30914,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "Kayıp Finans Kitabı" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "Eksik Bitmiş Ürün" @@ -30876,11 +30922,11 @@ msgstr "Eksik Bitmiş Ürün" msgid "Missing Formula" msgstr "Eksik Formül" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "Eksik Ürünler" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30924,10 +30970,6 @@ msgstr "Eksik Değer" msgid "Mixed Conditions" msgstr "Karışık Koşullar" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "Cep Telefonu: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31196,7 +31238,7 @@ msgstr "" msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "{0} tarihi için birden fazla mali yıl var. Lütfen Mali Yıl'da şirketi ayarlayın" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "Birden fazla ürün bitmiş ürün olarak işaretlenemez" @@ -31275,27 +31317,20 @@ msgstr "İsimlendirilmiş Yer" msgid "Naming Series Prefix" msgstr "Seri Öneki Adlandırma" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "Adlandırma Serisi ve Fiyatlar" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31343,16 +31378,16 @@ msgstr "İhtiyaç Analizi" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "Negatif Miktara izin verilmez" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "Negatif Değerleme Oranına izin verilmez" @@ -31966,7 +32001,7 @@ msgstr "POS Profili bulunamadı. Lütfen önce Yeni bir POS Profili oluşturun" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "İzin yok" @@ -31979,7 +32014,7 @@ msgstr "Hiçbir Satın Alma Siparişi oluşturulmadı" msgid "No Records for these settings." msgstr "Bu ayarlar için Kayıt Yok." -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "Seçim Yok" @@ -32024,7 +32059,7 @@ msgstr "Bu Cari için Uzlaşılmamış Ödeme bulunamadı" msgid "No Work Orders were created" msgstr "Hiçbir İş Emri oluşturulmadı" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "Aşağıdaki depolar için muhasebe kaydı yok" @@ -32037,7 +32072,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "{0} ürünü için aktif bir Ürün Ağacı bulunamadı. Seri No'ya göre teslimat sağlanamaz" @@ -32049,7 +32084,7 @@ msgstr "Ek alan mevcut değil" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -32057,7 +32092,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32151,7 +32186,7 @@ msgstr "Solda başka alt öğe yok" msgid "No more children on Right" msgstr "Sağda başka alt öğe yok" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32326,7 +32361,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "" @@ -32418,7 +32453,7 @@ msgstr "Sıfır Olmayanlar" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "Ürünlerin hiçbirinde miktar veya değer değişikliği yoktur." @@ -32522,7 +32557,7 @@ msgstr "{0} limitleri aştığı için yetkilendirilmedi" msgid "Not authorized to edit frozen Account {0}" msgstr "Dondurulmuş Hesabın düzenleme yetkisi yok {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32568,7 +32603,7 @@ msgstr "Not: 'Nakit veya Banka Hesabı' belirtilmediği için Ödeme Girişi olu msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "Not: Bu Maliyet Merkezi bir Gruptur. Gruplara karşı muhasebe girişleri yapılamaz." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "Kalemleri birleştirmek istiyorsanız, eski kalem {0} için ayrı bir Stok Mutabakatı oluşturun" @@ -33045,7 +33080,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "İş Emri {1} için yalnızca bir {0} girişi oluşturulabilir" @@ -33197,7 +33232,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "Açılış" @@ -33356,16 +33391,16 @@ msgstr "Açılış Satış Faturaları oluşturuldu." #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Açılış Stoku" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33722,7 +33757,7 @@ msgstr "İsteğe bağlı. Bu ayar, çeşitli işlemlerde filtreleme yapmak için msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33856,7 +33891,7 @@ msgstr "Sipariş Miktarı" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "Siparişler" @@ -34064,7 +34099,7 @@ msgstr "" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34122,7 +34157,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "Fazla Fatura Ödeneği (%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "" @@ -34140,7 +34175,7 @@ msgstr "Fazla Teslimat/Alınan Ürün Ödeneği (%)" msgid "Over Picking Allowance" msgstr "Fazla Seçim İzni" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "Fazla Teslim Alma" @@ -34383,7 +34418,6 @@ msgstr "POS Alanı" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "POS Faturası" @@ -34654,7 +34688,7 @@ msgstr "Paketli Ürün" msgid "Packed Items" msgstr "Paketli Ürünler" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "Paketlenmiş Ürünler dahili olarak transfer edilemez" @@ -35102,7 +35136,7 @@ msgstr "Kısmen Alındı" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35238,7 +35272,7 @@ msgstr "Milyonda Parça Sayısı" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35364,7 +35398,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35450,7 +35484,7 @@ msgstr "Partiye Özel Ürün" #: 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:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35753,7 +35787,6 @@ msgstr "Ödeme Girişleri {0} bağlantısı kaldırıldı" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -36011,7 +36044,7 @@ msgstr "Ödeme Referansları" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36090,10 +36123,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "Ödeme Durumu" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37113,7 +37142,7 @@ msgstr "Lütfen Önceliği Belirleyin" msgid "Please Set Supplier Group in Buying Settings." msgstr "Lütfen Satın Alma Ayarlarında Tedarikçi Grubunu Ayarlayın." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "Lütfen Hesap Belirtin" @@ -37145,11 +37174,11 @@ msgstr "Lütfen Hesap Planına bir Geçici Açılış hesabı ekleyin" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "Lütfen en az bir Seri No / Parti No ekleyin" @@ -37169,7 +37198,7 @@ msgstr "Lütfen hesabın kök bölgesindeki Şirkete ekleyin - {}" msgid "Please add {1} role to user {0}." msgstr "Lütfen {0} kullanıcısına {1} rolünü ekleyin." -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "Lütfen miktarı ayarlayın veya devam etmek için {0} öğesini düzenleyin." @@ -37276,7 +37305,7 @@ msgstr "Lütfen satın alma işlemini dahili satış veya teslimat belgesinin ke msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "Lütfen {0} ürünü için alış irsaliyesi veya alış faturası alın" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "Lütfen {1} adresini {2} adresiyle birleştirmeden önce {0} Ürün Paketini silin" @@ -37345,11 +37374,11 @@ msgstr "Değişim Miktarı Hesabı girin" msgid "Please enter Approving Role or Approving User" msgstr "Lütfen Onaylayan Rolü veya Onaylayan Kullanıcıyı girin" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "Lütfen maliyet merkezini girin" @@ -37361,7 +37390,7 @@ msgstr "Lütfen Teslimat Tarihini giriniz" msgid "Please enter Employee Id of this sales person" msgstr "Lütfen bu satış elemanının Personel Kimliğini girin" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "Lütfen Gider Hesabını girin" @@ -37406,7 +37435,7 @@ msgstr "Lütfen Referans tarihini giriniz" msgid "Please enter Root Type for account- {0}" msgstr "Lütfen hesap için Kök Türünü girin- {0}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "" @@ -37483,7 +37512,7 @@ msgstr "" msgid "Please enter the phone number first" msgstr "Lütfen önce telefon numaranızı giriniz" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "" @@ -37597,12 +37626,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "Şablonu indirmek için lütfen Şablon Türünü seçin" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "Lütfen indirim uygula seçeneğini belirleyin" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "Lütfen {0} Ürününe karşı Ürün Ağacını Seçin" @@ -37618,13 +37647,13 @@ msgstr "Lütfen Banka Hesabını Seçin" msgid "Please select Category first" msgstr "Lütfen önce Kategoriyi seçin" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "Lütfen önce vergi türünü seçin" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "Lütfen Şirket Seçin" @@ -37633,7 +37662,7 @@ msgstr "Lütfen Şirket Seçin" msgid "Please select Company and Posting Date to getting entries" msgstr "Girişleri almak için lütfen Şirket ve Gönderi Tarihini seçin" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "Lütfen önce Şirketi seçin" @@ -37682,7 +37711,7 @@ msgstr "" msgid "Please select Posting Date before selecting Party" msgstr "Cariyi seçmeden önce Gönderme Tarihi seçiniz" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "Lütfen önce Gönderi Tarihini seçin" @@ -37690,11 +37719,11 @@ msgstr "Lütfen önce Gönderi Tarihini seçin" msgid "Please select Price List" msgstr "Lütfen Fiyat Listesini Seçin" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "Lütfen {0} ürünü için miktar seçin" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "Lütfen önce Stok Ayarlarında Numune Saklama Deposunu seçin" @@ -37747,7 +37776,7 @@ msgstr "Lütfen bir Alt Yüklenici Siparişi seçin." msgid "Please select a Supplier" msgstr "Lütfen bir Tedarikçi Seçin" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "Lütfen bir Depo seçin" @@ -37808,7 +37837,7 @@ msgstr "Yeniden Yayınlama Girişi oluşturmak için lütfen bir satır seçin" msgid "Please select a supplier for fetching payments." msgstr "Lütfen ödemeleri almak için bir tedarikçi seçin." -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37828,7 +37857,7 @@ msgstr "Depoyu ayarlamadan önce lütfen bir ürün kodu seçin." msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37935,7 +37964,7 @@ msgstr "Lütfen geçerli belge türünü seçin." msgid "Please select weekly off day" msgstr "Haftalık izin süresini seçin" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "Lütfen Önce {0} Seçin" @@ -38075,7 +38104,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "Lütfen Şirket için bir Adres belirleyin '%s'" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "Lütfen Ürünler tablosunda bir Gider Hesabı ayarlayın" @@ -38119,7 +38148,7 @@ msgstr "Lütfen Şirket {0} adresinde varsayılan Gider Hesabını ayarlayın" msgid "Please set default UOM in Stock Settings" msgstr "Lütfen Stok Ayarlarında varsayılan Ölçü Birimini ayarlayın" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "Stok transferi sırasında yuvarlama kazancı ve kaybını kaydetmek için lütfen {0} şirketinde varsayılan satılan malın maliyeti hesabını ayarlayın" @@ -38238,7 +38267,7 @@ msgstr "Lütfen önce bir {0} belirtin." msgid "Please specify at least one attribute in the Attributes table" msgstr "Lütfen Özellikler tablosunda en az bir özelliği belirtin" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "Miktar veya Birim Fiyatı ya da her ikisini de belirtiniz" @@ -38409,7 +38438,7 @@ msgstr "Yayınlama Tarihi" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38434,7 +38463,7 @@ msgstr "Yayınlama Tarihi" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38549,7 +38578,7 @@ msgstr "Gönderim Tarih ve Saati" msgid "Posting Time" msgstr "Gönderme Saati" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "Gönderi tarihi ve gönderi saati zorunludur" @@ -38728,6 +38757,12 @@ msgstr "Önleyici Bakım" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39021,7 +39056,9 @@ msgstr "Fiyat veya ürün indirim dilimleri gereklidir" msgid "Price per Unit (Stock UOM)" msgstr "Birim Fiyat (Stok Birimi)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40376,6 +40413,7 @@ msgstr "" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40412,6 +40450,12 @@ msgstr "Alış Faturası Peşinatı" msgid "Purchase Invoice Item" msgstr "Alış Faturası Ürünü" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40463,6 +40507,7 @@ msgstr "Alış Faturaları" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40472,7 +40517,7 @@ msgstr "Alış Faturaları" #: 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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40589,7 +40634,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "Satın Alma Emri {0} kaydedilmedi" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "Satın Alma Siparişleri" @@ -40652,6 +40697,7 @@ msgstr "Satın Alma Fiyat Listesi" #: 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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40666,7 +40712,7 @@ msgstr "Satın Alma Fiyat Listesi" msgid "Purchase Receipt" msgstr "Alış İrsaliyesi" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40932,7 +40978,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41520,7 +41565,7 @@ msgstr "İnceleme" msgid "Quality Review Objective" msgstr "Kalite Hedefi Amaçları" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41581,7 +41626,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41775,7 +41820,7 @@ msgstr "Sorgu Rota Dizesi" msgid "Queue Size should be between 5 and 100" msgstr "Kuyruk Boyutu 5 ile 100 arasında olmalıdır" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "Hızlı Defter Girişi" @@ -41830,7 +41875,7 @@ msgstr "Teklif/Müşteri Adayı %" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41993,7 +42038,6 @@ msgstr "Talep eden (Email)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42403,8 +42447,8 @@ msgstr "" msgid "Raw SQL" msgstr "" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42812,11 +42856,10 @@ msgstr "Banka İşlemlerinin Mutabakatını Yapın" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43340,7 +43383,7 @@ msgstr "Reddedilen Seri ve Parti" msgid "Rejected Warehouse" msgstr "Red Deposu" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "Red Deposu ile Kabul Deposu aynı olamaz." @@ -43390,7 +43433,7 @@ msgid "Remaining Balance" msgstr "Kalan Bakiye" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43444,7 +43487,7 @@ msgstr "Açıklama" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43483,7 +43526,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "Ürüne uygulanamayan masraflar varsa ürünü kaldırın." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "Miktarında veya değerinde değişiklik olmayan ürünler kaldırıldı." @@ -43887,6 +43930,7 @@ msgstr "Bilgi Talebi" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44160,7 +44204,7 @@ msgstr "" msgid "Reserved" msgstr "Ayrılmış" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44773,7 +44817,7 @@ msgstr "" msgid "Reversal Of" msgstr "Ters Kayıt" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "Yevmyie Kaydını Geri Al" @@ -44922,10 +44966,7 @@ msgstr "Rolün Fazla Teslim/Alma İzni Var" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "Durdurma Eylemini Geçersiz Kılma İzni Olan Rol" @@ -44940,8 +44981,11 @@ msgstr "Kredi Limitini aşmasına izin verilen rol" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45142,8 +45186,8 @@ msgstr "Yuvarlama Kaybı Karşılığı" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "Yuvarlama Kaybı Karşılığı 0 ile 1 arasında olmalıdır." -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "Stok Transferi için Yuvarlama Kazanç/Kayıp Girişi" @@ -45170,11 +45214,11 @@ msgstr "Rota İsmi" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "Satır # {0}: Ürün {2} için {1} miktarından fazlası iade edilemez" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "Satır # {0}: Lütfen {1} ürünü için Seri ve Parti Paketi ekleyin" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "" @@ -45200,7 +45244,7 @@ msgstr "Satır #{0} (Ödeme Tablosu): Tutar negatif olmalıdır" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "Satır #{0} (Ödeme Tablosu): Tutar pozitif olmalıdır" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "Satır #{0}: {1} deposu için {2} yeniden sipariş türüyle zaten yeniden bir sipariş girişi mevcut." @@ -45401,7 +45445,7 @@ msgstr "Satır #{0}: Referanslarda yinelenen giriş {1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "Satır #{0}: Beklenen Teslimat Tarihi Satın Alma Siparişi Tarihinden önce olamaz" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "Satır #{0}: Gider Hesabı {1} Öğesi için ayarlanmadı. {2}" @@ -45461,7 +45505,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "Satır # {0}: Ürün eklendi" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45489,7 +45533,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "Satır #{0}: Ürün {1}, Serili/Partili bir ürün değil. Seri No/Parti No’su atanamaz." @@ -45542,7 +45586,7 @@ msgstr "Satır #{0}: Yalnızca {1} Öğesi {2} için rezerve edilebilir" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "Satır #{0}: {1} Operasyonu {3} İş Emrindeki {2} adet için tamamlanamadı. Lütfen önce {4} İş Kartındaki operasyon durumunu güncelleyin." @@ -45567,7 +45611,7 @@ msgstr "" msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Satır #{0}: Lütfen Alt Montaj Deposunu seçin" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "Satır #{0}: Lütfen yeniden sipariş miktarını ayarlayın" @@ -45593,15 +45637,15 @@ msgstr "Satır #{0}: Miktar pozitif bir sayı olmalıdır" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "Satır #{0}: Miktar, {4} deposunda {3} Partisi için {2} ürününe karşı Rezerve Edilebilir Miktar'dan (Gerçek Miktar - Rezerve Edilen Miktar) {1} küçük veya eşit olmalıdır." -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "Satır #{0}: {1} ürünü için Kalite Kontrol gereklidir" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "Satır #{0}: {1} Kalite Kontrol {2} Ürünü için gönderilmemiş" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "Satır #{0}: {1} Kalite Kontrolü {2} Ürünü için reddedildi" @@ -45632,11 +45676,11 @@ msgstr "Satır #{0}: {1} Kalemi için rezerve edilecek miktar 0'dan büyük olma msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "Satır #{0}: {1} işlemindeki fiyat ile aynı olmalıdır: {2} ({3} / {4})" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "Satır #{0}: Referans Belge Türü Satın Alma Emri, Satın Alma Faturası veya Defter Girişi'nden biri olmalıdır" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "Satır #{0}: Referans Belge Türü, Satış Siparişi, Satış Faturası, Yevmiye Kaydı veya Takip Uyarısı’ndan biri olmalıdır" @@ -45679,7 +45723,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "Satır #{0}: Seri No {1} , Parti {2}'ye ait değil" @@ -45727,11 +45771,11 @@ msgstr "" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45784,11 +45828,11 @@ msgstr "" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "Satır #{0}: {1} grubu zaten sona erdi." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "Satır #{0}: {1} deposu, {2} grup deposunun alt deposu değildir." @@ -45816,7 +45860,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "Satır #{0}: Envanter boyutu ‘{1}’ Stok Sayımı miktarı veya değerleme oranını değiştirmek için kullanılamaz. Envanter boyutlarıyla yapılan stok doğrulaması yalnızca açılış kayıtları için kullanılmalıdır." @@ -45852,23 +45896,23 @@ msgstr "Satır #{1}: {0} Stok Ürünü için Depo zorunludur" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "Satır #{idx}: Alt yükleniciye hammadde tedarik ederken Tedarikçi Deposu seçilemez." -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "Satır #{idx}: Ürün oranı, dahili bir stok transferi olduğu için değerleme oranına göre güncellenmiştir." -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "Satır #{idx}: Alınan Miktar, {item_code} Kalemi için Kabul Edilen + Reddedilen Miktara eşit olmalıdır." -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "Satır #{idx}: {field_label} kalemi {item_code} için negatif olamaz." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "" @@ -45876,7 +45920,7 @@ msgstr "" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "" @@ -45941,7 +45985,7 @@ msgstr "Satır #{}: {}" msgid "Row #{}: {} {} does not exist." msgstr "Satır #{}: {} {} mevcut değil." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "Satır #{}: {} {}, {} Şirketine ait değil. Lütfen geçerli {} seçin." @@ -45957,7 +46001,7 @@ msgstr "Satır {0} : Hammadde öğesine karşı işlem gerekiyor {1}" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "Satır {0}: Seçilen miktar gereken miktardan daha az, ek olarak {1} {2} gerekli." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "Satır {0}#: Ürün {1}, {2} {3} içindeki ‘Tedarik Edilen Ham Maddeler’ tablosunda bulunamadı." @@ -45989,7 +46033,7 @@ msgstr "Satır {0}: Tahsis edilen tutar {1}, fatura kalan tutarı {2}’den az v msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "Satır {0}: Tahsis edilen tutar {1}, kalan ödeme tutarı {2} değerinden az veya ona eşit olmalıdır." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "Satır {0}: {1} etkin olduğu için, ham maddeler {2} girişine eklenemez. Ham maddeleri tüketmek için {3} girişini kullanın." @@ -46047,7 +46091,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "Satır {0}: Ya İrsaliye Kalemi ya da Paketlenmiş Kalem referansı zorunludur." #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "Satır {0}: Döviz Kuru zorunludur" @@ -46088,7 +46132,7 @@ msgstr "Satır {0}: Başlangıç Saati ve Bitiş Saati zorunludur." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "Satır {0}: {1} için Başlangıç ve Bitiş Saatleri {2} ile çakışıyor" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "Satır {0}: İç transferler için Gönderen Depo zorunludur." @@ -46212,7 +46256,7 @@ msgstr "Satır {0}: Miktar Sıfırdan büyük olmalıdır." msgid "Row {0}: Quantity cannot be negative." msgstr "Satır {0}: Miktar negatif olamaz." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "Satır {0}: Girişin kayıt zamanında ({2} {3}) depo {1} için {4} miktarı mevcut değil" @@ -46224,11 +46268,11 @@ msgstr "" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "Satır {0}: Amortisman zaten işlenmiş olduğundan vardiya değiştirilemez" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "Satır {0}: Hammadde {1} için alt yüklenici kalemi zorunludur" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "Satır {0}: İç transferler için Hedef Depo zorunludur." @@ -46252,7 +46296,7 @@ msgstr "Satır {0}: {3} Hesabı {1} {2} şirketine ait değildir" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "Satır {0}: {1} periyodunu ayarlamak için başlangıç ve bitiş tarihleri arasındaki fark {2} değerinden büyük veya eşit olmalıdır." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46305,7 +46349,7 @@ msgstr "Satır {0}: {2} Öğe {1} {2} {3} içinde mevcut değil" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "Satır {1}: Miktar ({0}) kesirli olamaz. Bunu etkinleştirmek için, {3} Ölçü Biriminde ‘{2}’ seçeneğini devre dışı bırakın." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "" @@ -46335,7 +46379,7 @@ msgstr "Aynı Hesap Başlığına sahip satırlar, Muhasebe Defterinde birleşti msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "Diğer satırlardaki yinelenen teslim dosyalarına sahip satırlar bulundu: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "Satırlar: {0} referans_türü olarak 'Ödeme Girişi'ne sahiptir. Bu manuel olarak ayarlanmamalıdır." @@ -46401,7 +46445,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46698,7 +46742,7 @@ msgstr "Satış Gelen Oranı" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46872,7 +46916,7 @@ msgstr "Kaynağa Göre Satış Fırsatları" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46995,8 +47039,8 @@ msgstr "Ürün için Satış Siparişi gerekli {0}" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "Satış Siparişi {0} Müşterinin Satın Alma Siparişi {1} ile zaten mevcut. Birden fazla Satış Siparişine izin vermek için {2} adresini {3} adresinde etkinleştirin" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47407,7 +47451,7 @@ msgstr "Aynı Ürün" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "Aynı Ürün ve Depo kombinasyonu zaten girilmiş." @@ -47444,7 +47488,7 @@ msgstr "Numune Saklama Deposu" msgid "Sample Size" msgstr "Numune Boyutu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "Numune miktarı {0} alınan miktardan fazla olamaz {1}" @@ -47735,7 +47779,7 @@ msgstr "Ürün kodu, seri numarası veya barkoda göre arama" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47880,7 +47924,7 @@ msgstr "Marka Seçin..." msgid "Select Columns and Filters" msgstr "Sütunları ve Filtreleri Seçin" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "Şirket Seç" @@ -48576,7 +48620,7 @@ msgstr "Seri No Aralığı" msgid "Serial No Reserved" msgstr "Seri No Ayrılmış" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48637,7 +48681,7 @@ msgstr "Seri No zorunludur" msgid "Serial No is mandatory for Item {0}" msgstr "Ürün {0} için Seri no zorunludur" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "Seri No {0} zaten mevcut" @@ -48923,7 +48967,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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48949,7 +48993,7 @@ msgstr "" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49347,12 +49391,6 @@ msgstr "Hedef Depo" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "Değerleme Oranını Kaynak Depoya Göre Ayarla" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "Reddedilen Malzemeler için Değerleme Oranı Belirleyin" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "Hedef Depo" @@ -49458,6 +49496,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "Şirket {2} için {1} varlık kategorisinde {0} değerini ayarlayın" @@ -49956,7 +50000,7 @@ msgstr "Hesap Planında Bakiyeleri Göster" msgid "Show Barcode Field in Stock Transactions" msgstr "Stok İşlemlerinde Barkod Alanını Göster" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "İptal Edilen Girişleri Göster" @@ -49964,7 +50008,7 @@ msgstr "İptal Edilen Girişleri Göster" msgid "Show Completed" msgstr "Tamamlananları Göster" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "" @@ -50047,7 +50091,7 @@ msgstr "Bağlı İrsaliyeleri Göster" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "Cari Hesabındaki Net Değerleri Göster" @@ -50059,7 +50103,7 @@ msgstr "" msgid "Show Open" msgstr "Açık Olanlar" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "Açılış Girişlerini Göster" @@ -50072,11 +50116,6 @@ msgstr "" msgid "Show Operations" msgstr "Operasyonları Göster" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "Satın Alma Siparişi Portalında Ödeme Butonunu Göster" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "Ödeme Ayrıntılarını Göster" @@ -50092,7 +50131,7 @@ msgstr "Ödeme Planını Göster" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "Açıklamaları Göster" @@ -50159,6 +50198,11 @@ msgstr "Sadece POS'u göster" msgid "Show only the Immediate Upcoming Term" msgstr "Yalnızca Hemen Yaklaşan Dönemi Göster" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "Bekleyen girişleri göster" @@ -50447,11 +50491,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50517,7 +50561,7 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "Kaynak ve Hedef Konum aynı olamaz" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "{0} nolu satırda Kaynak ve Hedef Depo aynı olamaz" @@ -50531,8 +50575,8 @@ msgid "Source of Funds (Liabilities)" msgstr "Fon Kaynakları (Borçlar)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "{0} satırı için Kaynak Depo zorunludur" @@ -50697,8 +50741,8 @@ msgstr "Standart Oranlı Giderler" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "Standart Satış" @@ -51031,7 +51075,7 @@ msgstr "Stok Kapanış Günlüğü" msgid "Stock Details" msgstr "Stok Detayları" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "Stok Girişleri İş Emri için zaten oluşturuldu {0}: {1}" @@ -51302,7 +51346,7 @@ msgstr "Faturalanmamış Alınan Stok" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51314,7 +51358,7 @@ msgstr "Stok Sayımı" msgid "Stock Reconciliation Item" msgstr "Stok Sayımı Kalemi" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "Stok Sayımı" @@ -51352,7 +51396,7 @@ msgstr "Stok Yeniden Gönderim Ayarları" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51380,7 +51424,7 @@ msgstr "Stok Rezervasyon Girişleri İptal Edildi" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "Stok Rezervasyon Girişleri Oluşturuldu" @@ -51762,7 +51806,7 @@ msgstr "Durdurulan İş Emri iptal edilemez, iptal etmek için önce durdurmayı #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "Mağazalar" @@ -51840,10 +51884,6 @@ msgstr "Alt Operasyonlar" msgid "Sub Procedure" msgstr "Alt Prosedür" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "Ara Toplam" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -52060,7 +52100,7 @@ msgstr "" msgid "Subcontracting Order" msgstr "Alt Yüklenici Siparişi" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52086,7 +52126,7 @@ msgstr "Alt Yüklenici Sipariş Kalemi" msgid "Subcontracting Order Supplied Item" msgstr "Alt Yüklenici Siparişi Tedarik Edilen Ürün" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "Alt Sözleşme Siparişi {0} oluşturuldu." @@ -52175,7 +52215,7 @@ msgstr "" msgid "Subdivision" msgstr "Alt Bölüm" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "Gönderim Eylemi Başarısız Oldu" @@ -52350,7 +52390,7 @@ msgstr "Başarıyla Uzlaştırıldı" msgid "Successfully Set Supplier" msgstr "Tedarikçi Başarıyla Ayarlandı" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "Stok Ölçü Birimi başarıyla değiştirildi, lütfen yeni Ölçü Birimi için dönüşüm faktörlerini yeniden tanımlayın." @@ -52506,6 +52546,7 @@ msgstr "Tedarik Edilen Miktar" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52547,8 +52588,8 @@ msgstr "Tedarik Edilen Miktar" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52596,6 +52637,12 @@ msgstr "Tedarikçi Adresleri ve Kişiler" msgid "Supplier Contact" msgstr "İlgili Kişi" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52690,7 +52737,7 @@ msgstr "Tedarikçi Fatura Tarihi" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "Tedarikçi Fatura No" @@ -52970,19 +53017,10 @@ msgstr "Ürün veya Hizmet Tedarikçisi." msgid "Supplier {0} not found in {1}" msgstr "Tedarikçi {0} {1} konumunda bulunamadı" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Tedarikçiler" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "Tedarikçi Satış Analizi" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53044,7 +53082,7 @@ msgstr "Destek Ekibi" msgid "Support Tickets" msgstr "Destek Talepleri" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53303,8 +53341,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "{0} satırı için Hedef Depo zorunlu" @@ -53773,7 +53811,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "Vergilendirilebilir Tutar" @@ -53934,7 +53972,7 @@ msgstr "Çıkarılan Vergiler" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "Düşülen Vergi ve Harçlar (Şirket Para Biriminde)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "Vergi Satırı #{0}: {1} değeri {2} değerinden küçük olamaz" @@ -54124,7 +54162,6 @@ msgstr "Şartlar Şablonu" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54316,7 +54353,7 @@ msgstr "Portaldan Teklif İsteğine Erişim Devre Dışı Bırakıldı. Erişime msgid "The BOM which will be replaced" msgstr "Değiştirilecek Ürün Ağacı" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "" @@ -54360,7 +54397,7 @@ msgstr "{0} satırındaki Ödeme Süresi muhtemelen bir tekrardır." 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 "Stok Rezervasyon Girişleri olan Seçim Listesi güncellenemez. Değişiklik yapmanız gerekiyorsa, Seçim Listesini güncellemeden önce mevcut Stok Rezervasyon Girişlerini iptal etmenizi öneririz." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "Proses Kaybı Miktarı, iş kartlarındaki Proses Kaybı Miktarına göre sıfırlandı." @@ -54376,7 +54413,7 @@ msgstr "Satır #{0}: {1} Seri Numarası, {2} deposunda mevcut değil." msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "Seri No {0} , {1} {2} için ayrılmıştır ve başka bir işlem için kullanılamaz." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "Seri ve Parti Paketi {0}, bu işlem için geçerli değil. Seri ve Parti Paketi {0} içinde ‘İşlem Türü’ ‘Giriş’ yerine ‘Çıkış’ olmalıdır." @@ -54412,7 +54449,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54518,7 +54555,7 @@ msgstr "" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "Aşağıdaki silinmiş nitelikler Varyantlarda mevcuttur ancak Şablonda mevcut değildir. Varyantları silebilir veya nitelikleri şablonda tutabilirsiniz." @@ -54562,15 +54599,15 @@ msgstr "{0} tarihindeki tatil Başlangıç Tarihi ile Bitiş Tarihi arasında de msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "Ürünler {0} ve {1}, aşağıdaki {2} içinde bulunmaktadır:" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "" @@ -54726,7 +54763,7 @@ msgstr "{0} ile paylaşımlar mevcut değil" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "{1} deposundaki {0} ürünü için stok, {2} tarihinde negatife düştü. Bu durumu düzeltmek için {4} tarihi ve {5} saatinden önce {3} işlemiyle pozitif bir stok girişi oluşturmalısınız. Aksi takdirde, sistem doğru değerleme oranını hesaplayamaz." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "Stok aşağıdaki Ürünler ve Depolar için rezerve edilmiştir, Stok Sayımı {0} için rezerve edilmeyen hale getirin:

{1}" @@ -54748,11 +54785,11 @@ 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/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "Görev arka plan işi olarak sıraya alındı. Arka planda işlemede herhangi bir sorun olması durumunda, sistem bu Stok Sayımı hata hakkında bir yorum ekleyecek ve Taslak aşamasına geri dönecektir." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "Görev arka plan işi olarak kuyruğa alındı. Arka planda işlem yapılmasında herhangi bir sorun olması durumunda sistem bu Stok Sayımı hata hakkında yorum ekleyecek ve Gönderildi aşamasına geri dönecektir." @@ -54824,7 +54861,7 @@ msgstr "{0} ({1}) ile {2} ({3}) eşit olmalıdır" msgid "The {0} contains Unit Price Items." msgstr "" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54877,7 +54914,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "Bu tarihte boş yer bulunmamaktadır" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54921,7 +54958,7 @@ msgstr "{0} için grup bulunamadı: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "Bu Stok Girişinde en az 1 Bitmiş Ürün bulunmalıdır" @@ -54977,11 +55014,11 @@ msgstr "Bu Ürün {0} Kodlu Ürünün Bir Varyantıdır." msgid "This Month's Summary" msgstr "Bu Ayın Özeti" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55782,7 +55819,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "{0} nolu satırdaki verginin ürün fiyatına dahil edilebilmesi için, {1} satırındaki vergiler de dahil edilmelidir" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "Birleştirmek için, aşağıdaki özellikler her iki öğe için de aynı olmalıdır" @@ -55817,7 +55854,7 @@ msgstr "Farklı bir finans defteri kullanmak için lütfen 'Varsayılan FD Varl #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "Farklı bir finans defteri kullanmak için lütfen 'Varsayılan FD Girişlerini Dahil Et' seçeneğinin işaretini kaldırın" @@ -55968,7 +56005,7 @@ msgstr "Toplam Tahsisler" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Toplam Tutar" @@ -56391,7 +56428,7 @@ msgstr "Toplam Ödeme Talebi tutarı {0} tutarından büyük olamaz" msgid "Total Payments" msgstr "Toplam Ödemeler" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "Toplam Toplanan Miktar {0} sipariş edilen {1} miktardan fazladır. Fazla Toplama Ödeneğini Stok Ayarlarında ayarlayabilirsiniz." @@ -56423,7 +56460,7 @@ msgstr "Toplam Satınalma Maliyeti (Satınalma Fatura üzerinden)" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Toplam Miktar" @@ -56809,7 +56846,7 @@ msgstr "İzleme Bağlantısı" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56820,7 +56857,7 @@ msgstr "İşlem" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "İşlem Para Birimi" @@ -57492,11 +57529,11 @@ msgstr "BAE KDV Ayarları" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57568,7 +57605,7 @@ msgstr "Ölçü Birimi Dönüşüm faktörü {0} satırında gereklidir" msgid "UOM Name" msgstr "Ölçü Birimi Adı" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "Ürünü içinde: {1} ölçü birimi için: {0} dönüştürme faktörü gereklidir" @@ -57644,7 +57681,7 @@ msgstr "{0} ile başlayan puan bulunamadı. 0 ile 100 arasında değişen sabit msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "Önümüzdeki {0} gün içinde {1} operasyonu için zaman aralığı bulunamıyor. Lütfen {2} sayfasındaki 'Kapasite Planlama' alanının değerini artırın." -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "Değişken bulunamadı:" @@ -57763,7 +57800,7 @@ msgstr "Ölçü Birimi" msgid "Unit of Measure (UOM)" msgstr "Ölçü Birimi" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "Ölçü Birimi {0} Dönüşüm Faktörü Tablosuna birden fazla girildi" @@ -57883,10 +57920,9 @@ msgid "Unreconcile Transaction" msgstr "Uzlaştırılmamış İşlem" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "Uzlaşılmamış" @@ -57909,10 +57945,6 @@ msgstr "Mutabık Olunmayan Girişler" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57958,7 +57990,7 @@ msgstr "planlanmamış" msgid "Unsecured Loans" msgstr "Teminatsız Krediler" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "Eşleşen Ödeme Talebini Ayarla" @@ -58173,12 +58205,6 @@ msgstr "Stok Güncelle" msgid "Update Type" msgstr "Güncelleme Türü" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "Projenin güncelleme sıklığı" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58219,7 +58245,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "" -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "Varyantlar Güncelleniyor..." @@ -58677,12 +58703,6 @@ msgstr "Uygulanan Kuralı Doğrula" msgid "Validate Components and Quantities Per BOM" msgstr "Ürün Ağacı Başına Bileşen Miktarlarını Doğrula" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58706,6 +58726,12 @@ msgstr "Fiyatlandırma Kuralını Doğrula" msgid "Validate Stock on Save" msgstr "Stokları Kaydederken Doğrula" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58812,11 +58838,11 @@ msgstr "Değerleme Fiyatı Eksik" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "Ürün {0} için Değerleme Oranı, {1} {2} muhasebe kayıtlarını yapmak için gereklidir." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "Açılış Stoku girilirse Değerleme Oranı zorunludur" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "{1} nolu satırdaki {0} Ürünü için Değerleme Oranı gereklidir" @@ -58826,7 +58852,7 @@ msgstr "{1} nolu satırdaki {0} Ürünü için Değerleme Oranı gereklidir" msgid "Valuation and Total" msgstr "Değerleme ve Toplam" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "Müşteri tarafından sağlanan ürünler için değerleme oranı sıfır olarak ayarlandı." @@ -58976,7 +59002,7 @@ msgstr "Varyans ({})" msgid "Variant" msgstr "Varyant" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "Varyant Özelliği Hatası" @@ -58995,7 +59021,7 @@ msgstr "Varyant Ürün Ağacı" msgid "Variant Based On" msgstr "Varyant Referansı" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "Varyant Tabanlı değiştirilemez" @@ -59013,7 +59039,7 @@ msgstr "Varyant Alanı" msgid "Variant Item" msgstr "Varyant Ürün" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "Varyant Ürünler" @@ -59394,7 +59420,7 @@ msgstr "Belge Adı" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59434,7 +59460,7 @@ msgstr "Belge Miktarı" #. Label of the voucher_subtype (Small Text) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "Giriş Türü" @@ -59466,7 +59492,7 @@ msgstr "Giriş Türü" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59701,7 +59727,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "Depo {0}, Satış Siparişi {1} için kullanılamaz. Kullanılması gereken depo {2} şeklinde ayarlanmalı" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "{0} Deposu herhangi bir hesaba bağlı değil, lütfen depo kaydında hesabı belirtin veya {1} Şirketinde varsayılan stok hesabını ayarlayın." @@ -59748,7 +59774,7 @@ msgstr "Mevcut işlemi olan depolar deftere dönüştürülemez." #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59804,6 +59830,12 @@ msgstr "Yeni Fiyat Teklifi Talebi için Uyar" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "Uyarı - Satır {0}: Faturalama Saatleri Gerçek Saatlerden Fazla" @@ -59987,7 +60019,7 @@ msgstr "Web Sitesi Özellikleri" msgid "Website:" msgstr "Website:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60361,7 +60393,7 @@ msgstr "İş Emri Tüketilen Malzemeler" msgid "Work Order Item" msgstr "İş Emri Ürünü" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60423,11 +60455,11 @@ msgstr "İş Emri oluşturulmadı" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "İş Emri {0}: {1} operasyonu için İş Kartı bulunamadı" @@ -60743,11 +60775,11 @@ msgstr "Yıl" msgid "Year Start Date" msgstr "Başlangıç" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60800,7 +60832,7 @@ msgstr "Bu bağlantıyı kopyalayıp tarayıcınıza da yapıştırabilirsiniz" msgid "You can also set default CWIP account in Company {}" msgstr "Ayrıca, Şirket içinde genel Sermaye Devam Eden İşler hesabını da ayarlayabilirsiniz {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60954,6 +60986,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60982,7 +61018,7 @@ msgstr "" msgid "You have entered a duplicate Delivery Note on Row" msgstr "Satırda tekrarlayan bir İrsaliye girdiniz" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60990,7 +61026,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "Yeniden sipariş seviyelerini korumak için Stok Ayarlarında otomatik yeniden siparişi etkinleştirmeniz gerekir." @@ -61061,8 +61097,11 @@ msgstr "Sıfır Değerinde" msgid "Zero quantity" msgstr "Sıfır Adet" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61174,7 +61213,7 @@ msgstr "exchangerate.host" msgid "fieldname" msgstr "alan" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61392,6 +61431,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "Benzersiz bir olmalı: INDIRIM20 İndirim almak için kullanılacak." +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "sapma" @@ -61450,7 +61493,8 @@ msgstr "{0} Kupon kullanıldı {1}. İzin verilen miktar tükendi" msgid "{0} Digest" msgstr "{0} Özeti" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61470,7 +61514,7 @@ msgstr "{0} Operasyonlar: {1}" msgid "{0} Request for {1}" msgstr "{1} için {0} Talebi" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} Numune Saklama partiye dayalıdır, lütfen Ürünün numunesini saklamak için Parti Numarası Var seçeneğini işaretleyin" @@ -61583,7 +61627,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} iki kere ürün vergisi girildi" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "{1} Ürün Vergilerinde iki kez {0} olarak girildi" @@ -61751,7 +61795,7 @@ msgstr "{0} parametresi geçersiz" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} ödeme girişleri {1} ile filtrelenemez" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "{1} ürününden {0} miktarı, {3} kapasiteli {2} deposuna alınmaktadır." @@ -61764,7 +61808,7 @@ msgstr "{0} ile {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "{0} birim {1} Ürünü için {2} Deposunda rezerve edilmiştir, lütfen Stok Doğrulamasını {3} yapabilmek için stok rezevini kaldırın." @@ -61966,7 +62010,7 @@ msgstr "{0} {1}: Hesap {2} etkin değil" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: {2} için muhasebe kaydı yalnızca bu para birimi ile yapılabilir: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: Maliyet Merkezi {2} öğesi için zorunludur" @@ -62052,23 +62096,23 @@ msgstr "{0}: {1} mevcut değil" msgid "{0}: {1} is a group account." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} {2} değerinden küçük olmalıdır" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} iptal edildi veya kapatıldı." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "{item_name} için Numune Boyutu ({sample_size}) Kabul Edilen Miktardan ({accepted_quantity}) büyük olamaz" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "" diff --git a/erpnext/locale/vi.po b/erpnext/locale/vi.po index f0935ca69c5..29b85a57450 100644 --- a/erpnext/locale/vi.po +++ b/erpnext/locale/vi.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:21\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:21\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Vietnamese\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr " Phân lắp phụ" msgid " Summary" msgstr " Tóm tắt" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "\"Mặt hàng do khách hàng cung cấp\" không thể đồng thời là Mặt hàng mua" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "\"Mặt hàng do khách hàng cung cấp\" không thể có Tỷ giá định giá" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "\"Là Tài sản cố định\" không thể bỏ chọn, vì tồn tại bản ghi Tài sản đối với mặt hàng này" @@ -302,7 +302,7 @@ msgstr "'Từ ngày' là bắt buộc" msgid "'From Date' must be after 'To Date'" msgstr "'Từ ngày' phải sau 'Đến ngày'" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "'Có Serial No' không thể là 'Có' đối với mặt hàng không tồn kho" @@ -338,7 +338,7 @@ msgstr "'Cập nhật kho' không thể được chọn vì các mặt hàng kh msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "'Cập nhật kho' không thể được chọn khi bán tài sản cố định" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "Tài khoản '{0}' đã được sử dụng bởi {1}. Hãy sử dụng tài khoản khác." @@ -1050,7 +1050,7 @@ msgstr "Phải đặt tài xế để trình." msgid "A logical Warehouse against which stock entries are made." msgstr "Một Kho logic mà các phiếu kho được tạo against." -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "Đã xảy ra xung đột chuỗi đặt tên khi tạo số serial. Vui lòng thay đổi chuỗi đặt tên cho mặt hàng {0}." @@ -1262,7 +1262,7 @@ msgstr "Khóa Truy cập là bắt buộc cho Nhà cung cấp Dịch vụ: {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "Theo CEFACT/ICG/2010/IC013 hoặc CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "Theo BOM {0}, Mặt hàng '{1}' thiếu trong phiếu kho." @@ -1932,8 +1932,8 @@ msgstr "Bút toán Kế toán" msgid "Accounting Entry for Asset" msgstr "Bút toán Kế toán cho Tài sản" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "Bút toán Kế toán cho LCV trong Phiếu kho {0}" @@ -1941,7 +1941,7 @@ msgstr "Bút toán Kế toán cho LCV trong Phiếu kho {0}" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "Bút toán Kế toán cho Chứng từ Chi phí Hạ cánh cho SCR {0}" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "Bút toán Kế toán cho Dịch vụ" @@ -1954,16 +1954,16 @@ msgstr "Bút toán Kế toán cho Dịch vụ" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "Bút toán Kế toán cho Kho" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "Bút toán Kế toán cho {0}" @@ -2261,12 +2261,6 @@ msgstr "Hành động nếu Kiểm tra Chất lượng không được gửi" msgid "Action If Quality Inspection Is Rejected" msgstr "Hành động nếu Kiểm tra Chất lượng bị từ chối" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "Hành động nếu Tỷ giá tương tự không được duy trì" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "Hành động đã khởi tạo" @@ -2325,6 +2319,12 @@ msgstr "Hành động nếu Ngân sách Năm Bị vượt trên Chi phí Tích l msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "Hành động nếu Tỷ giá Không được Duy trì trong Giao dịch Nội bộ" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2592,7 +2592,7 @@ msgstr "Thời gian thực tế theo giờ (qua Bảng chấm công)" msgid "Actual qty in stock" msgstr "Số lượng thực tế trong kho" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "Thuế loại thực tế không thể bao gồm trong đơn giá mặt hàng ở dòng {0}" @@ -2606,7 +2606,7 @@ msgstr "Số lượng Ad-hoc" msgid "Add / Edit Prices" msgstr "Thêm / Sửa Giá" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "Thêm Cột trong Tiền tệ Giao dịch" @@ -2760,7 +2760,7 @@ msgstr "Thêm Serial / Batch No" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "Thêm Serial / Batch No (Số lượng bị từ chối)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -3005,7 +3005,7 @@ msgstr "Số tiền chiết khấu bổ sung" msgid "Additional Discount Amount (Company Currency)" msgstr "Số tiền chiết khấu bổ sung (Tiền tệ Công ty)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "Số tiền chiết khấu bổ sung ({discount_amount}) không thể vượt quá tổng trước chiết khấu đó ({total_before_discount})" @@ -3294,7 +3294,7 @@ msgstr "Điều chỉnh Số lượng" msgid "Adjustment Against" msgstr "Điều chỉnh đối với" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "Điều chỉnh dựa trên đơn giá Hóa đơn Mua" @@ -3407,7 +3407,7 @@ msgstr "Loại Chứng từ Tạm ứng" msgid "Advance amount" msgstr "Số tiền ứng trước" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "Số tiền tạm ứng không thể lớn hơn {0} {1}" @@ -3476,7 +3476,7 @@ msgstr "Chống lại" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "Đối với tài khoản" @@ -3594,7 +3594,7 @@ msgstr "Đối với Hóa đơn Nhà cung cấp {0}" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "Chống lại Voucher" @@ -3618,7 +3618,7 @@ msgstr "Số Chứng từ Đối tác" #: 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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "Loại Chứng từ Đối tác" @@ -3899,7 +3899,7 @@ msgstr "Tất cả các thông tin liên lạc bao gồm và phía trên sẽ đ msgid "All items are already requested" msgstr "Tất cả các mặt hàng đã được yêu cầu" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "Tất cả các mặt hàng đã được lập Hóa đơn/Trả lại" @@ -3907,7 +3907,7 @@ msgstr "Tất cả các mặt hàng đã được lập Hóa đơn/Trả lại" msgid "All items have already been received" msgstr "Tất cả các mặt hàng đã được nhận" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "Tất cả các mặt hàng đã được chuyển cho Lệnh sản xuất này." @@ -3956,7 +3956,7 @@ msgstr "Phân bổ" msgid "Allocate Advances Automatically (FIFO)" msgstr "Phân bổ Tạm ứng Tự động (FIFO)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "Phân bổ số tiền thanh toán" @@ -3966,7 +3966,7 @@ msgstr "Phân bổ số tiền thanh toán" msgid "Allocate Payment Based On Payment Terms" msgstr "Phân bổ Thanh toán Dựa trên Điều khoản Thanh toán" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "Phân bổ Yêu cầu Thanh toán" @@ -3996,7 +3996,7 @@ msgstr "Đã phân bổ" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4117,15 +4117,15 @@ msgstr "Cho phép Trong Trả lại" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "Cho phép Chuyển nội bộ theo Giá Độc lập" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "Cho phép mục được thêm nhiều lần trong một giao dịch" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "Cho phép mục được thêm nhiều lần trong một giao dịch" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4154,12 +4154,6 @@ msgstr "Cho phép tồn kho âm" msgid "Allow Negative Stock for Batch" msgstr "Cho phép Tồn kho Âm cho Lô" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "Cho phép Giá âm cho Mặt hàng" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4372,8 +4366,11 @@ msgstr "Cho phép hóa đơn đa tiền tệ đối với tài khoản một bê msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4465,7 +4462,7 @@ msgstr "Được phép giao dịch với" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "Các vai trò chính được phép là 'Khách hàng' và 'Nhà cung cấp'. Vui lòng chỉ chọn một trong các vai trò này." -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4662,7 +4659,7 @@ msgstr "Luôn hỏi" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4692,7 +4689,6 @@ msgstr "Luôn hỏi" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4862,10 +4858,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "Số tiền theo tiền tệ tài khoản" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "Số tiền bằng chữ" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5485,7 +5477,7 @@ msgstr "Khi trường {0} được bật, trường {1} là bắt buộc." msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "Khi trường {0} được bật, giá trị của trường {1} phải lớn hơn 1." -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "Khi có các giao dịch đã gửi đối với mặt hàng {0}, bạn không thể thay đổi giá trị của {1}." @@ -5635,7 +5627,7 @@ msgstr "Tài khoản Danh mục Tài sản" msgid "Asset Category Name" msgstr "Tên Danh mục Tài sản" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "Danh mục Tài sản là bắt buộc cho mặt hàng Tài sản cố định" @@ -6031,7 +6023,7 @@ msgstr "Tài sản {0} chưa được trình. Vui lòng trình tài sản trư msgid "Asset {0} must be submitted" msgstr "Tài sản {0} phải được trình" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "Tài sản {assets_link} đã được tạo cho {item_code}" @@ -6069,11 +6061,11 @@ msgstr "Tài sản" msgid "Assets Setup" msgstr "Thiết lập Tài sản" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "Tài sản không được tạo cho {item_code}. Bạn sẽ phải tạo tài sản thủ công." -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "Tài sản {assets_link} đã được tạo cho {item_code}" @@ -6146,7 +6138,7 @@ msgstr "Phải có ít nhất một mặt hàng nguyên liệu thô trong mục msgid "At least one row is required for a financial report template" msgstr "Cần ít nhất một dòng cho mẫu báo cáo tài chính" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "Bắt buộc phải có ít nhất một kho" @@ -6178,7 +6170,7 @@ msgstr "Tại dòng {0}: Số lượng là bắt buộc cho lô {1}" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "Tại dòng {0}: Số Serial là bắt buộc cho Mặt hàng {1}" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "Tại dòng {0}: Bundle Serial và Batch {1} đã được tạo. Vui lòng xóa các giá trị từ các trường số serial hoặc số lô." @@ -6242,7 +6234,11 @@ msgstr "Tên thuộc tính" msgid "Attribute Value" msgstr "Giá trị thuộc tính" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "Bảng thuộc tính là bắt buộc" @@ -6250,11 +6246,19 @@ msgstr "Bảng thuộc tính là bắt buộc" msgid "Attribute value: {0} must appear only once" msgstr "Giá trị thuộc tính: {0} phải xuất hiện chỉ một lần" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "Thuộc tính {0} được chọn nhiều lần trong Bảng Thuộc tính" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "Thuộc tính" @@ -6314,24 +6318,12 @@ msgstr "Giá trị được ủy quyền" msgid "Auto Create Exchange Rate Revaluation" msgstr "Tự động tạo Đánh giá lại Tỷ giá hối đoái" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "Tự động tạo Phiếu nhận hàng mua" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "Tự động tạo Bundle Serial và Batch cho Xuất kho" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "Tự động tạo Đơn hàng gia công phụ" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6450,6 +6442,18 @@ msgstr "Lỗi Tạo Người dùng Tự động" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "Tự động đóng Cơ hội đã phản hồi sau số ngày nêu trên" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6667,7 +6671,7 @@ msgstr "Ngày có sẵn để Sử dụng" msgid "Available for use date is required" msgstr "Ngày có sẵn để sử dụng là bắt buộc" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "Số lượng có sẵn là {0}, bạn cần {1}" @@ -6766,7 +6770,7 @@ msgstr "BFS" msgid "BIN Qty" msgstr "Số lượng BIN" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7039,7 +7043,7 @@ msgstr "Mục Website BOM" msgid "BOM Website Operation" msgstr "Hoạt động Website BOM" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "BOM và Số lượng Thành phẩm là bắt buộc cho Việc tháo dỡ" @@ -7130,8 +7134,8 @@ msgstr "Hoàn nguyên Nguyên liệu thô từ Kho Đang thực hiện" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "Hoàn nguyên Nguyên liệu thô của Gia công ngoài Dựa trên" +msgid "Backflush raw materials of subcontract based on" +msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7151,7 +7155,7 @@ msgstr "Số dư" msgid "Balance (Dr - Cr)" msgstr "Số dư (Dr - Cr)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "Số dư ({0})" @@ -7682,11 +7686,11 @@ msgstr "Ngân hàng" msgid "Barcode Type" msgstr "Loại mã vạch" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "Mã vạch {0} đã được sử dụng trong Mục {1}" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "Mã vạch {0} không phải là mã {1} hợp lệ" @@ -8053,12 +8057,12 @@ msgstr "Lô {0} và Kho" msgid "Batch {0} is not available in warehouse {1}" msgstr "Lô {0} không có sẵn trong kho {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "Lô {0} của Mặt hàng {1} đã hết hạn." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "Lô {0} của Mặt hàng {1} bị vô hiệu." @@ -8131,8 +8135,8 @@ msgstr "Số hóa đơn" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "Tính tiền cho Số lượng bị từ chối trong Hóa đơn Mua" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8472,8 +8476,11 @@ msgstr "Mặt hàng Đơn hàng gối đầu" msgid "Blanket Order Rate" msgstr "Tỷ giá Đơn hàng gối đầu" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -8988,7 +8995,7 @@ msgstr "Mua và Bán" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "Mua phải được chọn, nếu Áp dụng cho được chọn là {0}" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "Theo mặc định, Tên Nhà cung cấp được đặt theo Tên Nhà cung cấp đã nhập. Nếu bạn muốn Nhà cung cấp được đặt tên theo Chuỗi đặt tên, hãy chọn tùy chọn 'Chuỗi đặt tên'." @@ -9353,7 +9360,7 @@ msgstr "Không thể lọc theo Số chứng từ, nếu nhóm theo Chứng từ msgid "Can only make payment against unbilled {0}" msgstr "Chỉ có thể thanh toán đối với {0} chưa xuất hóa đơn" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9409,9 +9416,9 @@ msgstr "Không thể thay đổi Cài đặt Tài khoản Tồn kho" msgid "Cannot Create Return" msgstr "Không thể tạo Trả lại" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "Không thể Hợp nhất" @@ -9439,7 +9446,7 @@ msgstr "Không thể sửa đổi {0} {1}, vui lòng tạo mới thay thế." msgid "Cannot apply TDS against multiple parties in one entry" msgstr "Không thể áp dụng TDS đối với nhiều bên trong một bút toán" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "Không thể là mặt hàng tài sản cố định vì Sổ cái Tồn kho đã được tạo." @@ -9475,7 +9482,7 @@ msgstr "Không thể hủy Bút toán Kho Sản xuất này vì số lượng Th msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "Không thể hủy tài liệu này vì nó được liên kết với Điều chỉnh Giá trị Tài sản đã gửi {0}. Vui lòng hủy Điều chỉnh Giá trị Tài sản để tiếp tục." -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "Không thể hủy tài liệu này vì nó được liên kết với tài sản đã gửi {asset_link}. Vui lòng hủy tài sản để tiếp tục." @@ -9483,7 +9490,7 @@ msgstr "Không thể hủy tài liệu này vì nó được liên kết với t msgid "Cannot cancel transaction for Completed Work Order." msgstr "Không thể hủy giao dịch cho Lệnh sản xuất Hoàn thành." -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "Không thể thay đổi Thuộc tính sau giao dịch tồn kho. Tạo Mặt hàng mới và chuyển tồn kho sang Mặt hàng mới" @@ -9495,7 +9502,7 @@ msgstr "Không thể thay đổi Loại Tài liệu Tham chiếu." msgid "Cannot change Service Stop Date for item in row {0}" msgstr "Không thể thay đổi Ngày Dừng Dịch vụ cho mặt hàng ở dòng {0}" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "Không thể thay đổi Thuộc tính Biến thể sau giao dịch tồn kho. Bạn phải tạo Mặt hàng mới để làm việc này." @@ -9523,11 +9530,11 @@ msgstr "Không thể chuyển sang Nhóm vì Loại Tài khoản đã được c msgid "Cannot covert to Group because Account Type is selected." msgstr "Không thể chuyển sang Nhóm vì Loại Tài khoản đã được chọn." -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "Không thể tạo Bút toán Dự trữ Tồn kho cho Biên nhận Mua hàng có ngày tương lai." -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "Không thể tạo Danh sách chọn cho Đơn hàng bán {0} vì có tồn kho đã dự trữ. Vui lòng hủy dự trữ tồn kho để tạo danh sách chọn." @@ -9553,7 +9560,7 @@ msgstr "Không thể tuyên bố là thất bại vì Đã tạo Báo giá." msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "Không thể khấu trừ khi loại là 'Định giá' hoặc 'Định giá và Tổng'" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "Không thể xóa dòng Lãi/Lỗ Chênh lệch Tỷ giá" @@ -9590,7 +9597,7 @@ msgstr "Không thể vô hiệu hóa {0} vì có thể dẫn đến định giá msgid "Cannot disassemble more than produced quantity." msgstr "Không thể tháo dỡ nhiều hơn số lượng đã sản xuất." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9598,8 +9605,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "Không thể bật Tài khoản Tồn kho theo Mặt hàng vì có các Bút toán Sổ cái Tồn kho cho công ty {0} với Tài khoản Tồn kho theo Kho. Vui lòng hủy các giao dịch tồn kho trước và thử lại." -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "Không thể đảm bảo giao hàng theo Serial No vì Mặt hàng {0} được thêm có và không có Đảm bảo Giao hàng theo Serial No." @@ -9643,7 +9650,7 @@ msgstr "Không thể nhận từ khách hàng đối với số dư âm" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "Không thể giảm số lượng nhỏ hơn số lượng đã đặt hoặc đã mua" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9661,8 +9668,8 @@ msgstr "Không thể truy xuất mã liên kết. Kiểm tra Nhật ký Lỗi đ msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9678,7 +9685,7 @@ msgstr "Không thể đặt là Thất bại vì Đơn hàng bán đã được msgid "Cannot set authorization on basis of Discount for {0}" msgstr "Không thể đặt ủy quyền dựa trên Chiết khấu cho {0}" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "Không thể đặt nhiều Mặc định Mặt hàng cho một công ty." @@ -10589,7 +10596,7 @@ msgstr "Đóng (Nợ)" msgid "Closing (Dr)" msgstr "Đóng (Có)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "Đóng (Mở đầu + Tổng)" @@ -11050,7 +11057,7 @@ msgstr "Công ty" #: 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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11332,7 +11339,7 @@ msgstr "Công ty" msgid "Company Abbreviation" msgstr "Tên viết tắt Công ty" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11345,7 +11352,7 @@ msgstr "Tên viết tắt Công ty không thể có nhiều hơn 5 ký tự" msgid "Company Account" msgstr "Tài khoản công ty" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "Tài khoản Công ty là bắt buộc" @@ -11521,7 +11528,7 @@ msgstr "Bộ lọc Công ty chưa được đặt!" msgid "Company is mandatory" msgstr "Công ty là bắt buộc" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "Công ty là bắt buộc cho tài khoản công ty" @@ -11792,7 +11799,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11805,7 +11812,9 @@ msgstr "Cấu hình Biểu đồ Tài khoản" msgid "Configure Product Assembly" msgstr "Cấu hình Lắp ráp Sản phẩm" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11823,13 +11832,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "Cấu hình hành động để dừng giao dịch hoặc chỉ cảnh báo nếu cùng tỷ giá không được duy trì." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "Cấu hình Danh sách giá mặc định khi tạo giao dịch Mua mới. Giá mặt hàng sẽ được lấy từ Danh sách giá này." @@ -12007,7 +12016,7 @@ msgstr "" msgid "Consumed" msgstr "Tiêu thụ" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "Số tiền đã tiêu thụ" @@ -12051,7 +12060,7 @@ msgstr "Chi phí các mặt hàng đã tiêu thụ" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12224,10 +12233,6 @@ msgstr "Người liên hệ không thuộc về {0}" msgid "Contact:" msgstr "Liên hệ:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "Liên hệ: " - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12405,7 +12410,7 @@ msgstr "Hệ số Chuyển đổi" msgid "Conversion Rate" msgstr "Tỷ lệ chuyển đổi" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "Hệ số chuyển đổi cho Đơn vị Đo lường mặc định phải là 1 ở hàng {0}" @@ -12677,7 +12682,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12772,7 +12777,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "Trung tâm Chi phí là bắt buộc ở hàng {0} trong bảng Thuế cho loại {1}" @@ -13110,7 +13115,7 @@ msgstr "Tạo Thành phẩm" msgid "Create Grouped Asset" msgstr "Tạo Tài sản Nhóm" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "Tạo Bút toán Giữa Công ty" @@ -13483,7 +13488,7 @@ msgstr "Tạo {0} {1}?" msgid "Created By Migration" msgstr "Được tạo bởi Di chuyển" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "Đã tạo {0} thẻ điểm cho {1} giữa:" @@ -13626,15 +13631,15 @@ msgstr "Tạo {0} một phần thành công.\n" msgid "Credit" msgstr "Có" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "Ghi nợ (Giao dịch)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "Ghi nợ ({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "Tài khoản Ghi nợ" @@ -13829,7 +13834,7 @@ msgstr "Tỷ lệ Vòng quay Công nợ" msgid "Creditors" msgstr "Các khoản phải trả" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14127,7 +14132,7 @@ msgstr "Lô/Serial Hiện tại" msgid "Current Serial No" msgstr "Số Serial Hiện tại" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14328,7 +14333,7 @@ msgstr "Dấu phân cách tùy chỉnh" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15101,7 +15106,7 @@ msgstr "Ngày để Xử lý" msgid "Day Of Week" msgstr "Ngày trong Tuần" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15217,11 +15222,11 @@ msgstr "Đại lý" msgid "Debit" msgstr "Ghi nợ" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "Ghi nợ (Giao dịch)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "Ghi nợ ({0})" @@ -15231,7 +15236,7 @@ msgstr "Ghi nợ ({0})" msgid "Debit / Credit Note Posting Date" msgstr "Ngày đăng Phiếu Ghi nợ / Ghi có" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "Tài khoản Ghi nợ" @@ -15342,7 +15347,7 @@ msgstr "Chênh lệch ghi nợ-ghi có" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15484,7 +15489,7 @@ msgstr "Khoảng thời gian Quá hạn Mặc định" msgid "Default BOM" msgstr "BOM mặc định" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "BOM mặc định ({0}) phải đang hoạt động cho mặt hàng này hoặc khuôn mẫu của nó" @@ -15841,15 +15846,15 @@ msgstr "Khu vực mặc định" msgid "Default Unit of Measure" msgstr "Đơn vị đo mặc định" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "Đơn vị đo mặc định cho Mặt hàng {0} không thể thay đổi trực tiếp vì Bạn đã thực hiện một số giao dịch với đơn vị đo khác. Bạn cần hủy các tài liệu liên kết hoặc tạo Mặt hàng mới." -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "Đơn vị đo mặc định cho Mặt hàng {0} không thể thay đổi trực tiếp vì Bạn đã thực hiện một số giao dịch với đơn vị đo khác. Bạn cần tạo Mặt hàng mới để sử dụng Đơn vị đo mặc định khác." -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "Đơn vị đo mặc định cho biến thể '{0}' phải giống như trong khuôn mẫu '{1}'" @@ -16150,7 +16155,7 @@ msgstr "" msgid "Delivered" msgstr "Đã giao" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "Số tiền đã giao" @@ -16200,8 +16205,8 @@ msgstr "Các mặt hàng đã giao cần thanh toán" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16212,11 +16217,11 @@ msgstr "Số lượng đã giao" msgid "Delivered Qty (in Stock UOM)" msgstr "Số lượng đã giao (theo Đơn vị đo tồn kho)" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16305,7 +16310,7 @@ msgstr "Quản lý giao hàng" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16830,7 +16835,7 @@ msgstr "Tài khoản Chênh lệch trong Bảng Mặt hàng" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "Tài khoản Chênh lệch phải là tài khoản Tài sản/Nợ phải trả (Tạm mở), vì Phiếu kho này là Phiếu mở đầu" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "Tài khoản Chênh lệch phải là tài khoản Tài sản/Nợ phải trả, vì Đối soát Kho này là Đối soát Mở đầu" @@ -16994,11 +16999,9 @@ msgstr "Vô hiệu Ngưỡng Tích lũy" msgid "Disable In Words" msgstr "Vô hiệu Bằng Chữ" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "Vô hiệu Đơn giá Mua cuối" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17039,6 +17042,12 @@ msgstr "Vô hiệu Bộ chọn Serial No và Batch" msgid "Disable Transaction Threshold" msgstr "Vô hiệu Ngưỡng Giao dịch" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17095,7 +17104,7 @@ msgstr "Tháo dỡ" msgid "Disassemble Order" msgstr "Lệnh Tháo dỡ" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "Số lượng tháo rời không được nhỏ hơn hoặc bằng 0." @@ -17620,6 +17629,12 @@ msgstr "Không Sử dụng Định giá theo Batch" msgid "Do Not Use Batchwise Valuation" msgstr "Không Sử dụng Định giá theo Batch" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17710,9 +17725,12 @@ msgstr "Tìm kiếm tài liệu" msgid "Document Count" msgstr "Số lượng Tài liệu" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17730,6 +17748,10 @@ msgstr "Loại Tài liệu " msgid "Document Type already used as a dimension" msgstr "Loại Tài liệu đã được sử dụng như một chiều" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "Tài liệu" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18034,7 +18056,7 @@ msgstr "Dự án trùng lặp với nhiệm vụ" msgid "Duplicate Sales Invoices found" msgstr "Tìm thấy Hóa đơn Bán hàng trùng lặp" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "Lỗi Số Serial Trùng lặp" @@ -18154,8 +18176,8 @@ msgstr "ID người dùng ERPNext" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18378,7 +18400,7 @@ msgstr "Gửi biên nhận qua Email" msgid "Email Sent to Supplier {0}" msgstr "Đã gửi Email đến Nhà cung cấp {0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "Yêu cầu Email để tạo người dùng" @@ -18568,7 +18590,7 @@ msgstr "ID Người dùng Nhân viên" msgid "Employee cannot report to himself." msgstr "Nhân viên không thể báo cáo cho chính mình." -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "Yêu cầu Nhân viên" @@ -18576,7 +18598,7 @@ msgstr "Yêu cầu Nhân viên" msgid "Employee is required while issuing Asset {0}" msgstr "Yêu cầu Nhân viên khi phát hành Tài sản {0}" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "Nhân viên {0} đã có người dùng được liên kết" @@ -18589,7 +18611,7 @@ msgstr "Nhân viên {0} không thuộc công ty {1}" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "Nhân viên {0} hiện đang làm việc trên máy trạm khác. Vui lòng chỉ định nhân viên khác." -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "Không tìm thấy Nhân viên {0}" @@ -18632,7 +18654,7 @@ msgstr "Bật Lập lịch Cuộc hẹn" msgid "Enable Auto Email" msgstr "Bật Email Tự động" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "Bật Tự động Đặt lại" @@ -19233,7 +19255,7 @@ msgstr "Lỗi: Tài sản này đã có {0} kỳ khấu hao được đặt.\n" "\t\t\t\t\tNgày `bắt đầu khấu hao` phải ít nhất {1} kỳ sau ngày `sẵn sàng sử dụng`.\n" "\t\t\t\t\tVui lòng sửa các ngày cho phù hợp." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "Lỗi: {0} là trường bắt buộc" @@ -19279,7 +19301,7 @@ msgstr "Giao tại xưởng" msgid "Example URL" msgstr "URL Ví dụ" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "Ví dụ của tài liệu được liên kết: {0}" @@ -19309,7 +19331,7 @@ msgstr "Ví dụ: Serial No {0} đã được đặt trước trong {1}." msgid "Exception Budget Approver Role" msgstr "Vai trò Phê duyệt Ngân sách Ngoại lệ" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19668,7 +19690,7 @@ msgstr "Giá trị Sau Thời gian Sử dụng" msgid "Expense" msgstr "Chi phí" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "Tài khoản Chi phí / Chênh lệch ({0}) phải là tài khoản 'Lãi hoặc Lỗ'" @@ -19716,7 +19738,7 @@ msgstr "Tài khoản Chi phí / Chênh lệch ({0}) phải là tài khoản 'Lã msgid "Expense Account" msgstr "Tài khoản chi phí" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "Thiếu tài khoản chi phí" @@ -20179,7 +20201,7 @@ msgstr "Lọc tổng số lượng bằng không" msgid "Filter by Reference Date" msgstr "Lọc theo ngày tham chiếu" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20509,7 +20531,7 @@ msgstr "Kho thành phẩm" msgid "Finished Goods based Operating Cost" msgstr "Chi phí vận hành dựa trên thành phẩm" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "Mặt hàng thành phẩm {0} không khớp với Lệnh sản xuất {1}" @@ -20604,7 +20626,7 @@ msgstr "Chế độ tài khóa là bắt buộc, vui lòng đặt chế độ t msgid "Fiscal Year" msgstr "Năm tài chính" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20668,7 +20690,7 @@ msgstr "Tài khoản tài sản cố định" msgid "Fixed Asset Defaults" msgstr "Mặc định tài sản cố định" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "Mặt hàng tài sản cố định phải là mặt hàng không tồn kho." @@ -20818,7 +20840,7 @@ msgstr "Cho công ty" msgid "For Item" msgstr "Cho mặt hàng" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "Đối với mặt hàng {0}, không thể nhận nhiều hơn {1} số lượng cho {2} {3}" @@ -20849,7 +20871,7 @@ msgstr "Cho bảng giá" msgid "For Production" msgstr "Cho sản xuất" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "Số lượng (Số lượng sản xuất) là bắt buộc" @@ -20933,6 +20955,12 @@ msgstr "Đối với mặt hàng {0}, chỉ có {1} tài sản đ msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "Đối với mặt hàng {0}, tỷ lệ phải là số dương. Để cho phép tỷ lệ âm, hãy bật {1} trong {2}" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "Đối với hoạt động {0} tại dòng {1}, vui lòng thêm nguyên vật liệu hoặc đặt BOM cho nó." @@ -20954,7 +20982,7 @@ msgstr "Cho dự án - {0}, cập nhật trạng thái của bạn" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "Đối với số lượng dự kiến và dự báo, hệ thống sẽ xem xét tất cả các kho con theo kho mẹ đã chọn." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "Số lượng {0} không được lớn hơn số lượng cho phép {1}" @@ -20963,7 +20991,7 @@ msgstr "Số lượng {0} không được lớn hơn số lượng cho phép {1} msgid "For reference" msgstr "Để tham khảo" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "Cho dòng {0} trong {1}. Để bao gồm {2} trong tỷ lệ mặt hàng, các dòng {3} cũng phải được bao gồm" @@ -20987,7 +21015,7 @@ msgstr "Đối với điều kiện 'Áp dụng quy tắc cho người khác', t msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "Để thuận tiện cho khách hàng, các mã này có thể được sử dụng trong các mẫu in như hóa đơn và phiếu giao hàng" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "Đối với mặt hàng {0}, số lượng tiêu thụ phải là {1} theo BOM {2}." @@ -20996,7 +21024,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 "Để {0} mới có hiệu lực, bạn có muốn xóa {1} hiện tại không?" -#: erpnext/controllers/stock_controller.py:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "Đối với {0}, không có tồn kho nào có sẵn để trả lại trong kho {1}." @@ -21609,7 +21637,7 @@ msgstr "G - D" msgid "GENERAL LEDGER" msgstr "SỔ CÁI CHUNG" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21621,7 +21649,7 @@ msgstr "Số dư GL" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "Bút toán GL" @@ -22136,7 +22164,7 @@ msgstr "Hàng hóa đang vận chuyển" msgid "Goods Transferred" msgstr "Hàng hóa đã chuyển" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "Hàng hóa đã được nhận đối với bút toán xuất {0}" @@ -22319,7 +22347,7 @@ msgstr "Tổng cộng phải khớp với tổng các tham chiếu thanh toán" msgid "Grant Commission" msgstr "Hoa hồng tạm ứng" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "Số tiền lớn hơn" @@ -22960,11 +22988,11 @@ msgstr "Với tần suất nào?" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" -msgstr "Dự án nên được cập nhật với tần suất nào về Tổng Chi phí Mua?" +msgid "How often should project be updated of Total Purchase Cost ?" +msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling #. Settings' @@ -23118,7 +23146,7 @@ msgstr "Nếu một hoạt động được chia thành các hoạt động con, msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "Nếu trống, Tài khoản kho mẹ hoặc mặc định của công ty sẽ được xem xét trong giao dịch" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23303,7 +23331,7 @@ msgstr "Nếu được bật, hệ thống sẽ chỉ cho phép chọn Đơn v msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "Nếu được bật, hệ thống sẽ cho phép người dùng chỉnh sửa nguyên vật liệu và số lượng của chúng trong Lệnh sản xuất. Hệ thống sẽ không đặt lại số lượng theo BOM nếu người dùng đã thay đổi chúng." -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23475,11 +23503,11 @@ msgstr "Nếu điều này không mong muốn, vui lòng hủy Mục thanh toán msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "Nếu mặt hàng này có biến thể, thì nó không thể được chọn trong đơn đặt hàng, v.v." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "Nếu tùy chọn này được đặt là 'Có', ERPNext sẽ ngăn bạn tạo Hóa đơn mua hàng hoặc Phiếu nhận hàng mà không tạo Đơn đặt hàng trước. Cấu hình này có thể được ghi đè cho một nhà cung cấp cụ thể bằng cách bật hộp kiểm 'Cho phép tạo hóa đơn mua hàng mà không cần đơn đặt hàng' trong mẫu nhà cung cấp." -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "Nếu tùy chọn này được đặt là 'Có', ERPNext sẽ ngăn bạn tạo Hóa đơn mua hàng mà không tạo Phiếu nhận hàng trước. Cấu hình này có thể được ghi đè cho một nhà cung cấp cụ thể bằng cách bật hộp kiểm 'Cho phép tạo hóa đơn mua hàng mà không cần phiếu nhận hàng' trong mẫu nhà cung cấp." @@ -23595,7 +23623,7 @@ msgstr "Bỏ qua tồn kho trống" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "Bỏ qua đánh giá lại tỷ giá và nhật ký lãi/lỗ" @@ -23647,7 +23675,7 @@ msgstr "Bỏ qua quy tắc định giá đang được bật. Không thể áp d #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "Bỏ qua các Ghi nợ / Ghi có do hệ thống tạo" @@ -23690,7 +23718,7 @@ msgstr "Bỏ qua chồng chéo thời gian trạm làm việc" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "Bỏ qua trường Is Opening cũ trong GL Entry cho phép thêm số dư đầu kỳ sau khi hệ thống đang sử dụng trong khi tạo báo cáo" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "Hình ảnh trong mô tả đã bị xóa. Để tắt hành vi này, hãy bỏ chọn \"{0}\" trong {1}." @@ -23704,6 +23732,7 @@ msgid "Implementation Partner" msgstr "Đối tác triển khai" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24057,7 +24086,7 @@ msgstr "Bao gồm tài sản FB mặc định" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24311,7 +24340,7 @@ msgstr "Số lượng số dư không đúng sau giao dịch" msgid "Incorrect Batch Consumed" msgstr "Lô tiêu thụ không đúng" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "Kiểm tra không đúng trong kho (nhóm) để đặt lại" @@ -24319,7 +24348,7 @@ msgstr "Kiểm tra không đúng trong kho (nhóm) để đặt lại" msgid "Incorrect Company" msgstr "Công ty không đúng" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "Số lượng thành phần không đúng" @@ -24529,14 +24558,14 @@ msgstr "Đã khởi tạo" msgid "Inspected By" msgstr "Được kiểm tra bởi" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "Kiểm tra bị từ chối" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "Yêu cầu kiểm tra" @@ -24553,7 +24582,7 @@ msgstr "Yêu cầu kiểm tra trước khi giao hàng" msgid "Inspection Required before Purchase" msgstr "Yêu cầu kiểm tra trước khi mua" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "Gửi kiểm tra" @@ -24635,8 +24664,8 @@ msgstr "Không đủ quyền" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "Tồn kho không đủ" @@ -24856,7 +24885,7 @@ msgstr "Các chuyển kho nội bộ" msgid "Internal Work History" msgstr "Lịch sử công việc nội bộ" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "Các chuyển kho nội bộ chỉ có thể được thực hiện bằng tiền tệ mặc định của công ty" @@ -24949,7 +24978,7 @@ msgstr "Ngày giao hàng không hợp lệ" msgid "Invalid Discount" msgstr "Chiết khấu không hợp lệ" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "Số tiền chiết khấu không hợp lệ" @@ -24979,7 +25008,7 @@ msgstr "Nhóm theo không hợp lệ" msgid "Invalid Item" msgstr "Mặt hàng không hợp lệ" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "Mặc định Mặt hàng không hợp lệ" @@ -25065,12 +25094,12 @@ msgstr "Lịch trình không hợp lệ" msgid "Invalid Selling Price" msgstr "Giá bán không hợp lệ" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "Gói Serial và Batch không hợp lệ" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "Kho nguồn và đích không hợp lệ" @@ -25107,7 +25136,7 @@ msgstr "Công thức lọc không hợp lệ. Vui lòng kiểm tra cú pháp." msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "Lý do mất đơn {0} không hợp lệ, vui lòng tạo lý do mất mới" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "Chuỗi đặt tên không hợp lệ (. bị thiếu) cho {0}" @@ -25236,7 +25265,6 @@ msgstr "Hủy hóa đơn" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "Ngày hóa đơn" @@ -25257,10 +25285,6 @@ msgstr "Lỗi chọn loại tài liệu hóa đơn" msgid "Invoice Grand Total" msgstr "Tổng cộng hóa đơn" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "ID hóa đơn" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25782,13 +25806,13 @@ msgstr "Là Mặt hàng Ảo" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "Có bắt buộc Đơn mua hàng để tạo Hóa đơn & Phiếu nhận hàng không?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "Có bắt buộc Phiếu nhận hàng để tạo Hóa đơn mua hàng không?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -26060,7 +26084,7 @@ msgstr "Vấn đề" msgid "Issuing Date" msgstr "Ngày phát hành" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "Có thể mất vài giờ để giá trị tồn kho chính xác được hiển thị sau khi hợp nhất các mặt hàng." @@ -26130,7 +26154,7 @@ msgstr "Văn bản nghiêng cho tổng phụ hoặc ghi chú" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26177,6 +26201,7 @@ msgstr "Văn bản nghiêng cho tổng phụ hoặc ghi chú" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26192,7 +26217,6 @@ msgstr "Văn bản nghiêng cho tổng phụ hoặc ghi chú" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26956,6 +26980,7 @@ msgstr "Nhà sản xuất Mặt hàng" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -26966,7 +26991,6 @@ msgstr "Nhà sản xuất Mặt hàng" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27226,11 +27250,11 @@ msgstr "Cài đặt Biến thể Mặt hàng" msgid "Item Variant {0} already exists with same attributes" msgstr "Biến thể Mặt hàng {0} đã tồn tại với các thuộc tính tương tự" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "Các Biến thể Mặt hàng đã được cập nhật" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "Đăng lại dựa trên Kho Mặt hàng đã được bật." @@ -27269,6 +27293,15 @@ msgstr "Thông số Website Mặt hàng" msgid "Item Weight Details" msgstr "Chi tiết Trọng lượng Mặt hàng" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27298,7 +27331,7 @@ msgstr "Chi tiết Thuế theo Mặt hàng" msgid "Item Wise Tax Details" msgstr "Chi tiết Thuế theo Mặt hàng" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "Chi tiết Thuế theo Mặt hàng không khớp với Thuế và Phí ở các dòng sau:" @@ -27318,11 +27351,11 @@ msgstr "Mặt hàng và Kho" msgid "Item and Warranty Details" msgstr "Mặt hàng và Chi tiết Bảo hành" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "Mặt hàng cho dòng {0} không khớp với Yêu cầu Nguyên vật liệu" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "Mặt hàng có các biến thể." @@ -27352,7 +27385,7 @@ msgstr "Hoạt động mặt hàng" msgid "Item qty can not be updated as raw materials are already processed." msgstr "Số lượng mặt hàng không thể cập nhật vì nguyên liệu thô đã được xử lý." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "Đơn giá mặt hàng đã được cập nhật thành không vì Cho phép Tỷ giá Định giá Bằng không được chọn cho mặt hàng {0}" @@ -27371,10 +27404,14 @@ msgstr "Tỷ giá định giá mặt hàng được tính lại dựa trên số msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "Đang đăng lại định giá mặt hàng. Báo cáo có thể hiển thị định giá mặt hàng không chính xác." -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "Biến thể mặt hàng {0} đã tồn tại với cùng thuộc tính" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "Mặt hàng {0} được thêm nhiều lần dưới cùng một mặt hàng cha {1} tại các dòng {2} và {3}" @@ -27388,7 +27425,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "Mặt hàng {0} không thể được đặt nhiều hơn {1} đối với Đơn hàng mở {2}." #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "Mục {0} không tồn tại" @@ -27396,7 +27433,7 @@ msgstr "Mục {0} không tồn tại" msgid "Item {0} does not exist in the system or has expired" msgstr "Mục {0} không tồn tại trong hệ thống hoặc đã hết hạn" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "Mục {0} không tồn tại." @@ -27412,15 +27449,15 @@ msgstr "Mặt hàng {0} đã được trả lại" msgid "Item {0} has been disabled" msgstr "Mặt hàng {0} đã bị vô hiệu hóa" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "Mặt hàng {0} không có Serial No. Chỉ các mặt hàng được đánh serial mới có thể giao dựa trên Serial No" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "Mặt hàng {0} đã đến cuối vòng đời vào ngày {1}" @@ -27432,19 +27469,23 @@ msgstr "Mặt hàng {0} bị bỏ qua vì không phải mặt hàng tồn kho" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "Mặt hàng {0} đã được giữ chỗ/giao đối với Đơn hàng bán {1}." -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "Mặt hàng {0} đã bị hủy" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "Mặt hàng {0} bị vô hiệu hóa" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "Mặt hàng {0} không phải là Mặt hàng được đánh số serial" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "Mặt hàng {0} không phải là Mặt hàng tồn kho" @@ -27452,7 +27493,11 @@ msgstr "Mặt hàng {0} không phải là Mặt hàng tồn kho" msgid "Item {0} is not a subcontracted item" msgstr "Mặt hàng {0} không phải là mặt hàng ký hợp đồng phụ" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "Mặt hàng {0} không hoạt động hoặc đã đạt đến cuối vòng đời" @@ -27468,7 +27513,7 @@ msgstr "Mặt hàng {0} phải là Mặt hàng Không tồn kho" msgid "Item {0} must be a non-stock item" msgstr "Mặt hàng {0} phải là mặt hàng không tồn kho" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "Mặt hàng {0} không tìm thấy trong bảng 'Nguyên liệu thô đã cung cấp' trong {1} {2}" @@ -27484,7 +27529,7 @@ msgstr "Mặt hàng {0}: Số lượng đặt {1} không thể nhỏ hơn số l msgid "Item {0}: {1} qty produced. " msgstr "Mặt hàng {0}: {1} số lượng đã sản xuất. " -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "Mặt hàng {} không tồn tại." @@ -27594,7 +27639,7 @@ msgstr "Mặt hàng cho Yêu cầu Nguyên liệu thô" msgid "Items not found." msgstr "Không tìm thấy mặt hàng." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "Đơn giá mặt hàng đã được cập nhật về không vì 'Cho phép Đơn giá Định giá bằng không' được chọn cho các mặt hàng sau: {0}" @@ -28227,7 +28272,7 @@ msgstr "Kho quét cuối" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "Giao dịch tồn kho cuối cho mặt hàng {0} trong kho {1} là vào {2}." -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28506,7 +28551,7 @@ msgstr "Chú thích" msgid "Length (cm)" msgstr "Chiều dài (cm)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "Ít hơn số tiền" @@ -28647,7 +28692,7 @@ msgstr "Hóa đơn được liên kết" msgid "Linked Location" msgstr "Vị trí được liên kết" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "Được liên kết với tài liệu đã trình" @@ -29042,11 +29087,6 @@ msgstr "Bảo trì Tài sản" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "Duy trì cùng tỷ giá trong suốt Giao dịch Nội bộ" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "Duy trì cùng tỷ giá trong suốt Chu kỳ Mua hàng" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29058,6 +29098,11 @@ msgstr "Duy trì hàng tồn kho" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29254,7 +29299,7 @@ msgid "Major/Optional Subjects" msgstr "Môn chính/Tự chọn" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29423,8 +29468,8 @@ msgstr "Phần bắt buộc" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29483,8 +29528,8 @@ msgstr "Không thể tạo mục thủ công! Vô hiệu hóa mục tự động #: 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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29633,7 +29678,7 @@ msgstr "Ngày sản xuất" msgid "Manufacturing Manager" msgstr "Quản lý sản xuất" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "Số lượng sản xuất là bắt buộc" @@ -29909,7 +29954,7 @@ msgstr "Tiêu thụ vật tư" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "Tiêu thụ vật tư cho sản xuất" @@ -29980,6 +30025,7 @@ msgstr "Nhập vật tư" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30086,11 +30132,11 @@ msgstr "Mục kế hoạch yêu cầu vật tư" msgid "Material Request Type" msgstr "Loại yêu cầu vật tư" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "Yêu cầu vật tư đã được tạo cho số lượng đã đặt" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "Yêu cầu vật tư không được tạo, vì số lượng Nguyên liệu thô đã có sẵn." @@ -30205,7 +30251,7 @@ msgstr "Vật tư chuyển cho sản xuất" msgid "Material Transferred for Manufacturing" msgstr "Vật tư chuyển cho sản xuất" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30334,11 +30380,11 @@ msgstr "Số tiền thanh toán tối đa" msgid "Maximum Producible Items" msgstr "Các mặt hàng có thể sản xuất tối đa" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "Mẫu tối đa - {0} có thể được giữ lại cho Lô {1} và Mặt hàng {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "Mẫu tối đa - {0} đã được giữ lại cho Lô {1} và Mặt hàng {2} trong Lô {3}." @@ -30782,11 +30828,11 @@ msgstr "Khác" msgid "Miscellaneous Expenses" msgstr "Chi phí khác" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "Không khớp" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "Thiếu" @@ -30824,7 +30870,7 @@ msgstr "Thiếu bộ lọc" msgid "Missing Finance Book" msgstr "Thiếu Sổ Tài chính" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "Thiếu thành phẩm" @@ -30832,11 +30878,11 @@ msgstr "Thiếu thành phẩm" msgid "Missing Formula" msgstr "Thiếu công thức" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "Thiếu mặt hàng" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "Thiếu tham số" @@ -30880,10 +30926,6 @@ msgstr "Giá trị bị thiếu" msgid "Mixed Conditions" msgstr "Điều kiện hỗn hợp" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "Di động: " - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31152,7 +31194,7 @@ msgstr "Nhiều trường công ty khả dụng: {0}. Vui lòng chọn thủ cô msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "Nhiều năm tài chính tồn tại cho ngày {0}. Vui lòng đặt công ty trong Năm Tài chính" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "Không thể đánh dấu nhiều mặt hàng là thành phẩm" @@ -31231,27 +31273,20 @@ msgstr "Địa điểm được đặt tên" msgid "Naming Series Prefix" msgstr "Tiền tố Chuỗi đặt tên" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "Chuỗi đặt tên và Mặc định Giá" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "Chuỗi đặt tên là bắt buộc" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31299,16 +31334,16 @@ msgstr "Phân tích nhu cầu" msgid "Negative Batch Report" msgstr "Báo cáo Lô Âm" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "Số lượng âm không được phép" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "Lỗi Tồn kho Âm" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "Tỷ giá định giá âm không được phép" @@ -31922,7 +31957,7 @@ msgstr "Không tìm thấy Hồ sơ POS. Vui lòng tạo Hồ sơ POS mới trư #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "Không có quyền" @@ -31935,7 +31970,7 @@ msgstr "Không có Đơn mua nào được tạo" msgid "No Records for these settings." msgstr "Không có bản ghi nào cho cài đặt này." -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "Không có lựa chọn" @@ -31980,7 +32015,7 @@ msgstr "Không tìm thấy Thanh toán chưa đối soát cho bên này" msgid "No Work Orders were created" msgstr "Không có Lệnh sản xuất nào được tạo" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "Không có bút toán kế toán cho các kho sau" @@ -31993,7 +32028,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "Không tìm thấy BOM hoạt động cho mặt hàng {0}. Giao hàng theo Số serial không thể được đảm bảo" @@ -32005,7 +32040,7 @@ msgstr "Không có trường bổ sung khả dụng" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "Không có số lượng khả dụng để đặt trước cho mặt hàng {0} trong kho {1}" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -32013,7 +32048,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32107,7 +32142,7 @@ msgstr "Không có con bên trái" msgid "No more children on Right" msgstr "Không có con bên phải" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32282,7 +32317,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "Không có bút toán sổ tồn kho được tạo. Vui lòng đặt số lượng hoặc tỷ giá định giá cho các mặt hàng đúng cách và thử lại." @@ -32374,7 +32409,7 @@ msgstr "Không bằng không" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "Không có mặt hàng nào có thay đổi về số lượng hoặc giá trị." @@ -32478,7 +32513,7 @@ msgstr "Không được ủy quyền vì {0} vượt quá giới hạn" msgid "Not authorized to edit frozen Account {0}" msgstr "Không được phép sửa Tài khoản bị đóng băng {0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32524,7 +32559,7 @@ msgstr "Lưu ý: Mục Thanh toán sẽ không được tạo vì 'Tài khoản msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "Lưu ý: Trung tâm chi phí này là một Nhóm. Không thể tạo các mục kế toán đối với các nhóm." -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "Lưu ý: Để hợp nhất các mặt hàng, tạo Đối soát Tồn kho riêng cho mặt hàng cũ {0}" @@ -33001,7 +33036,7 @@ msgstr "Chỉ một trong Số tiền gửi hoặc Rút tiền nên khác không msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "Chỉ một hoạt động có thể có 'Là Thành phẩm Cuối' được chọn khi 'Theo dõi Thành phẩm Bán thành phẩm' được bật." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "Chỉ một mục {0} có thể được tạo đối với Lệnh sản xuất {1}" @@ -33153,7 +33188,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "Mở" @@ -33312,16 +33347,16 @@ msgstr "Hóa đơn bán mở đã được tạo." #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "Tồn kho đầu kỳ" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33678,7 +33713,7 @@ msgstr "Tùy chọn. Cài đặt này sẽ được sử dụng để lọc tron msgid "Optional. Used with Financial Report Template" msgstr "Tùy chọn. Được sử dụng với Mẫu Báo cáo Tài chính" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33812,7 +33847,7 @@ msgstr "Số lượng đặt hàng" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "Đơn hàng" @@ -34020,7 +34055,7 @@ msgstr "Chưa thanh toán (Tiền tệ công ty)" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34078,7 +34113,7 @@ msgstr "Đơn hàng đi" msgid "Over Billing Allowance (%)" msgstr "Cho phép vượt hóa đơn (%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "Cho phép vượt hóa đơn đã vượt cho Mục Biên lai mua hàng {0} ({1}) bởi {2}%" @@ -34096,7 +34131,7 @@ msgstr "Cho phép vượt giao/nhận (%)" msgid "Over Picking Allowance" msgstr "Cho phép vượt chọn" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "Vượt nhận" @@ -34339,7 +34374,6 @@ msgstr "Trường POS" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "Hóa đơn POS" @@ -34610,7 +34644,7 @@ msgstr "Mặt hàng đóng gói" msgid "Packed Items" msgstr "Các mặt hàng đóng gói" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "Các mặt hàng đóng gói không thể được chuyển nội bộ" @@ -35058,7 +35092,7 @@ msgstr "Đã nhận một phần" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35194,7 +35228,7 @@ msgstr "Phần triệu" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35320,7 +35354,7 @@ msgstr "Đối tác không khớp" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35406,7 +35440,7 @@ msgstr "Mặt hàng theo đối tác" #: 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:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35709,7 +35743,6 @@ msgstr "Các mục thanh toán {0} đã bị hủy liên kết" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -35967,7 +36000,7 @@ msgstr "Tài liệu tham khảo thanh toán" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36046,10 +36079,6 @@ msgstr "Không thể tạo yêu cầu thanh toán dựa trên lịch thanh toán msgid "Payment Schedules" msgstr "Lịch thanh toán" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "Trạng thái thanh toán" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37070,7 +37099,7 @@ msgstr "Vui lòng đặt mức ưu tiên" msgid "Please Set Supplier Group in Buying Settings." msgstr "Vui lòng đặt Nhóm nhà cung cấp trong Cài đặt Mua hàng." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "Vui lòng chỉ định tài khoản" @@ -37102,11 +37131,11 @@ msgstr "Vui lòng thêm Tài khoản mở đầu tạm thời trong Biểu đồ msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "Vui lòng thêm ít nhất một Số serial / Số lô" @@ -37126,7 +37155,7 @@ msgstr "Vui lòng thêm tài khoản vào cấp gốc của Công ty - {}" msgid "Please add {1} role to user {0}." msgstr "Vui lòng thêm vai trò {1} cho người dùng {0}." -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "Vui lòng điều chỉnh số lượng hoặc chỉnh sửa {0} để tiếp tục." @@ -37233,7 +37262,7 @@ msgstr "Vui lòng tạo mua hàng từ chính tài liệu bán hàng nội bộ msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "Vui lòng tạo biên nhận mua hàng hoặc hóa đơn mua hàng cho mặt hàng {0}" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "Vui lòng xóa Bundle sản phẩm {0}, trước khi hợp nhất {1} vào {2}" @@ -37302,11 +37331,11 @@ msgstr "Vui lòng nhập Tài khoản để thay đổi số tiền" msgid "Please enter Approving Role or Approving User" msgstr "Vui lòng nhập Vai trò phê duyệt hoặc Người phê duyệt" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "Vui lòng nhập Số lô" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "Vui lòng nhập Trung tâm chi phí" @@ -37318,7 +37347,7 @@ msgstr "Vui lòng nhập Ngày giao hàng" msgid "Please enter Employee Id of this sales person" msgstr "Vui lòng nhập Mã nhân viên của nhân viên bán hàng này" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "Vui lòng nhập tài khoản chi phí" @@ -37363,7 +37392,7 @@ msgstr "Vui lòng nhập Ngày tham chiếu" msgid "Please enter Root Type for account- {0}" msgstr "Vui lòng nhập Loại gốc cho tài khoản- {0}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "Vui lòng nhập Số serial" @@ -37440,7 +37469,7 @@ msgstr "Vui lòng nhập ngày giao hàng đầu tiên" msgid "Please enter the phone number first" msgstr "Vui lòng nhập số điện thoại trước" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "Vui lòng nhập {schedule_date}." @@ -37554,12 +37583,12 @@ msgstr "Vui lòng lưu Đơn hàng bán trước khi thêm lịch giao hàng." msgid "Please select Template Type to download template" msgstr "Vui lòng chọn Loại mẫu để tải mẫu" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "Vui lòng chọn Áp dụng Chiết khấu Trên" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "Vui lòng chọn BOM cho mặt hàng {0}" @@ -37575,13 +37604,13 @@ msgstr "Vui lòng chọn Tài khoản Ngân hàng" msgid "Please select Category first" msgstr "Vui lòng chọn Danh mục trước" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "Vui lòng chọn Loại phí trước" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "Vui lòng chọn Công ty" @@ -37590,7 +37619,7 @@ msgstr "Vui lòng chọn Công ty" msgid "Please select Company and Posting Date to getting entries" msgstr "Vui lòng chọn Công ty và Ngày đăng để lấy các mục nhập" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "Vui lòng chọn Công ty trước" @@ -37639,7 +37668,7 @@ msgstr "Vui lòng chọn Tài khoản chênh lệch Bút toán định kỳ" msgid "Please select Posting Date before selecting Party" msgstr "Vui lòng chọn Ngày đăng trước khi chọn Đối tác" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "Vui lòng chọn Ngày đăng trước" @@ -37647,11 +37676,11 @@ msgstr "Vui lòng chọn Ngày đăng trước" msgid "Please select Price List" msgstr "Vui lòng chọn Bảng giá" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "Vui lòng chọn Số lượng đối với mặt hàng {0}" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "Vui lòng chọn Kho lưu giữ mẫu trong Cài đặt Kho trước" @@ -37704,7 +37733,7 @@ msgstr "Vui lòng chọn một Đơn mua hàng ký gửi." msgid "Please select a Supplier" msgstr "Vui lòng chọn một nhà cung cấp" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "Vui lòng chọn một kho" @@ -37765,7 +37794,7 @@ msgstr "Vui lòng chọn một dòng để tạo Mục đăng lại" msgid "Please select a supplier for fetching payments." msgstr "Vui lòng chọn một nhà cung cấp để tìm nạp thanh toán." -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37785,7 +37814,7 @@ msgstr "Vui lòng chọn mã mặt hàng trước khi đặt kho." msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "Vui lòng chọn ít nhất một bộ lọc: Mã mặt hàng, Lô hoặc Số serial." -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37892,7 +37921,7 @@ msgstr "Vui lòng chọn loại tài liệu hợp lệ." msgid "Please select weekly off day" msgstr "Vui lòng chọn ngày nghỉ hàng tuần" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "Vui lòng chọn {0} trước" @@ -38032,7 +38061,7 @@ msgstr "Vui lòng đặt nhu cầu thực tế hoặc dự báo bán hàng để msgid "Please set an Address on the Company '%s'" msgstr "Vui lòng đặt một Địa chỉ trên Công ty '%s'" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "Vui lòng đặt Tài khoản chi phí trong Bảng mặt hàng" @@ -38076,7 +38105,7 @@ msgstr "Vui lòng đặt Tài khoản chi phí mặc định trong Công ty {0}" msgid "Please set default UOM in Stock Settings" msgstr "Vui lòng đặt UOM mặc định trong Cài đặt chứng khoán" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "Vui lòng đặt tài khoản giá vốn hàng bán mặc định trong công ty {0} để hạch toán lãi/lỗ làm tròn khi chuyển kho" @@ -38195,7 +38224,7 @@ msgstr "Vui lòng chỉ định {0} trước." msgid "Please specify at least one attribute in the Attributes table" msgstr "Vui lòng chỉ định ít nhất một thuộc tính trong Bảng thuộc tính" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "Vui lòng chỉ định Số lượng hoặc Tỷ giá định giá hoặc cả hai" @@ -38366,7 +38395,7 @@ msgstr "Đăng Ngày" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38391,7 +38420,7 @@ msgstr "Đăng Ngày" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38506,7 +38535,7 @@ msgstr "Ngày giờ đăng" msgid "Posting Time" msgstr "Thời gian đăng" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "Ngày đăng và thời gian đăng là bắt buộc" @@ -38685,6 +38714,12 @@ msgstr "Bảo trì phòng ngừa" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -38978,7 +39013,9 @@ msgstr "Yêu cầu các bậc giảm giá sản phẩm hoặc giá" msgid "Price per Unit (Stock UOM)" msgstr "Giá mỗi Đơn vị (Đơn vị Tồn kho)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40333,6 +40370,7 @@ msgstr "Chi phí Mua hàng cho Mặt hàng {0}" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40369,6 +40407,12 @@ msgstr "Tạm ứng Hóa đơn Mua hàng" msgid "Purchase Invoice Item" msgstr "Mục Hóa đơn Mua hàng" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40420,6 +40464,7 @@ msgstr "Các Hóa đơn Mua hàng" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40429,7 +40474,7 @@ msgstr "Các Hóa đơn Mua hàng" #: 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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40546,7 +40591,7 @@ msgstr "Đơn Mua hàng {0} đã được tạo" msgid "Purchase Order {0} is not submitted" msgstr "Đơn Mua hàng {0} chưa được trình" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "Đơn đặt hàng" @@ -40609,6 +40654,7 @@ msgstr "Danh sách Giá Mua hàng" #: 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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40623,7 +40669,7 @@ msgstr "Danh sách Giá Mua hàng" msgid "Purchase Receipt" msgstr "Biên nhận mua hàng" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40889,7 +40935,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41477,7 +41522,7 @@ msgstr "Đánh giá chất lượng" msgid "Quality Review Objective" msgstr "Mục tiêu đánh giá chất lượng" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41538,7 +41583,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41732,7 +41777,7 @@ msgstr "Chuỗi tuyến đường truy vấn" msgid "Queue Size should be between 5 and 100" msgstr "Kích thước hàng đợi phải từ 5 đến 100" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "Bút toán nhanh" @@ -41787,7 +41832,7 @@ msgstr "Báo giá/Khách hàng tiềm năng %" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41950,7 +41995,6 @@ msgstr "Được tạo bởi (Email)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42360,8 +42404,8 @@ msgstr "Nguyên liệu thô cho khách hàng" msgid "Raw SQL" msgstr "SQL thô" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "Số lượng nguyên liệu thô tiêu thụ sẽ được xác thực dựa trên số lượng yêu cầu BOM thành phẩm" @@ -42769,11 +42813,10 @@ msgstr "Đối soát giao dịch ngân hàng" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43297,7 +43340,7 @@ msgstr "Gói Serial và Lô bị từ chối" msgid "Rejected Warehouse" msgstr "Kho bị từ chối" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "Kho bị từ chối và Kho được chấp nhận không thể giống nhau." @@ -43347,7 +43390,7 @@ msgid "Remaining Balance" msgstr "Số dư còn lại" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43401,7 +43444,7 @@ msgstr "Nhận xét" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43440,7 +43483,7 @@ msgstr "Xóa các số đếm bằng không" msgid "Remove item if charges is not applicable to that item" msgstr "Xóa mặt hàng nếu phí không áp dụng cho mặt hàng đó" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "Đã xóa các mặt hàng không có thay đổi về số lượng hoặc giá trị." @@ -43845,6 +43888,7 @@ msgstr "Yêu cầu thông tin" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44118,7 +44162,7 @@ msgstr "Dự trữ cho phân lắp phụ" msgid "Reserved" msgstr "Đã đặt trước" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "Xung đột lô đã đặt trước" @@ -44731,7 +44775,7 @@ msgstr "" msgid "Reversal Of" msgstr "Đảo ngược của" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "Đảo Ngược Nhật ký Kế toán" @@ -44880,10 +44924,7 @@ msgstr "Vai trò được phép Giao/Nhận Vượt" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "Vai trò được phép Ghi đè Hành động Dừng" @@ -44898,8 +44939,11 @@ msgstr "Vai trò được phép Bỏ qua Hạn mức Tín dụng" msgid "Role allowed to bypass period restrictions." msgstr "Vai trò được phép Bỏ qua hạn chế kỳ." +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45100,8 +45144,8 @@ msgstr "Hạn mức Lỗ Làm tròn" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "Hạn mức Lỗ Làm tròn phải nằm trong khoảng từ 0 đến 1" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "Mục Lãi/Lỗ Làm tròn cho Chuyển kho" @@ -45128,11 +45172,11 @@ msgstr "Tên định tuyến" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "Hàng # {0}: Không thể trả lại nhiều hơn {1} cho Mặt hàng {2}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "Hàng # {0}: Vui lòng thêm Gói Serial và Batch cho Mặt hàng {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "Hàng # {0}: Vui lòng nhập số lượng cho Mặt hàng {1} vì nó không phải là không." @@ -45158,7 +45202,7 @@ msgstr "Hàng #{0} (Bảng Thanh toán): Số tiền phải âm" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "Hàng #{0} (Bảng Thanh toán): Số tiền phải dương" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "Hàng #{0}: Mục đặt hàng lại đã tồn tại cho kho {1} với loại đặt hàng lại {2}." @@ -45359,7 +45403,7 @@ msgstr "Hàng #{0}: Mục trùng lặp trong Tham chiếu {1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "Hàng #{0}: Ngày giao hàng dự kiến không thể trước Ngày đơn mua hàng" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "Hàng #{0}: Tài khoản chi phí chưa được đặt cho Mặt hàng {1}. {2}" @@ -45419,7 +45463,7 @@ msgstr "Hàng #{0}: Các trường Từ giờ và Đến giờ là bắt buộc" msgid "Row #{0}: Item added" msgstr "Hàng #{0}: Mặt hàng đã thêm" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "Hàng #{0}: Mặt hàng {1} không thể chuyển nhiều hơn {2} đối với {3} {4}" @@ -45447,7 +45491,7 @@ msgstr "Hàng #{0}: Mặt hàng {1} trong kho {2}: Có sẵn {3}, Cần {4}." msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "Hàng #{0}: Mặt hàng {1} không phải là Mặt hàng do Khách hàng cung cấp." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "Hàng #{0}: Mặt hàng {1} không phải là Mặt hàng có Serial/Lô. Nó không thể có Số serial/Số lô đối với nó." @@ -45500,7 +45544,7 @@ msgstr "Hàng #{0}: Chỉ {1} có sẵn để dự trữ cho Mặt hàng {2}" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "Hàng #{0}: Khấu hao lũy kế đầu kỳ phải nhỏ hơn hoặc bằng {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "Hàng #{0}: Công việc {1} chưa hoàn thành cho {2} số lượng thành phẩm trong Lệnh sản xuất {3}. Vui lòng cập nhật trạng thái công việc thông qua Thẻ công việc {4}." @@ -45525,7 +45569,7 @@ msgstr "Hàng #{0}: Vui lòng chọn Mặt hàng thành phẩm mà Mặt hàng d msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "Hàng #{0}: Vui lòng chọn Kho lắp ráp phụ" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "Hàng #{0}: Vui lòng đặt số lượng đặt lại" @@ -45551,15 +45595,15 @@ msgstr "Hàng #{0}: Số lượng phải là số dương" 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 "Hàng #{0}: Số lượng phải nhỏ hơn hoặc bằng Số lượng có sẵn để Dự trữ (Số lượng thực tế - Số lượng dự trữ) {1} cho Mặt hàng {2} đối với Lô {3} trong Kho {4}." -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "Hàng #{0}: Kiểm tra chất lượng là bắt buộc cho Mặt hàng {1}" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "Hàng #{0}: Kiểm tra chất lượng {1} chưa được gửi cho mặt hàng: {2}" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "Hàng #{0}: Kiểm tra chất lượng {1} đã bị từ chối cho mặt hàng {2}" @@ -45590,11 +45634,11 @@ msgstr "Hàng #{0}: Số lượng dự trữ cho Mặt hàng {1} phải lớn h msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "Hàng #{0}: Tỷ giá phải giống như {1}: {2} ({3} / {4})" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "Hàng #{0}: Loại tài liệu tham chiếu phải là một trong Đơn mua hàng, Hóa đơn mua hàng hoặc Bút toán nhật ký" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "Hàng #{0}: Loại tài liệu tham chiếu phải là một trong Đơn bán hàng, Hóa đơn bán hàng, Bút toán nhật ký hoặc Đòi nợ" @@ -45640,7 +45684,7 @@ msgstr "Hàng #{0}: Tỷ giá bán cho mặt hàng {1} thấp hơn {2}.\n" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "Hàng #{0}: ID thứ tự phải là {1} hoặc {2} cho Công việc {3}." -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "Hàng #{0}: Số serial {1} không thuộc về Lô {2}" @@ -45688,11 +45732,11 @@ msgstr "Hàng #{0}: Kho nguồn {1} cho mặt hàng {2} không thể là kho kh msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "Hàng #{0}: Kho nguồn {1} cho mặt hàng {2} phải giống như Kho nguồn {3} trong Lệnh sản xuất." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "Hàng #{0}: Kho nguồn và Kho đích không thể giống nhau cho Chuyển nguyên liệu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "Hàng #{0}: Kho nguồn, Kho đích và Chiều hàng tồn kho không thể giống nhau hoàn toàn cho Chuyển nguyên liệu" @@ -45745,11 +45789,11 @@ msgstr "Hàng #{0}: Số lượng tồn kho {1} ({2}) cho mặt hàng {3} không msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "Hàng #{0}: Kho đích phải giống như Kho khách hàng {1} từ Đơn hàng phụ thuộc vào được liên kết" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "Hàng #{0}: Lô {1} đã hết hạn." -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "Hàng #{0}: Kho {1} không phải là kho con của kho nhóm {2}" @@ -45777,7 +45821,7 @@ msgstr "Hàng #{0}: Số tiền Khấu giữ {1} không khớp với số tiền msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "Hàng #{0}: Lệnh Sản xuất đã tồn tại cho toàn bộ hoặc một phần số lượng của Mặt hàng {1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "Hàng #{0}: Bạn không thể sử dụng chiều hàng tồn kho '{1}' trong Đối soát Hàng tồn kho để sửa số lượng hoặc tỷ giá định giá. Đối soát hàng tồn kho với chiều hàng tồn kho chỉ nhằm mục đích thực hiện các mục số dư đầu kỳ." @@ -45813,23 +45857,23 @@ msgstr "Hàng #{1}: Kho là bắt buộc cho Mặt hàng tồn kho {0}" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "Hàng #{idx}: Không thể chọn Kho Nhà cung cấp khi cung cấp nguyên vật liệu cho đơn vị gia công phụ." -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "Hàng #{idx}: Tỷ giá mặt hàng đã được cập nhật theo tỷ giá định giá vì đây là chuyển kho nội bộ." -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "Hàng #{idx}: Vui lòng nhập vị trí cho mặt hàng tài sản {item_code}." -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "Hàng #{idx}: Số lượng Đã nhận phải bằng Đã chấp nhận + Đã từ chối cho Mặt hàng {item_code}." -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "Hàng #{idx}: {field_label} không thể âm cho mặt hàng {item_code}." -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "Hàng #{idx}: {field_label} là bắt buộc." @@ -45837,7 +45881,7 @@ msgstr "Hàng #{idx}: {field_label} là bắt buộc." msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "Hàng #{idx}: {from_warehouse_field} và {to_warehouse_field} không thể giống nhau." -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "Hàng #{idx}: {schedule_date} không thể trước {transaction_date}." @@ -45902,7 +45946,7 @@ msgstr "Hàng #{}: {}" msgid "Row #{}: {} {} does not exist." msgstr "Hàng #{}: {} {} không tồn tại." -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "Hàng #{}: {} {} không thuộc về Công ty {}. Vui lòng chọn {} hợp lệ." @@ -45918,7 +45962,7 @@ msgstr "Hàng {0}: Yêu cầu Thao tác cho mặt hàng nguyên vật liệu {1} msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "Hàng {0} số lượng đã chọn ít hơn số lượng yêu cầu, cần thêm {1} {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "Hàng {0}# Mặt hàng {1} không tìm thấy trong bảng 'Nguyên vật liệu Đã cung cấp' trong {2} {3}" @@ -45950,7 +45994,7 @@ msgstr "Hàng {0}: Số tiền được phân bổ {1} phải nhỏ hơn hoặc msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "Hàng {0}: Số tiền được phân bổ {1} phải nhỏ hơn hoặc bằng số tiền thanh toán còn lại {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "Hàng {0}: Vì {1} được bật, nguyên vật liệu không thể được thêm vào mục {2}. Sử dụng mục {3} để tiêu thụ nguyên vật liệu." @@ -46009,7 +46053,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "Hàng {0}: Mục ghi chú giao hàng hoặc Mục hàng đóng gói là bắt buộc." #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "Hàng {0}: Tỷ giá là bắt buộc" @@ -46050,7 +46094,7 @@ msgstr "Hàng {0}: Từ giờ và Đến giờ là bắt buộc." msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "Hàng {0}: Từ giờ và Đến giờ của {1} đang chồng chéo với {2}" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "Hàng {0}: Kho xuất là bắt buộc cho chuyển kho nội bộ" @@ -46174,7 +46218,7 @@ msgstr "Hàng {0}: Số lượng phải lớn hơn 0." msgid "Row {0}: Quantity cannot be negative." msgstr "Hàng {0}: Số lượng không thể âm." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "Hàng {0}: Số lượng không có sẵn cho {4} trong kho {1} tại thời gian đăng của mục ({2} {3})" @@ -46186,11 +46230,11 @@ msgstr "Hàng {0}: Hóa đơn Bán hàng {1} đã được tạo cho {2}" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "Hàng {0}: Ca không thể thay đổi vì khấu hao đã được xử lý" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "Hàng {0}: Mặt hàng Gia công phụ là bắt buộc cho nguyên vật liệu {1}" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "Hàng {0}: Kho Đích là bắt buộc cho chuyển kho nội bộ" @@ -46214,7 +46258,7 @@ msgstr "Hàng {0}: Tài khoản {3} {1} không thuộc về công ty {2}" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "Hàng {0}: Để đặt chu kỳ {1}, chênh lệch giữa ngày bắt đầu và ngày kết thúc phải lớn hơn hoặc bằng {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "Hàng {0}: Số lượng đã chuyển không thể lớn hơn số lượng yêu cầu." @@ -46267,7 +46311,7 @@ msgstr "Hàng {0}: Mặt hàng {2} {1} không tồn tại trong {2} {3}" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "Hàng {1}: Số lượng ({0}) không thể là phân số. Để cho phép điều này, tắt '{2}' trong Đơn vị {3}." -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "Hàng {idx}: Dãy đặt tên Tài sản là bắt buộc để tự động tạo tài sản cho mặt hàng {item_code}." @@ -46297,7 +46341,7 @@ msgstr "Các hàng có cùng tiêu đề tài khoản sẽ được hợp nhất msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "Các hàng có ngày đến hạn trùng lặp trong các hàng khác đã được tìm thấy: {0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "Các hàng: {0} có 'Payment Entry' là reference_type. Điều này không nên được đặt thủ công." @@ -46363,7 +46407,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46660,7 +46704,7 @@ msgstr "Tỷ giá Tiền vào Bán hàng" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46834,7 +46878,7 @@ msgstr "Cơ hội Bán hàng theo Nguồn" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46957,8 +47001,8 @@ msgstr "Yêu cầu Đơn hàng Bán cho Mặt hàng {0}" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "Đơn hàng Bán {0} đã tồn tại cho Đơn đặt hàng Mua của Khách hàng {1}. Để cho phép nhiều Đơn hàng Bán, bật {2} trong {3}" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47369,7 +47413,7 @@ msgstr "Cùng Mặt hàng" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "Cùng mặt hàng và tổ hợp kho đã được nhập." @@ -47406,7 +47450,7 @@ msgstr "Kho Giữ Mẫu" msgid "Sample Size" msgstr "Kích thước mẫu" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "Số lượng mẫu {0} không được nhiều hơn số lượng nhận được {1}" @@ -47697,7 +47741,7 @@ msgstr "Tìm kiếm theo mã mặt hàng, số serial hoặc mã vạch" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47842,7 +47886,7 @@ msgstr "Chọn Thương hiệu..." msgid "Select Columns and Filters" msgstr "Chọn Cột và Bộ lọc" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "Chọn Công ty" @@ -48538,7 +48582,7 @@ msgstr "Phạm vi Serial No" msgid "Serial No Reserved" msgstr "Serial No đã dự trữ" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "Serial No Series Trùng lặp" @@ -48599,7 +48643,7 @@ msgstr "Serial No là bắt buộc" msgid "Serial No is mandatory for Item {0}" msgstr "Serial No là bắt buộc cho Mặt hàng {0}" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "Serial No {0} đã tồn tại" @@ -48885,7 +48929,7 @@ msgstr "Các số serial không có sẵn cho Mặt hàng {0} trong kho {1}. Vui #: 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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48911,7 +48955,7 @@ msgstr "Các số serial không có sẵn cho Mặt hàng {0} trong kho {1}. Vui #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49309,12 +49353,6 @@ msgstr "Đặt kho mục tiêu" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "Đặt Tỷ giá Định giá Dựa trên Kho Nguồn" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "Đặt Tỷ giá Định giá cho Vật liệu Bị từ chối" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "Đặt Kho" @@ -49420,6 +49458,12 @@ msgstr "Đặt giá trị này thành 0 để vô hiệu hóa tính năng." msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "Đặt {0} trong danh mục tài sản {1} cho công ty {2}" @@ -49918,7 +49962,7 @@ msgstr "Hiển thị số dư trong Sơ đồ tài khoản" msgid "Show Barcode Field in Stock Transactions" msgstr "Hiển thị trường Mã vạch trong các giao dịch tồn kho" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "Hiển thị các bút toán đã hủy" @@ -49926,7 +49970,7 @@ msgstr "Hiển thị các bút toán đã hủy" msgid "Show Completed" msgstr "Hiển thị đã hoàn thành" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "Hiển thị Có / Nợ theo đơn vị tiền tệ của công ty" @@ -50009,7 +50053,7 @@ msgstr "Hiển thị ghi chú giao hàng được liên kết" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "Hiển thị giá trị ròng trong tài khoản đối tác" @@ -50021,7 +50065,7 @@ msgstr "" msgid "Show Open" msgstr "Hiển thị đang mở" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "Hiển thị bút toán mở đầu" @@ -50034,11 +50078,6 @@ msgstr "Hiển thị số dư đầu và cuối kỳ" msgid "Show Operations" msgstr "Hiển thị các hoạt động" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "Hiển thị nút thanh toán trong cổng Purchase Order" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "Hiển thị chi tiết thanh toán" @@ -50054,7 +50093,7 @@ msgstr "Hiển thị lịch thanh toán trong in ấn" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "Hiển thị ghi chú" @@ -50121,6 +50160,11 @@ msgstr "Chỉ hiển thị POS" msgid "Show only the Immediate Upcoming Term" msgstr "Chỉ hiển thị kỳ hạn sắp tới ngay lập tức" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "Hiển thị các bút toán đang chờ" @@ -50409,11 +50453,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50479,7 +50523,7 @@ msgstr "Kho nguồn {0} phải giống Kho khách hàng {1} trong Đơn đặt h msgid "Source and Target Location cannot be same" msgstr "Vị trí nguồn và đích không thể giống nhau" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "Kho nguồn và kho đích không thể giống nhau cho hàng {0}" @@ -50493,8 +50537,8 @@ msgid "Source of Funds (Liabilities)" msgstr "Nguồn vốn (nợ)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "Kho nguồn là bắt buộc đối với hàng {0}" @@ -50659,8 +50703,8 @@ msgstr "Chi phí thuế suất tiêu chuẩn" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "Bán hàng tiêu chuẩn" @@ -50993,7 +51037,7 @@ msgstr "Nhật ký đóng kỳ tồn kho" msgid "Stock Details" msgstr "Chi tiết tồn kho" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "Các bút toán tồn kho đã được tạo cho Work Order {0}: {1}" @@ -51264,7 +51308,7 @@ msgstr "Hàng tồn kho đã nhận nhưng chưa lập hóa đơn" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51276,7 +51320,7 @@ msgstr "Đối soát tồn kho" msgid "Stock Reconciliation Item" msgstr "Mục đối soát tồn kho" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "Các đối soát tồn kho" @@ -51314,7 +51358,7 @@ msgstr "Cài đặt đăng lại tồn kho" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51342,7 +51386,7 @@ msgstr "Các mục dự trữ tồn kho đã bị hủy" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "Các mục dự trữ tồn kho đã được tạo" @@ -51724,7 +51768,7 @@ msgstr "Work Order đã dừng không thể bị hủy, hãy bỏ dừng trướ #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "Cửa hàng" @@ -51802,10 +51846,6 @@ msgstr "Các thao tác phụ" msgid "Sub Procedure" msgstr "Thủ tục phụ" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "Tổng phụ" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "Tham chiếu mặt hàng cụm phụ đang thiếu. Vui lòng lấy lại các cụm phụ và nguyên vật liệu." @@ -52022,7 +52062,7 @@ msgstr "Mục dịch vụ đơn nhận hàng ký gửi" msgid "Subcontracting Order" msgstr "Đơn hàng ký gửi" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52048,7 +52088,7 @@ msgstr "Mục dịch vụ đơn hàng ký gửi" msgid "Subcontracting Order Supplied Item" msgstr "Mục cung cấp đơn hàng ký gửi" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "Đơn hàng ký gửi {0} đã được tạo." @@ -52137,7 +52177,7 @@ msgstr "Thiết lập ký gửi" msgid "Subdivision" msgstr "Tiểu huyện" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "Gửi hành động thất bại" @@ -52312,7 +52352,7 @@ msgstr "Đã đối soát thành công" msgid "Successfully Set Supplier" msgstr "Đã đặt Nhà cung cấp thành công" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "Đã thay đổi Stock UOM thành công, vui lòng xác định lại các hệ số chuyển đổi cho UOM mới." @@ -52468,6 +52508,7 @@ msgstr "Số lượng được cung cấp" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52509,8 +52550,8 @@ msgstr "Số lượng được cung cấp" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52558,6 +52599,12 @@ msgstr "Địa chỉ và liên hệ nhà cung cấp" msgid "Supplier Contact" msgstr "Liên hệ nhà cung cấp" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52652,7 +52699,7 @@ msgstr "Ngày hóa đơn nhà cung cấp" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "Số hóa đơn nhà cung cấp" @@ -52932,19 +52979,10 @@ msgstr "Nhà cung cấp hàng hóa hoặc dịch vụ." msgid "Supplier {0} not found in {1}" msgstr "Nhà cung cấp {0} không tìm thấy trong {1}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "Nhà cung cấp" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "Phân tích bán hàng theo nhà cung cấp" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53006,7 +53044,7 @@ msgstr "Đội ngũ hỗ trợ" msgid "Support Tickets" msgstr "Vé hỗ trợ" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53266,8 +53304,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "Kho đích {0} phải giống Kho giao hàng {1} trong Mục đơn nhận hàng ký gửi." #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "Kho mục tiêu là bắt buộc đối với hàng {0}" @@ -53736,7 +53774,7 @@ msgstr "Thuế được khấu giữ chỉ cho số tiền vượt quá ngưỡn #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "Số tiền chịu thuế" @@ -53897,7 +53935,7 @@ msgstr "Thuế và Phí đã khấu trừ" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "Thuế và Phí đã khấu trừ (Tiền tệ công ty)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "Hàng thuế #{0}: {1} không thể nhỏ hơn {2}" @@ -54087,7 +54125,6 @@ msgstr "Mẫu điều khoản" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54279,7 +54316,7 @@ msgstr "Quyền truy cập vào Yêu cầu Báo giá từ Cổng thông tin bị msgid "The BOM which will be replaced" msgstr "BOM sẽ được thay thế" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "Lô {0} có số lượng lô âm {1}. Để khắc phục điều này, hãy đi đến lô và nhấp vào Tính lại số lượng lô. Nếu sự cố vẫn tiếp diễn, hãy tạo một mục nhập vào." @@ -54323,7 +54360,7 @@ msgstr "Điều khoản thanh toán ở hàng {0} có thể bị trùng lặp." 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 "Danh sách chọn có các mục dự trữ tồn kho không thể được cập nhật. Nếu bạn cần thực hiện thay đổi, chúng tôi khuyên bạn hủy các mục dự trữ tồn kho hiện có trước khi cập nhật Danh sách chọn." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "Số lượng hao hụt quy trình đã được đặt lại theo Số lượng hao hụt quy trình của thẻ công việc" @@ -54339,7 +54376,7 @@ msgstr "Số serial ở Hàng #{0}: {1} không có sẵn trong kho {2}." msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "Số serial {0} được dự trữ đối với {1} {2} và không thể được sử dụng cho bất kỳ giao dịch nào khác." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "Gói Serial và Batch {0} không hợp lệ cho giao dịch này. 'Loại giao dịch' phải là 'Xuất' thay vì 'Nhập' trong Gói Serial và Batch {0}" @@ -54375,7 +54412,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "Lô {0} đã được dự trữ trong {1} {2}. Vì vậy, không thể tiến hành với {3} {4}, được tạo đối với {5} {6}." @@ -54481,7 +54518,7 @@ msgstr "Các lô sau đã hết hạn, vui lòng nhập hàng lại:
{0}" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "Các mục đăng lại đã hủy sau tồn tại cho {0}:

{1}

Vui lòng xóa các mục này trước khi tiếp tục." -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "Các thuộc tính đã xóa sau tồn tại trong Biến thể nhưng không có trong Mẫu. Bạn có thể xóa các Biến thể hoặc giữ các thuộc tính trong mẫu." @@ -54526,15 +54563,15 @@ msgstr "Ngày nghỉ vào {0} không nằm giữa Từ ngày và Đến ngày" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "Mặt hàng {item} không được đánh dấu là mặt hàng {type_of}. Bạn có thể bật nó là mặt hàng {type_of} từ master mặt hàng của nó." -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "Các mặt hàng {0} và {1} có mặt trong {2} sau:" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "Các mặt hàng {items} không được đánh dấu là mặt hàng {type_of}. Bạn có thể bật chúng là mặt hàng {type_of} từ master mặt hàng của chúng." @@ -54690,7 +54727,7 @@ msgstr "Cổ phiếu không tồn tại với {0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "Hàng tồn kho cho mặt hàng {0} trong kho {1} âm vào ngày {2}. Bạn nên tạo một mục dương {3} trước ngày {4} và thời gian {5} để đăng tỷ giá định giá chính xác. Để biết thêm chi tiết, vui lòng đọc tài liệu." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "Hàng tồn kho đã được dự trữ cho các Mặt hàng và Kho sau, bỏ dự trữ cùng để {0} Đối soát Tồn kho:

{1}" @@ -54712,11 +54749,11 @@ 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 "Hệ thống sẽ tạo Hóa đơn bán hàng hoặc Hóa đơn POS từ giao diện POS dựa trên cài đặt này. Đối với các giao dịch khối lượng lớn, nên sử dụng Hóa đơn POS." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "Tác vụ đã được đưa vào hàng đợi như một công việc nền. Trong trường hợp có bất kỳ vấn đề nào khi xử lý nền, hệ thống sẽ thêm một bình luận về lỗi trên Đối soát Tồn kho này và quay lại giai đoạn Nháp" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "Tác vụ đã được đưa vào hàng đợi như một công việc nền. Trong trường hợp có bất kỳ vấn đề nào khi xử lý nền, hệ thống sẽ thêm một bình luận về lỗi trên Đối soát Tồn kho này và quay lại giai đoạn Đã gửi" @@ -54788,7 +54825,7 @@ msgstr "{0} ({1}) phải bằng {2} ({3})" msgid "The {0} contains Unit Price Items." msgstr "{0} chứa các mặt hàng theo đơn giá." -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "Tiền tố {0} '{1}' đã tồn tại. Vui lòng thay đổi Dãy số Serial No, nếu không bạn sẽ gặp lỗi Mục trùng lặp." @@ -54841,7 +54878,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "Không có chỗ trống vào ngày này" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54885,7 +54922,7 @@ msgstr "Không tìm thấy lô nào cho {0}: {1}" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "Phải có ít nhất 1 Thành phẩm trong Phiếu kho này" @@ -54941,11 +54978,11 @@ msgstr "Mặt hàng này là Biến thể của {0} (Mẫu)." msgid "This Month's Summary" msgstr "Tóm tắt Tháng này" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "Đơn mua hàng này đã được giao hoàn toàn cho bên thứ ba." -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "�ơn đặt hàng này đã được giao hoàn toàn cho bên thứ ba." @@ -55746,7 +55783,7 @@ msgstr "Để bao gồm chi phí cụm con và các mặt hàng phụ trong Thà msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "Để bao gồm thuế trong hàng {0} trong đơn giá mặt hàng, thuế trong các hàng {1} cũng phải được bao gồm" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "Để hợp nhất, các thuộc tính sau phải giống nhau cho cả hai mặt hàng" @@ -55781,7 +55818,7 @@ msgstr "Để sử dụng sổ tài chính khác, vui lòng bỏ đánh dấu 'B #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "Để sử dụng sổ tài chính khác, vui lòng bỏ đánh dấu 'Bao gồm các mục FB mặc định'" @@ -55932,7 +55969,7 @@ msgstr "Tổng số phân bổ" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "Tổng số tiền" @@ -56355,7 +56392,7 @@ msgstr "Tổng số tiền Yêu cầu thanh toán không thể lớn hơn số t msgid "Total Payments" msgstr "Tổng thanh toán" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "Tổng số lượng đã chọn {0} nhiều hơn số lượng đặt {1}. Bạn có thể đặt Cho phép chọn vượt trong Cài đặt kho." @@ -56387,7 +56424,7 @@ msgstr "Tổng chi phí mua (qua Hóa đơn mua hàng)" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "Tổng số lượng" @@ -56773,7 +56810,7 @@ msgstr "URL theo dõi" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56784,7 +56821,7 @@ msgstr "Giao dịch" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "Tiền tệ giao dịch" @@ -57456,11 +57493,11 @@ msgstr "Cài đặt UAE VAT" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57532,7 +57569,7 @@ msgstr "Hệ số chuyển đổi Đơn vị đo là bắt buộc trong hàng {0 msgid "UOM Name" msgstr "Tên Đơn vị đo" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "Hệ số chuyển đổi Đơn vị đo là bắt buộc cho Đơn vị đo: {0} trong Mặt hàng: {1}" @@ -57608,7 +57645,7 @@ msgstr "Không thể tìm thấy điểm bắt đầu tại {0}. Bạn cần có msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "Không thể tìm thấy khung thời gian trong {0} ngày tới cho hoạt động {1}. Vui lòng tăng 'Lập kế hoạch công suất cho (Ngày)' trong {2}." -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "Không thể tìm thấy biến:" @@ -57727,7 +57764,7 @@ msgstr "Đơn vị đo" msgid "Unit of Measure (UOM)" msgstr "Đơn vị đo (UOM)" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "Đơn vị đo {0} đã được nhập nhiều hơn một lần trong Bảng hệ số chuyển đổi" @@ -57847,10 +57884,9 @@ msgid "Unreconcile Transaction" msgstr "Hủy đối soát giao dịch" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "Chưa đối soát" @@ -57873,10 +57909,6 @@ msgstr "Các mục chưa đối soát" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57922,7 +57954,7 @@ msgstr "Đột xuất" msgid "Unsecured Loans" msgstr "Vay không có bảo đảm" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "Bỏ đặt Yêu cầu thanh toán đã khớp" @@ -58137,12 +58169,6 @@ msgstr "Cập nhật kho" msgid "Update Type" msgstr "Loại cập nhật" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "Tần suất cập nhật của Dự án" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58183,7 +58209,7 @@ msgstr "Đã cập nhật {0} Hàng(s) Báo cáo tài chính với tên danh m msgid "Updating Costing and Billing fields against this Project..." msgstr "Đang cập nhật các trường chi phí và thanh toán đối với Dự án này..." -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "Đang cập nhật các biến thể..." @@ -58641,12 +58667,6 @@ msgstr "Xác thực quy tắc áp dụng" msgid "Validate Components and Quantities Per BOM" msgstr "Xác thực các thành phần và số lượng theo Định mức" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "Xác thực số lượng tiêu thụ (theo Định mức)" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58670,6 +58690,12 @@ msgstr "Xác thực quy tắc giá" msgid "Validate Stock on Save" msgstr "Xác thực kho khi lưu" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58776,11 +58802,11 @@ msgstr "Thiếu tỷ giá định giá" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "Tỷ giá định giá cho Mặt hàng {0}, là bắt buộc để thực hiện các bút toán kế toán cho {1} {2}." -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "Tỷ giá định giá là bắt buộc nếu nhập tồn kho đầu kỳ" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "Tỷ giá định giá là bắt buộc cho Mặt hàng {0} tại hàng {1}" @@ -58790,7 +58816,7 @@ msgstr "Tỷ giá định giá là bắt buộc cho Mặt hàng {0} tại hàng msgid "Valuation and Total" msgstr "Định giá và Tổng" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "Tỷ giá định giá cho các mặt hàng do khách hàng cung cấp đã được đặt thành không." @@ -58940,7 +58966,7 @@ msgstr "Phương sai ({})" msgid "Variant" msgstr "Biến thể" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "Lỗi thuộc tính biến thể" @@ -58959,7 +58985,7 @@ msgstr "Định mức biến thể" msgid "Variant Based On" msgstr "Biến thể dựa trên" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "Biến thể dựa trên không thể thay đổi" @@ -58977,7 +59003,7 @@ msgstr "Trường biến thể" msgid "Variant Item" msgstr "Mục biến thể" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "Các mặt hàng biến thể" @@ -59358,7 +59384,7 @@ msgstr "Tên phiếu thanh toán" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59398,7 +59424,7 @@ msgstr "Số lượng chứng từ" #. 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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "Loại phụ chứng từ" @@ -59430,7 +59456,7 @@ msgstr "Loại phụ chứng từ" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59665,7 +59691,7 @@ msgstr "Kho {0} không tồn tại" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "Kho {0} không được phép cho Đơn đặt hàng {1}, nó phải là {2}" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "Kho {0} không được liên kết với bất kỳ tài khoản nào, vui lòng đề cập tài khoản trong bản ghi kho hoặc đặt tài khoản hàng tồn kho mặc định trong công ty {1}." @@ -59712,7 +59738,7 @@ msgstr "Các kho có giao dịch hiện có không thể chuyển đổi thành #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59768,6 +59794,12 @@ msgstr "Cảnh báo cho yêu cầu báo giá mới" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "Cảnh báo - Hàng {0}: Số giờ thanh toán nhiều hơn Số giờ thực tế" @@ -59951,7 +59983,7 @@ msgstr "Thông số trang web" msgid "Website:" msgstr "Trang mạng:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60325,7 +60357,7 @@ msgstr "Nguyên liệu tiêu hao đơn hàng công việc" msgid "Work Order Item" msgstr "Mục đơn hàng công việc" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60387,11 +60419,11 @@ msgstr "Đơn hàng công việc không được tạo" msgid "Work Order {0} created" msgstr "Đơn hàng công việc {0} đã được tạo" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "Đơn hàng công việc {0}: Không tìm thấy Thẻ công việc cho thao tác {1}" @@ -60707,11 +60739,11 @@ msgstr "Tên năm" msgid "Year Start Date" msgstr "Ngày bắt đầu năm" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60764,7 +60796,7 @@ msgstr "Bạn cũng có thể sao chép-dán liên kết này vào trình duyệ msgid "You can also set default CWIP account in Company {}" msgstr "Bạn cũng có thể đặt tài khoản CWIP mặc định trong Công ty {}" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60918,6 +60950,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60946,7 +60982,7 @@ msgstr "Bạn đã bật {0} và {1} trong {2}. Điều này có thể dẫn đ msgid "You have entered a duplicate Delivery Note on Row" msgstr "Bạn đã nhập một Phiếu giao hàng trùng lặp ở hàng" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60954,7 +60990,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "Bạn phải bật tự động đặt hàng lại trong Cài đặt kho để duy trì mức đặt hàng lại." @@ -61025,8 +61061,11 @@ msgstr "Không chịu thuế" msgid "Zero quantity" msgstr "Số lượng bằng không" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61138,7 +61177,7 @@ msgstr "exchangerate.host" msgid "fieldname" msgstr "tên_trường" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61356,6 +61395,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "duy nhất, ví dụ: SAVE20 Được sử dụng để nhận chiết khấu" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "chênh lệch" @@ -61414,7 +61457,8 @@ msgstr "{0} Mã giảm giá đã sử dụng là {1}. Số lượng cho phép đ msgid "{0} Digest" msgstr "{0} Tóm tắt" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61434,7 +61478,7 @@ msgstr "{0} Hoạt động: {1}" msgid "{0} Request for {1}" msgstr "{0} Yêu cầu cho {1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0} Lưu mẫu dựa trên lô, vui lòng kiểm tra Có số lô để lưu mẫu vật tư" @@ -61547,7 +61591,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0} đã được nhập hai lần trong Thuế vật tư" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "{0} đã được nhập hai lần {1} trong Thuế vật tư" @@ -61715,7 +61759,7 @@ msgstr "Tham số {0} không hợp lệ" msgid "{0} payment entries can not be filtered by {1}" msgstr "Không thể lọc {0} mục thanh toán theo {1}" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "{0} số lượng của Mục {1} đang được nhận vào Kho {2} với công suất {3}." @@ -61728,7 +61772,7 @@ msgstr "{0} đến {1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "{0} đơn vị được giữ cho Mục {1} trong Kho {2}, vui lòng hủy giữ chúng để {3} Đối soát tồn kho." @@ -61930,7 +61974,7 @@ msgstr "{0} {1}: Tài khoản {2} không hoạt động" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: Bút toán kế toán cho {2} chỉ có thể được thực hiện bằng đơn vị tiền tệ: {3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: Trung tâm chi phí là bắt buộc cho Mục {2}" @@ -62016,23 +62060,23 @@ msgstr "{0}: {1} không tồn tại" msgid "{0}: {1} is a group account." msgstr "{0}: {1} là một tài khoản nhóm." -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}: {1} phải nhỏ hơn {2}" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "{count} Tài sản đã được tạo cho {item_code}" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} bị hủy hoặc đóng." -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "Cỡ mẫu ({sample_size}) của {item_name} không thể lớn hơn Số lượng chấp nhận ({accepted_quantity})" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "{ref_doctype} {ref_name} là {status}." diff --git a/erpnext/locale/zh.po b/erpnext/locale/zh.po index 7212fe1f14d..86fc68bb499 100644 --- a/erpnext/locale/zh.po +++ b/erpnext/locale/zh.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-10 10:00+0000\n" -"PO-Revision-Date: 2026-05-10 18:21\n" +"POT-Creation-Date: 2026-05-17 10:04+0000\n" +"PO-Revision-Date: 2026-05-18 20:21\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Chinese Simplified\n" "MIME-Version: 1.0\n" @@ -95,15 +95,15 @@ msgstr "子装配件" msgid " Summary" msgstr "摘要" -#: erpnext/stock/doctype/item/item.py:278 +#: erpnext/stock/doctype/item/item.py:279 msgid "\"Customer Provided Item\" cannot be Purchase Item also" msgstr "“受托加工材料”不能设置为允许采购" -#: erpnext/stock/doctype/item/item.py:280 +#: erpnext/stock/doctype/item/item.py:281 msgid "\"Customer Provided Item\" cannot have Valuation Rate" msgstr "“受托加工材料”不允许有成本价" -#: erpnext/stock/doctype/item/item.py:383 +#: erpnext/stock/doctype/item/item.py:384 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" msgstr "已有关联的固定资产记录,不能取消勾选允许资产" @@ -302,7 +302,7 @@ msgstr "“开始日期”是必需的" msgid "'From Date' must be after 'To Date'" msgstr "“开始日期”必须早于'终止日期'" -#: erpnext/stock/doctype/item/item.py:466 +#: erpnext/stock/doctype/item/item.py:467 msgid "'Has Serial No' can not be 'Yes' for non-stock item" msgstr "不能为非库存物料勾选'启用序列号管理'" @@ -338,7 +338,7 @@ msgstr "因为退货源单{0}未勾选“更新库存“,退货/退款单也 msgid "'Update Stock' cannot be checked for fixed asset sale" msgstr "固定资产销售不能选择“更新库存”" -#: erpnext/accounts/doctype/bank_account/bank_account.py:79 +#: erpnext/accounts/doctype/bank_account/bank_account.py:78 msgid "'{0}' account is already used by {1}. Use another account." msgstr "'{0}' 科目已被 {1} 占用. 请使用另一个科目" @@ -1095,7 +1095,7 @@ msgstr "必须设置驾驶员才能提交" msgid "A logical Warehouse against which stock entries are made." msgstr "创建物料移动所依赖的逻辑仓库。" -#: erpnext/stock/serial_batch_bundle.py:1474 +#: erpnext/stock/serial_batch_bundle.py:1480 msgid "A naming series conflict occurred while creating serial numbers. Please change the naming series for the item {0}." msgstr "" @@ -1307,7 +1307,7 @@ msgstr "服务商{0}必须提供访问密钥" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "依据CEFACT/ICG/2010/IC013或IC010标准" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1076 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "根据物料清单{0},库存交易缺少物料'{1}'" @@ -1977,8 +1977,8 @@ msgstr "会计分录" msgid "Accounting Entry for Asset" msgstr "资产会计分录" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2039 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2059 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "库存凭证{0}中LCV的会计分录入账" @@ -1986,7 +1986,7 @@ msgstr "库存凭证{0}中LCV的会计分录入账" msgid "Accounting Entry for Landed Cost Voucher for SCR {0}" msgstr "SCR{0}到岸成本凭证的会计分录入账" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:855 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:848 msgid "Accounting Entry for Service" msgstr "服务会计凭证" @@ -1999,16 +1999,16 @@ msgstr "服务会计凭证" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1236 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1472 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1494 -#: erpnext/controllers/stock_controller.py:732 -#: erpnext/controllers/stock_controller.py:749 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:948 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1984 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1998 +#: erpnext/controllers/stock_controller.py:733 +#: erpnext/controllers/stock_controller.py:750 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "库存会计分录" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:752 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:745 msgid "Accounting Entry for {0}" msgstr "{0}会计凭证" @@ -2306,12 +2306,6 @@ msgstr "未提交质检时的处理方式" msgid "Action If Quality Inspection Is Rejected" msgstr "质检被拒的措施" -#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Action If Same Rate is Not Maintained" -msgstr "不使用相同价格系统控制措施" - #: erpnext/quality_management/doctype/quality_review/quality_review_list.js:7 msgid "Action Initialised" msgstr "控制措施已启动" @@ -2370,6 +2364,12 @@ msgstr "累计费用超出年度预算时的处理措施" msgid "Action if Same Rate is Not Maintained Throughout Internal Transaction" msgstr "内部交易中汇率不一致时的处理方式" +#. Label of the maintain_same_rate_action (Select) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Action if same rate is not maintained" +msgstr "" + #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -2637,7 +2637,7 @@ msgstr "实际工时(通过工时表)" msgid "Actual qty in stock" msgstr "实际库存数量" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1545 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1527 #: erpnext/public/js/controllers/accounts.js:197 msgid "Actual type tax cannot be included in Item rate in row {0}" msgstr "实际税额不能包含在第{0}行的物料单价中" @@ -2651,7 +2651,7 @@ msgstr "临时数量" msgid "Add / Edit Prices" msgstr "添加/编辑价格" -#: erpnext/accounts/report/general_ledger/general_ledger.js:208 +#: erpnext/accounts/report/general_ledger/general_ledger.js:214 msgid "Add Columns in Transaction Currency" msgstr "显示交易货币金额" @@ -2805,7 +2805,7 @@ msgstr "添加序列号/批号" msgid "Add Serial / Batch No (Rejected Qty)" msgstr "添加序列号/批号(拒收数量)" -#: erpnext/public/js/utils/naming_series_dialog.js:26 +#: erpnext/public/js/utils/naming_series.js:26 msgid "Add Series Prefix" msgstr "" @@ -3050,7 +3050,7 @@ msgstr "额外折扣金额" msgid "Additional Discount Amount (Company Currency)" msgstr "额外折扣金额(本币)" -#: erpnext/controllers/taxes_and_totals.py:850 +#: erpnext/controllers/taxes_and_totals.py:833 msgid "Additional Discount Amount ({discount_amount}) cannot exceed the total before such discount ({total_before_discount})" msgstr "" @@ -3335,7 +3335,7 @@ msgstr "调整数量" msgid "Adjustment Against" msgstr "源单" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:677 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:670 msgid "Adjustment based on Purchase Invoice rate" msgstr "基于采购发票汇率的调整" @@ -3448,7 +3448,7 @@ msgstr "预付款凭证类型" msgid "Advance amount" msgstr "预付金额" -#: erpnext/controllers/taxes_and_totals.py:987 +#: erpnext/controllers/taxes_and_totals.py:970 msgid "Advance amount cannot be greater than {0} {1}" msgstr "预付金额不能大于{0} {1}" @@ -3517,7 +3517,7 @@ msgstr "对方科目" #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:42 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:95 -#: erpnext/accounts/report/general_ledger/general_ledger.py:757 +#: erpnext/accounts/report/general_ledger/general_ledger.py:774 msgid "Against Account" msgstr "对方科目" @@ -3635,7 +3635,7 @@ msgstr "对应供应商发票{0}" #. Label of the against_voucher (Dynamic Link) field in DocType 'GL Entry' #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:790 +#: erpnext/accounts/report/general_ledger/general_ledger.py:807 msgid "Against Voucher" msgstr "对销凭证" @@ -3659,7 +3659,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:788 +#: erpnext/accounts/report/general_ledger/general_ledger.py:805 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:183 msgid "Against Voucher Type" msgstr "对销凭证类型" @@ -3940,7 +3940,7 @@ msgstr "包括及以上的所有通信均应移至新问题中" msgid "All items are already requested" msgstr "所有物料已申请" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1501 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1494 msgid "All items have already been Invoiced/Returned" msgstr "所有物料已开具发票/退回" @@ -3948,7 +3948,7 @@ msgstr "所有物料已开具发票/退回" msgid "All items have already been received" msgstr "所有物料已收货" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 msgid "All items have already been transferred for this Work Order." msgstr "所有物料已发料到该生产工单。" @@ -3997,7 +3997,7 @@ msgstr "分配" msgid "Allocate Advances Automatically (FIFO)" msgstr "自动分配预付(先进先出)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:935 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:917 msgid "Allocate Payment Amount" msgstr "分配付款金额" @@ -4007,7 +4007,7 @@ msgstr "分配付款金额" msgid "Allocate Payment Based On Payment Terms" msgstr "基于付款条款分配付款金额" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1735 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1717 msgid "Allocate Payment Request" msgstr "分配付款请求" @@ -4037,7 +4037,7 @@ msgstr "已分配" #. Payment Entries' #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json @@ -4158,15 +4158,15 @@ msgstr "允许退货" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "启用近距离调拨价" -#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Item To Be Added Multiple Times in a Transaction" -msgstr "允许在交易中物料号重复" - #: erpnext/controllers/selling_controller.py:858 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "允许在交易中物料号重复" +#. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Allow Item to be added multiple times in a transaction" +msgstr "" + #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' #: erpnext/crm/doctype/crm_settings/crm_settings.json @@ -4195,12 +4195,6 @@ msgstr "允许负库存" msgid "Allow Negative Stock for Batch" msgstr "" -#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Allow Negative rates for Items" -msgstr "允许物料负单价" - #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' #: erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json @@ -4413,8 +4407,11 @@ msgstr "允许单方账户开具多币种发票" msgid "Allow multiple Sales Orders against a customer's Purchase Order" msgstr "" +#. Label of the allow_negative_rates_for_items (Check) field in DocType 'Buying +#. Settings' #. Label of the allow_negative_rates_for_items (Check) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow negative rates for Items" msgstr "" @@ -4506,7 +4503,7 @@ msgstr "允许交易" msgid "Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only." msgstr "主角色仅限'客户'与'供应商',请选择其中一种" -#: erpnext/public/js/utils/naming_series_dialog.js:81 +#: erpnext/public/js/utils/naming_series.js:81 msgid "Allowed special characters are '/' and '-'" msgstr "" @@ -4703,7 +4700,7 @@ msgstr "始终询问" #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json #: erpnext/accounts/doctype/budget_distribution/budget_distribution.json #: erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:623 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 #: 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 @@ -4733,7 +4730,6 @@ msgstr "始终询问" #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:10 -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:93 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:48 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:79 #: erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:411 @@ -4903,10 +4899,6 @@ msgstr "" msgid "Amount in Account Currency" msgstr "金额(科目货币)" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:119 -msgid "Amount in Words" -msgstr "金额大写" - #. Description of the 'Outstanding Amount' (Currency) field in DocType 'Payment #. Request' #: erpnext/accounts/doctype/payment_request/payment_request.json @@ -5526,7 +5518,7 @@ msgstr "由于字段{0}已启用,字段{1}为必填项" msgid "As the field {0} is enabled, the value of the field {1} should be more than 1." msgstr "由于字段{0}已启用,字段{1}值必须大于1" -#: erpnext/stock/doctype/item/item.py:1068 +#: erpnext/stock/doctype/item/item.py:1106 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}." msgstr "由于存在针对物料{0}的已提交交易,不可修改{1}的值" @@ -5676,7 +5668,7 @@ msgstr "资产类别的科目" msgid "Asset Category Name" msgstr "资产类别名称" -#: erpnext/stock/doctype/item/item.py:375 +#: erpnext/stock/doctype/item/item.py:376 msgid "Asset Category is mandatory for Fixed Asset item" msgstr "固定资产类的物料其资产类别字段是必填的" @@ -6072,7 +6064,7 @@ msgstr "资产{0}未提交。请先提交资产再继续操作。" msgid "Asset {0} must be submitted" msgstr "资产{0}必须提交" -#: erpnext/controllers/buying_controller.py:1002 +#: erpnext/controllers/buying_controller.py:992 msgid "Asset {assets_link} created for {item_code}" msgstr "已为{item_code}创建资产{assets_link}" @@ -6110,11 +6102,11 @@ msgstr "资产" msgid "Assets Setup" msgstr "" -#: erpnext/controllers/buying_controller.py:1020 +#: erpnext/controllers/buying_controller.py:1010 msgid "Assets not created for {item_code}. You will have to create asset manually." msgstr "未为{item_code}创建资产,请手动创建" -#: erpnext/controllers/buying_controller.py:1007 +#: erpnext/controllers/buying_controller.py:997 msgid "Assets {assets_link} created for {item_code}" msgstr "已为{item_code}创建资产{assets_link}" @@ -6187,7 +6179,7 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:877 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 msgid "At least one warehouse is mandatory" msgstr "必须指定至少一个仓库" @@ -6219,7 +6211,7 @@ msgstr "行{0}:批次{1}的数量为必填项" msgid "At row {0}: Serial No is mandatory for Item {1}" msgstr "行{0}:物料{1}必须填写序列号" -#: erpnext/controllers/stock_controller.py:680 +#: erpnext/controllers/stock_controller.py:681 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 "第 {0} 行,序列号/批号已创建,请清空序列号或批号字段" @@ -6283,7 +6275,11 @@ msgstr "属性名称" msgid "Attribute Value" msgstr "属性值" -#: erpnext/stock/doctype/item/item.py:1004 +#: erpnext/stock/doctype/item/item.py:896 +msgid "Attribute Value {0} is not valid for the selected attribute {1}." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" msgstr "属性表中的信息必填" @@ -6291,11 +6287,19 @@ msgstr "属性表中的信息必填" msgid "Attribute value: {0} must appear only once" msgstr "属性值{0}必须唯一" -#: erpnext/stock/doctype/item/item.py:1008 +#: erpnext/stock/doctype/item/item.py:890 +msgid "Attribute {0} is disabled." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:878 +msgid "Attribute {0} is not valid for the selected template." +msgstr "" + +#: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" msgstr "属性{0}多次选择在属性表" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Attributes" msgstr "属性" @@ -6355,24 +6359,12 @@ msgstr "授权值" msgid "Auto Create Exchange Rate Revaluation" msgstr "自动创建汇率重估" -#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Purchase Receipt" -msgstr "自动创建委外入库" - #. Label of the auto_create_serial_and_batch_bundle_for_outward (Check) field #. in DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Auto Create Serial and Batch Bundle For Outward" msgstr "出库时自动创建(分派)序列号与批号记录" -#. Label of the auto_create_subcontracting_order (Check) field in DocType -#. 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Auto Create Subcontracting Order" -msgstr "自动创建委外订单" - #. Label of the auto_created (Check) field in DocType 'Fiscal Year' #: erpnext/accounts/doctype/fiscal_year/fiscal_year.json msgid "Auto Created" @@ -6491,6 +6483,18 @@ msgstr "" msgid "Auto close Opportunity Replied after the no. of days mentioned above" msgstr "在上述天数之后自动关闭已回复商机" +#. Label of the auto_create_purchase_receipt (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Purchase Receipt" +msgstr "" + +#. Label of the auto_create_subcontracting_order (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Auto create Subcontracting Order" +msgstr "" + #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Auto create assets on purchase" @@ -6708,7 +6712,7 @@ msgstr "" msgid "Available for use date is required" msgstr "请输入启用日期" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1040 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 msgid "Available quantity is {0}, you need {1}" msgstr "可用数量 {0},需求数量 {1}" @@ -6807,7 +6811,7 @@ msgstr "广度优先搜索" msgid "BIN Qty" msgstr "库位数量" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #. Label of the bom (Link) field in DocType 'Purchase Order Item' #. Name of a DocType @@ -7080,7 +7084,7 @@ msgstr "展示在网站上的BOM物料" msgid "BOM Website Operation" msgstr "展示在网站上的BOM工序" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2431 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7171,8 +7175,8 @@ msgstr "从车间仓耗用原材料" #. Label of the backflush_raw_materials_of_subcontract_based_on (Select) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Backflush Raw Materials of Subcontract Based On" -msgstr "委外入库原材料扣账方式" +msgid "Backflush raw materials of subcontract based on" +msgstr "" #. Label of the balance (Currency) field in DocType 'Bank Account Balance' #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import @@ -7192,7 +7196,7 @@ msgstr "余额" msgid "Balance (Dr - Cr)" msgstr "结余(Dr - Cr)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:709 +#: erpnext/accounts/report/general_ledger/general_ledger.py:726 msgid "Balance ({0})" msgstr "余额({0})" @@ -7723,11 +7727,11 @@ msgstr "银行" msgid "Barcode Type" msgstr "条码类型" -#: erpnext/stock/doctype/item/item.py:543 +#: erpnext/stock/doctype/item/item.py:544 msgid "Barcode {0} already used in Item {1}" msgstr "条码{0}已被物料{1}使用" -#: erpnext/stock/doctype/item/item.py:558 +#: erpnext/stock/doctype/item/item.py:559 msgid "Barcode {0} is not a valid {1} code" msgstr "条码{0}不是有效的{1}代码" @@ -8094,12 +8098,12 @@ msgstr "批号 {0} 和仓库" msgid "Batch {0} is not available in warehouse {1}" msgstr "批次{0}在仓库{1}中不可用" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3504 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "物料{1}的批号{0} 已过期。" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3510 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 msgid "Batch {0} of Item {1} is disabled." msgstr "物料{1}批号{0}已禁用。" @@ -8172,8 +8176,8 @@ msgstr "发票号" #. Label of the bill_for_rejected_quantity_in_purchase_invoice (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Bill for Rejected Quantity in Purchase Invoice" -msgstr "采购发票含被退货数量" +msgid "Bill for rejected quantity in Purchase Invoice" +msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace @@ -8513,8 +8517,11 @@ msgstr "框架订单明细" msgid "Blanket Order Rate" msgstr "框架订单单价" +#. Label of the blanket_order_section (Section Break) field in DocType 'Buying +#. Settings' #. Label of the blanket_orders_section (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Blanket Orders" msgstr "" @@ -9029,7 +9036,7 @@ msgstr "采购与销售" msgid "Buying must be checked, if Applicable For is selected as {0}" msgstr "“适用于”为{0}时必须勾选“采购”" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:13 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:62 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a
Naming Series choose the 'Naming Series' option." msgstr "默认供应商名称按输入显示。若要通过编号规则命名供应商,请选择'编号规则'选项" @@ -9394,7 +9401,7 @@ msgstr "按凭证分类后不能根据凭证号过滤" msgid "Can only make payment against unbilled {0}" msgstr "只能为未开票{0}付款" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1517 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 #: erpnext/controllers/accounts_controller.py:3196 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" @@ -9450,9 +9457,9 @@ msgstr "无法更改库存科目设置" msgid "Cannot Create Return" msgstr "无法创建退货" -#: erpnext/stock/doctype/item/item.py:698 -#: erpnext/stock/doctype/item/item.py:711 -#: erpnext/stock/doctype/item/item.py:725 +#: erpnext/stock/doctype/item/item.py:699 +#: erpnext/stock/doctype/item/item.py:712 +#: erpnext/stock/doctype/item/item.py:726 msgid "Cannot Merge" msgstr "无法合并" @@ -9480,7 +9487,7 @@ msgstr "不允许修订 {0} {1},请创建新单据" msgid "Cannot apply TDS against multiple parties in one entry" msgstr "单笔凭证不能为多方应用源头减税" -#: erpnext/stock/doctype/item/item.py:378 +#: erpnext/stock/doctype/item/item.py:379 msgid "Cannot be a fixed asset item as Stock Ledger is created." msgstr "物料已有物料凭证后不能再将其设置为固定资产。" @@ -9516,7 +9523,7 @@ msgstr "无法取消本生产库存凭证,因产成品数量不得少于关联 msgid "Cannot cancel this document as it is linked with the submitted Asset Value Adjustment {0}. Please cancel the Asset Value Adjustment to continue." msgstr "" -#: erpnext/controllers/buying_controller.py:1109 +#: erpnext/controllers/buying_controller.py:1099 msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "该单据关联已提交资产{asset_link},需先取消资产" @@ -9524,7 +9531,7 @@ msgstr "该单据关联已提交资产{asset_link},需先取消资产" msgid "Cannot cancel transaction for Completed Work Order." msgstr "无法取消已完成工单的交易。" -#: erpnext/stock/doctype/item/item.py:956 +#: erpnext/stock/doctype/item/item.py:994 msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "已有物料移动交易后不能更改物料的属性。请创建一个新物料并将库存转移到新物料" @@ -9536,7 +9543,7 @@ msgstr "不可修改参考单据类型" msgid "Cannot change Service Stop Date for item in row {0}" msgstr "无法更改第{0}行中服务停止日期" -#: erpnext/stock/doctype/item/item.py:947 +#: erpnext/stock/doctype/item/item.py:985 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "存货业务发生后不能更改多规格物料的属性。需要创建新物料。" @@ -9564,11 +9571,11 @@ msgstr "科目类型字段清空后才能执行操作->转换为组" msgid "Cannot covert to Group because Account Type is selected." msgstr "科目类型字段须为空才能转换为组。" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1029 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1022 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "无法为未来日期的采购收据创建库存预留" -#: erpnext/selling/doctype/sales_order/sales_order.py:2029 +#: erpnext/selling/doctype/sales_order/sales_order.py:2023 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "为销售订单 {0} 创建了库存预留,请取消预留后再创建拣货单" @@ -9594,7 +9601,7 @@ msgstr "已报价,不能更改状态为未成交。" msgid "Cannot deduct when category is for 'Valuation' or 'Valuation and Total'" msgstr "分类是“估值”或“估值和总计”的时候不能扣税。" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1832 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1814 msgid "Cannot delete Exchange Gain/Loss row" msgstr "无法删除汇兑损益行" @@ -9631,7 +9638,7 @@ msgstr "" msgid "Cannot disassemble more than produced quantity." msgstr "拆解数量不得超过产出数量。" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:920 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" @@ -9639,8 +9646,8 @@ msgstr "" msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "无法启用按物料核算库存科目,因公司{0}已存在按仓库核算的库存分类账记录。请先取消库存交易再重试。" -#: erpnext/selling/doctype/sales_order/sales_order.py:789 -#: erpnext/selling/doctype/sales_order/sales_order.py:812 +#: erpnext/selling/doctype/sales_order/sales_order.py:783 +#: erpnext/selling/doctype/sales_order/sales_order.py:806 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "物料{0}同时存在启用和未启用序列号交付,无法确保" @@ -9684,7 +9691,7 @@ msgstr "存在负未清金额时不可从客户收货" msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1530 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 #: erpnext/controllers/accounts_controller.py:3211 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" @@ -9702,8 +9709,8 @@ msgstr "无法获取链接令牌,查看错误日志" msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1523 -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1701 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 #: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:112 @@ -9719,7 +9726,7 @@ msgstr "已有销售订单时不能更改其状态为未成交。" msgid "Cannot set authorization on basis of Discount for {0}" msgstr "不能为{0}设置折扣授权" -#: erpnext/stock/doctype/item/item.py:789 +#: erpnext/stock/doctype/item/item.py:790 msgid "Cannot set multiple Item Defaults for a company." msgstr "无法为公司设置多个物料默认值。" @@ -10630,7 +10637,7 @@ msgstr "期末(贷方)" msgid "Closing (Dr)" msgstr "期末(借方)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:397 +#: erpnext/accounts/report/general_ledger/general_ledger.py:405 msgid "Closing (Opening + Total)" msgstr "期末(期初+总计)" @@ -11091,7 +11098,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:157 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:161 #: 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 @@ -11373,7 +11380,7 @@ msgstr "公司" msgid "Company Abbreviation" msgstr "公司简称" -#: erpnext/public/js/utils/naming_series_dialog.js:101 +#: erpnext/public/js/utils/naming_series.js:101 msgid "Company Abbreviation (requires ERPNext to be installed)" msgstr "" @@ -11386,7 +11393,7 @@ msgstr "公司简称不能超过5个字符" msgid "Company Account" msgstr "总账科目" -#: erpnext/accounts/doctype/bank_account/bank_account.py:70 +#: erpnext/accounts/doctype/bank_account/bank_account.py:69 msgid "Company Account is mandatory" msgstr "" @@ -11562,7 +11569,7 @@ msgstr "" msgid "Company is mandatory" msgstr "公司为必填项" -#: erpnext/accounts/doctype/bank_account/bank_account.py:67 +#: erpnext/accounts/doctype/bank_account/bank_account.py:66 msgid "Company is mandatory for company account" msgstr "公司账户必须指定公司" @@ -11833,7 +11840,7 @@ msgstr "" msgid "Configure Accounts for Bank Entry" msgstr "" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:59 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:69 msgid "Configure Bank Accounts" msgstr "" @@ -11846,7 +11853,9 @@ msgstr "" msgid "Configure Product Assembly" msgstr "配置产品组装" +#. Label of the configure (Button) field in DocType 'Buying Settings' #. Label of the configure (Button) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Configure Series" msgstr "" @@ -11864,13 +11873,13 @@ msgstr "" msgid "Configure settings for the banking module" msgstr "" -#. Description of the 'Action If Same Rate is Not Maintained' (Select) field in +#. Description of the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained." msgstr "配置若交易中未使用相同价格时系统不允许交易保存还是只弹出警告" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:20 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:69 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." msgstr "设置新建采购交易时默认使用的价目表,物料价格将从此价目表获取" @@ -12048,7 +12057,7 @@ msgstr "" msgid "Consumed" msgstr "已耗用" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:62 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:62 msgid "Consumed Amount" msgstr "消耗量" @@ -12092,7 +12101,7 @@ msgstr "已消耗物料成本" #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.py:59 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:146 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:61 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:61 #: erpnext/subcontracting/doctype/subcontracting_inward_order_received_item/subcontracting_inward_order_received_item.json #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json @@ -12265,10 +12274,6 @@ msgstr "联系人不属于{0}" msgid "Contact:" msgstr "联系人:" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:55 -msgid "Contact: " -msgstr "联系人:" - #. Option for the 'Check' (Select) field in DocType 'Bank Transaction Rule #. Description Conditions' #: banking/src/components/features/BankReconciliation/Rules/RuleForm.tsx:200 @@ -12446,7 +12451,7 @@ msgstr "转换系数" msgid "Conversion Rate" msgstr "转换率" -#: erpnext/stock/doctype/item/item.py:461 +#: erpnext/stock/doctype/item/item.py:462 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}" msgstr "行{0}中默认单位的转换系数必须是1" @@ -12718,7 +12723,7 @@ msgstr "" #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:98 #: erpnext/accounts/report/general_ledger/general_ledger.js:154 -#: erpnext/accounts/report/general_ledger/general_ledger.py:783 +#: erpnext/accounts/report/general_ledger/general_ledger.py:800 #: erpnext/accounts/report/gross_profit/gross_profit.js:68 #: erpnext/accounts/report/gross_profit/gross_profit.py:395 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:305 @@ -12813,7 +12818,7 @@ msgid "Cost Center is required" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1437 -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:914 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:907 msgid "Cost Center is required in row {0} in Taxes table for type {1}" msgstr "类型{1}税费表的行{0}必须有成本中心" @@ -13151,7 +13156,7 @@ msgstr "" msgid "Create Grouped Asset" msgstr "创建组资产(多个数量一个资产号)" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:119 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 msgid "Create Inter Company Journal Entry" msgstr "创建关联公司交易日记账凭证" @@ -13524,7 +13529,7 @@ msgstr "是否创建{0}{1}?" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:250 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 msgid "Created {0} scorecards for {1} between:" msgstr "已为{1}创建{0}张计分卡,时间范围:" @@ -13667,15 +13672,15 @@ msgstr "创建 {0} 部分成功。\n" msgid "Credit" msgstr "贷方" -#: erpnext/accounts/report/general_ledger/general_ledger.py:727 +#: erpnext/accounts/report/general_ledger/general_ledger.py:744 msgid "Credit (Transaction)" msgstr "贷方(交易货币)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:702 +#: erpnext/accounts/report/general_ledger/general_ledger.py:719 msgid "Credit ({0})" msgstr "贷方({0})" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:637 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:641 msgid "Credit Account" msgstr "贷方科目" @@ -13870,7 +13875,7 @@ msgstr "应付账款周转率" msgid "Creditors" msgstr "应付账款" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:389 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:392 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:210 msgid "Credits" msgstr "" @@ -14168,7 +14173,7 @@ msgstr "当前序列号/批号" msgid "Current Serial No" msgstr "当前序列号" -#: erpnext/public/js/utils/naming_series_dialog.js:222 +#: erpnext/public/js/utils/naming_series.js:223 msgid "Current Series" msgstr "" @@ -14369,7 +14374,7 @@ msgstr "自定义分离符" #: erpnext/selling/doctype/sales_order/sales_order.js:1237 #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/selling/doctype/sales_order/sales_order_calendar.js:19 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:64 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:48 #: erpnext/selling/doctype/sms_center/sms_center.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:320 #: erpnext/selling/report/customer_credit_balance/customer_credit_balance.js:16 @@ -15142,7 +15147,7 @@ msgstr "" msgid "Day Of Week" msgstr "星期几" -#: erpnext/public/js/utils/naming_series_dialog.js:94 +#: erpnext/public/js/utils/naming_series.js:94 msgid "Day of month" msgstr "" @@ -15258,11 +15263,11 @@ msgstr "贸易商" msgid "Debit" msgstr "借方" -#: erpnext/accounts/report/general_ledger/general_ledger.py:720 +#: erpnext/accounts/report/general_ledger/general_ledger.py:737 msgid "Debit (Transaction)" msgstr "借方(交易货币)" -#: erpnext/accounts/report/general_ledger/general_ledger.py:695 +#: erpnext/accounts/report/general_ledger/general_ledger.py:712 msgid "Debit ({0})" msgstr "借方({0})" @@ -15272,7 +15277,7 @@ msgstr "借方({0})" msgid "Debit / Credit Note Posting Date" msgstr "借项/贷项凭证过账日期" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:627 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:631 msgid "Debit Account" msgstr "借方科目" @@ -15383,7 +15388,7 @@ msgstr "借贷不平" msgid "Debit/Credit" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:388 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:391 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:209 msgid "Debits" msgstr "" @@ -15525,7 +15530,7 @@ msgstr "" msgid "Default BOM" msgstr "默认物料清单" -#: erpnext/stock/doctype/item/item.py:504 +#: erpnext/stock/doctype/item/item.py:505 msgid "Default BOM ({0}) must be active for this item or its template" msgstr "该物料或其模板物料的默认物料清单状态必须是生效" @@ -15882,15 +15887,15 @@ msgstr "默认区域" msgid "Default Unit of Measure" msgstr "默认单位" -#: erpnext/stock/doctype/item/item.py:1351 +#: erpnext/stock/doctype/item/item.py:1389 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You need to either cancel the linked documents or create a new Item." msgstr "物料{0}的默认计量单位不可直接更改,因已存在其他计量单位的交易。需取消关联单据或创建新物料" -#: erpnext/stock/doctype/item/item.py:1334 +#: erpnext/stock/doctype/item/item.py:1372 msgid "Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM." msgstr "因为该物料已经有使用别的单位的交易记录存在了,不再允许直接修改其默认单位{0}了。如果需要请创建一个新物料,以使用不同的默认单位。" -#: erpnext/stock/doctype/item/item.py:982 +#: erpnext/stock/doctype/item/item.py:1020 msgid "Default Unit of Measure for Variant '{0}' must be same as in Template '{1}'" msgstr "多规格物料的默认单位“{0}”必须与模板物料默认单位一致“{1}”" @@ -16191,7 +16196,7 @@ msgstr "" msgid "Delivered" msgstr "已出货" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:64 msgid "Delivered Amount" msgstr "已出货金额" @@ -16241,8 +16246,8 @@ msgstr "待开票销售出库明细" #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:262 #: erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:63 #: erpnext/stock/report/reserved_stock/reserved_stock.py:131 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:63 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_secondary_item/subcontracting_inward_order_secondary_item.json msgid "Delivered Qty" @@ -16253,11 +16258,11 @@ msgstr "已出货数量" msgid "Delivered Qty (in Stock UOM)" msgstr "已交付数量(库存计量单位)" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:806 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:798 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16346,7 +16351,7 @@ msgstr "交付经理" #: erpnext/accounts/report/sales_register/sales_register.py:245 #: erpnext/selling/doctype/sales_order/sales_order.js:1086 #: erpnext/selling/doctype/sales_order/sales_order_list.js:81 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:68 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:52 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json @@ -16871,7 +16876,7 @@ msgstr "物料表中的差异科目" msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "因本库存凭证为期初凭证,差异科目必须为资产/负债类科目(临时期初)。" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:990 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:991 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" msgstr "因为此库存调账是开账凭证,差异科目必须是资产/负债类科目," @@ -17035,11 +17040,9 @@ msgstr "" msgid "Disable In Words" msgstr "不显示大写金额" -#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Disable Last Purchase Rate" -msgstr "不更新最新采购价" +#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +msgid "Disable Opening Balance Calculation" +msgstr "" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17080,6 +17083,12 @@ msgstr "禁用序列号与批号选择" msgid "Disable Transaction Threshold" msgstr "" +#. Label of the disable_last_purchase_rate (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Disable last purchase rate" +msgstr "" + #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' #: erpnext/accounts/doctype/financial_report_template/financial_report_template.json @@ -17136,7 +17145,7 @@ msgstr "工单拆解" msgid "Disassemble Order" msgstr "工单拆解" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2373 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "拆解数量不能小于或等于 0。" @@ -17661,6 +17670,12 @@ msgstr "不启用分批次计价" msgid "Do Not Use Batchwise Valuation" msgstr "" +#. Label of the do_not_fetch_incoming_rate_from_serial_no (Check) field in +#. DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "Do not fetch incoming rate from Serial No" +msgstr "" + #. Option for the 'Maps To' (Select) field in DocType 'Bank Statement Import #. Log Column Map' #: erpnext/accounts/doctype/bank_statement_import_log_column_map/bank_statement_import_log_column_map.json @@ -17751,9 +17766,12 @@ msgstr "单据搜索" msgid "Document Count" msgstr "" +#. Label of the document_naming_tab (Tab Break) field in DocType 'Buying +#. Settings' #. Label of the default_naming_tab (Tab Break) field in DocType 'Selling #. Settings' -#: erpnext/public/js/utils/naming_series_dialog.js:7 +#: erpnext/buying/doctype/buying_settings/buying_settings.json +#: erpnext/public/js/utils/naming_series.js:7 #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Document Naming" msgstr "" @@ -17771,6 +17789,10 @@ msgstr "文档类型 " msgid "Document Type already used as a dimension" msgstr "文档类型已作为维度使用" +#: erpnext/setup/install.py:198 +msgid "Documentation" +msgstr "用户操作手册" + #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -18075,7 +18097,7 @@ msgstr "带任务复制项目" msgid "Duplicate Sales Invoices found" msgstr "发现重复销售发票" -#: erpnext/stock/serial_batch_bundle.py:1477 +#: erpnext/stock/serial_batch_bundle.py:1483 msgid "Duplicate Serial Number Error" msgstr "" @@ -18195,8 +18217,8 @@ msgstr "ERPNext用户ID" msgid "ERPNext will make a stock ledger entry for each transaction of this item. Keep unchecked for non-stock or service items." msgstr "" -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the 'How often should sales data be updated in Company/Project?' #. (Select) field in DocType 'Selling Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -18419,7 +18441,7 @@ msgstr "邮件发送收据" msgid "Email Sent to Supplier {0}" msgstr "邮件已发送至供应商{0}" -#: erpnext/setup/doctype/employee/employee.py:433 +#: erpnext/setup/doctype/employee/employee.py:434 msgid "Email is required to create a user" msgstr "" @@ -18609,7 +18631,7 @@ msgstr "员工用户ID" msgid "Employee cannot report to himself." msgstr "员工不能是自己的上级主管。" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Employee is required" msgstr "" @@ -18617,7 +18639,7 @@ msgstr "" msgid "Employee is required while issuing Asset {0}" msgstr "发放资产{0}时必须指定员工" -#: erpnext/setup/doctype/employee/employee.py:430 +#: erpnext/setup/doctype/employee/employee.py:431 msgid "Employee {0} already has a linked user" msgstr "" @@ -18630,7 +18652,7 @@ msgstr "员工{0}不属于公司{1}" msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "员工{0}正在其他工作中心工作,请指派其他员工" -#: erpnext/setup/doctype/employee/employee.py:598 +#: erpnext/setup/doctype/employee/employee.py:599 msgid "Employee {0} not found" msgstr "" @@ -18673,7 +18695,7 @@ msgstr "启用预约排程" msgid "Enable Auto Email" msgstr "自动发送电子邮件" -#: erpnext/stock/doctype/item/item.py:1143 +#: erpnext/stock/doctype/item/item.py:1181 msgid "Enable Auto Re-Order" msgstr "启用自动重新排序" @@ -19274,7 +19296,7 @@ msgstr "错误:此资产已登记 {0} 个折旧期。\n" "\t\t\t\t\t`折旧开始`日期必须至少在 `可供使用`日期之后 {1} 个期。\n" "\t\t\t\t\t请相应地更正日期。" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:987 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:969 msgid "Error: {0} is mandatory field" msgstr "错误:{0}是必填字段" @@ -19320,7 +19342,7 @@ msgstr "工厂交货" msgid "Example URL" msgstr "示例URL" -#: erpnext/stock/doctype/item/item.py:1074 +#: erpnext/stock/doctype/item/item.py:1112 msgid "Example of a linked document: {0}" msgstr "关联文档示例:{0}" @@ -19349,7 +19371,7 @@ msgstr "示例:序列号{0}在{1}中预留" msgid "Exception Budget Approver Role" msgstr "例外预算审批人角色" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:927 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 msgid "Excess Disassembly" msgstr "" @@ -19708,7 +19730,7 @@ msgstr "残值" msgid "Expense" msgstr "费用" -#: erpnext/controllers/stock_controller.py:946 +#: erpnext/controllers/stock_controller.py:947 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "费用/差异科目({0})必须是一个“损益”类科目" @@ -19756,7 +19778,7 @@ msgstr "费用/差异科目({0})必须是一个“损益”类科目" msgid "Expense Account" msgstr "费用科目" -#: erpnext/controllers/stock_controller.py:926 +#: erpnext/controllers/stock_controller.py:927 msgid "Expense Account Missing" msgstr "缺失差异科目" @@ -20219,7 +20241,7 @@ msgstr "过滤条件总计零数量" msgid "Filter by Reference Date" msgstr "按参考日期过滤" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:348 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:351 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:163 msgid "Filter by amount" msgstr "" @@ -20549,7 +20571,7 @@ msgstr "成品仓" msgid "Finished Goods based Operating Cost" msgstr "启用计件成本" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1750 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "产成品{0}与工单{1}不匹配" @@ -20644,7 +20666,7 @@ msgstr "财政制度是强制性的,请在公司{0}设定财政制度" msgid "Fiscal Year" msgstr "财年" -#: erpnext/public/js/utils/naming_series_dialog.js:100 +#: erpnext/public/js/utils/naming_series.js:100 msgid "Fiscal Year (requires ERPNext to be installed)" msgstr "" @@ -20708,7 +20730,7 @@ msgstr "固定资产科目" msgid "Fixed Asset Defaults" msgstr "固定资产默认值" -#: erpnext/stock/doctype/item/item.py:372 +#: erpnext/stock/doctype/item/item.py:373 msgid "Fixed Asset Item must be a non-stock item." msgstr "固定资产物料必须是一个非库存物料。" @@ -20858,7 +20880,7 @@ msgstr "公司" msgid "For Item" msgstr "物料" -#: erpnext/controllers/stock_controller.py:1605 +#: erpnext/controllers/stock_controller.py:1606 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "基于 {2} {3} 物料 {0} 收货数量不能超过 {1}" @@ -20889,7 +20911,7 @@ msgstr "价格表" msgid "For Production" msgstr "生产" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 msgid "For Quantity (Manufactured Qty) is mandatory" msgstr "数量(制造数量)字段必填" @@ -20973,6 +20995,12 @@ msgstr "物料{0}仅创建/关联了{1}项资产至{2}, msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}" msgstr "物料{0}的税率必须为正数。允许负数需在{2}启用{1}" +#. Description of the 'Do not fetch incoming rate from Serial No' (Check) field +#. in DocType 'Stock Reposting Settings' +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json +msgid "For legacy serial nos, do not fetch incoming rate from serial no and calculate it based on the inward transaction" +msgstr "" + #: erpnext/manufacturing/doctype/bom/bom.py:369 msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" @@ -20994,7 +21022,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "对于预计和预测数量,系统将考量所选父仓库下的所有子仓库。" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1782 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "成品数量 {0} 不能大于剩余可入库数量 {1}" @@ -21003,7 +21031,7 @@ msgstr "成品数量 {0} 不能大于剩余可入库数量 {1}" msgid "For reference" msgstr "供参考" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1552 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1534 #: erpnext/public/js/controllers/accounts.js:204 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "对于{1}的第{0}行。要在物料单价中包括{2},也必须包括第{3}行" @@ -21027,7 +21055,7 @@ msgstr "对于'应用于其他'条件,字段{0}为必填项" 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:1065 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -21036,7 +21064,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 "为使新{0}生效,是否清除当前{1}?" -#: erpnext/controllers/stock_controller.py:447 +#: erpnext/controllers/stock_controller.py:448 msgid "For the {0}, no stock is available for the return in the warehouse {1}." msgstr "{0} : 仓库 {1} 中无可退货数量" @@ -21649,7 +21677,7 @@ msgstr "G - D" msgid "GENERAL LEDGER" msgstr "总分类账" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:117 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:127 #: banking/src/components/features/BankReconciliation/SelectedTransactionDetails.tsx:64 msgid "GL Account" msgstr "" @@ -21661,7 +21689,7 @@ msgstr "总账余额" #. Name of a DocType #: erpnext/accounts/doctype/gl_entry/gl_entry.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:673 +#: erpnext/accounts/report/general_ledger/general_ledger.py:690 msgid "GL Entry" msgstr "总账分录" @@ -22176,7 +22204,7 @@ msgstr "在途物料" msgid "Goods Transferred" msgstr "已调拨" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2300 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 msgid "Goods are already received against the outward entry {0}" msgstr "出库移动物料{0}已收货" @@ -22359,7 +22387,7 @@ msgstr "" msgid "Grant Commission" msgstr "付佣金" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:906 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:888 msgid "Greater Than Amount" msgstr "大于金额" @@ -23000,11 +23028,11 @@ msgstr "频率?" msgid "How many units of the final product this BOM makes." msgstr "" -#. Description of the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Label of the project_update_frequency (Select) field in DocType 'Buying +#. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "How often should Project be updated of Total Purchase Cost ?" -msgstr "更新项目总采购成本的频率" +msgid "How often should project be updated of Total Purchase Cost ?" +msgstr "" #. Label of the sales_update_frequency (Select) field in DocType 'Selling #. Settings' @@ -23159,7 +23187,7 @@ msgstr "若工序被拆分为子工序,可在此处添加" msgid "If blank, parent Warehouse Account or company default will be considered in transactions" msgstr "如果为空,则取父仓库或公司主数据里默认的存货科目" -#. Description of the 'Bill for Rejected Quantity in Purchase Invoice' (Check) +#. Description of the 'Bill for rejected quantity in Purchase Invoice' (Check) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If checked, Rejected Quantity will be included while making Purchase Invoice from Purchase Receipt." @@ -23344,7 +23372,7 @@ msgstr "如勾选则采购/销售订单中仅限选择物料主数据维护了 msgid "If enabled, the system will allow users to edit the raw materials and their quantities in the Work Order. The system will not reset the quantities as per the BOM, if the user has changed them." msgstr "" -#. Description of the 'Set Valuation Rate for Rejected Materials' (Check) field +#. Description of the 'Set valuation rate for rejected Materials' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "If enabled, the system will generate an accounting entry for materials rejected in the Purchase Receipt." @@ -23516,11 +23544,11 @@ msgstr "若需取消,请撤销对应付款凭证" msgid "If this item has variants, then it cannot be selected in sales orders etc." msgstr "勾选表示该物料不能用于实际业务,是仅用于生成多规格物料的模板" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:27 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:76 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master." msgstr "若配置为'是',ERPNext将阻止您先于采购订单创建采购发票或收货单。可在供应商主数据中勾选'允许无采购订单创建采购发票'覆盖此设置" -#: erpnext/buying/doctype/buying_settings/buying_settings.js:34 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:83 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master." msgstr "若配置为'是',ERPNext将阻止您先于采购收货单创建采购发票。可在供应商主数据中勾选'允许无采购收货单创建采购发票'覆盖此设置" @@ -23636,7 +23664,7 @@ msgstr "不包括无库存物料" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:218 +#: erpnext/accounts/report/general_ledger/general_ledger.js:224 msgid "Ignore Exchange Rate Revaluation and Gain / Loss Journals" msgstr "忽略汇率重估及损益日记账" @@ -23688,7 +23716,7 @@ msgstr "已启用忽略定价规则,无法应用优惠券" #. Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:120 -#: erpnext/accounts/report/general_ledger/general_ledger.js:223 +#: erpnext/accounts/report/general_ledger/general_ledger.js:229 msgid "Ignore System Generated Credit / Debit Notes" msgstr "隐藏系统生成的贷/借记单" @@ -23731,7 +23759,7 @@ msgstr "忽略工站时间重叠" msgid "Ignores legacy Is Opening field in GL Entry that allows adding opening balance post the system is in use while generating reports" msgstr "报表中不按是否开账凭证标志获取科目期初余额(为了提升性能)" -#: erpnext/stock/doctype/item/item.py:266 +#: erpnext/stock/doctype/item/item.py:267 msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" @@ -23745,6 +23773,7 @@ msgid "Implementation Partner" msgstr "实施服务商" #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:258 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:294 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:251 #: banking/src/pages/BankStatementImporterContainer.tsx:27 msgid "Import Bank Statement" @@ -24098,7 +24127,7 @@ msgstr "包含默认财务账簿资产" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:131 #: erpnext/accounts/report/consolidated_trial_balance/consolidated_trial_balance.js:85 #: erpnext/accounts/report/custom_financial_statement/custom_financial_statement.js:29 -#: erpnext/accounts/report/general_ledger/general_ledger.js:187 +#: erpnext/accounts/report/general_ledger/general_ledger.js:193 #: erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:46 #: erpnext/accounts/report/trial_balance/trial_balance.js:105 msgid "Include Default FB Entries" @@ -24352,7 +24381,7 @@ msgstr "交易记账后结余数量不正确" msgid "Incorrect Batch Consumed" msgstr "消耗批次错误" -#: erpnext/stock/doctype/item/item.py:600 +#: erpnext/stock/doctype/item/item.py:601 msgid "Incorrect Check in (group) Warehouse for Reorder" msgstr "再订购(组)仓库检查错误" @@ -24360,7 +24389,7 @@ msgstr "再订购(组)仓库检查错误" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1072 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 msgid "Incorrect Component Quantity" msgstr "组件数量错误" @@ -24570,14 +24599,14 @@ msgstr "已发起" msgid "Inspected By" msgstr "检验人" -#: erpnext/controllers/stock_controller.py:1499 +#: erpnext/controllers/stock_controller.py:1500 #: erpnext/manufacturing/doctype/job_card/job_card.py:833 msgid "Inspection Rejected" msgstr "质检不通过" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1469 -#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1470 +#: erpnext/controllers/stock_controller.py:1472 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "需要检验" @@ -24594,7 +24623,7 @@ msgstr "需出货检验" msgid "Inspection Required before Purchase" msgstr "需来料检验" -#: erpnext/controllers/stock_controller.py:1484 +#: erpnext/controllers/stock_controller.py:1485 #: erpnext/manufacturing/doctype/job_card/job_card.py:814 msgid "Inspection Submission" msgstr "质检单提交" @@ -24676,8 +24705,8 @@ msgstr "权限不足" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1044 -#: erpnext/stock/serial_batch_bundle.py:1220 erpnext/stock/stock_ledger.py:1747 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 #: erpnext/stock/stock_ledger.py:2225 msgid "Insufficient Stock" msgstr "库存不足" @@ -24897,7 +24926,7 @@ msgstr "关联方交易" msgid "Internal Work History" msgstr "内部工作经历" -#: erpnext/controllers/stock_controller.py:1566 +#: erpnext/controllers/stock_controller.py:1567 msgid "Internal transfers can only be done in company's default currency" msgstr "直接调拨币种必须是公司本币" @@ -24990,7 +25019,7 @@ msgstr "无效交付日期" msgid "Invalid Discount" msgstr "无效折扣" -#: erpnext/controllers/taxes_and_totals.py:857 +#: erpnext/controllers/taxes_and_totals.py:840 msgid "Invalid Discount Amount" msgstr "" @@ -25020,7 +25049,7 @@ msgstr "无效分组依据" msgid "Invalid Item" msgstr "无效物料" -#: erpnext/stock/doctype/item/item.py:1489 +#: erpnext/stock/doctype/item/item.py:1527 msgid "Invalid Item Defaults" msgstr "无效物料默认值" @@ -25106,12 +25135,12 @@ msgstr "无效的排程计划" msgid "Invalid Selling Price" msgstr "无效的销售单价" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1825 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 msgid "Invalid Serial and Batch Bundle" msgstr "无效的序列号和批次组合" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1106 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1128 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25148,7 +25177,7 @@ msgstr "" msgid "Invalid lost reason {0}, please create a new lost reason" msgstr "无效的流失原因{0},请创建新的流失原因" -#: erpnext/stock/doctype/item/item.py:476 +#: erpnext/stock/doctype/item/item.py:477 msgid "Invalid naming series (. missing) for {0}" msgstr "编号规则无效(缺少.)于{0}" @@ -25277,7 +25306,6 @@ msgstr "发票取消" #. Label of the invoice_date (Date) field in DocType 'Payment Reconciliation #. Invoice' #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:68 msgid "Invoice Date" msgstr "发票日期" @@ -25298,10 +25326,6 @@ msgstr "发票单据类型选择错误" msgid "Invoice Grand Total" msgstr "发票总计" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:64 -msgid "Invoice ID" -msgstr "发票编号" - #. Label of the invoice_limit (Int) field in DocType 'Payment Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Invoice Limit" @@ -25823,13 +25847,13 @@ msgstr "" #. Label of the po_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Order Required for Purchase Invoice & Receipt Creation?" -msgstr "必须有采购订单才能新建采购入库和采购发票?" +msgid "Is Purchase Order required for Purchase Invoice & Receipt creation?" +msgstr "" #. Label of the pr_required (Select) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Is Purchase Receipt Required for Purchase Invoice Creation?" -msgstr "必须有采购入库才能新建采购发票?" +msgid "Is Purchase Receipt required for Purchase Invoice creation?" +msgstr "" #. Label of the is_debit_note (Check) field in DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -26101,7 +26125,7 @@ msgstr "问题" msgid "Issuing Date" msgstr "发货日期" -#: erpnext/stock/doctype/item/item.py:657 +#: erpnext/stock/doctype/item/item.py:658 msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "合并后的物料库存数量更新可能需几个小时" @@ -26171,7 +26195,7 @@ msgstr "" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:33 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:202 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 #: erpnext/manufacturing/doctype/blanket_order/blanket_order.json #: erpnext/manufacturing/doctype/bom/bom.js:1085 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:109 @@ -26218,6 +26242,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:50 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:88 #: erpnext/stock/report/item_variant_details/item_variant_details.js:10 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:57 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:53 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:24 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:81 @@ -26233,7 +26258,6 @@ msgstr "" #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:51 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.js:28 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.js:8 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:57 #: erpnext/stock/report/total_stock_summary/total_stock_summary.py:21 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:40 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:97 @@ -26997,6 +27021,7 @@ msgstr "物料制造商" #: erpnext/stock/report/item_price_stock/item_price_stock.py:24 #: erpnext/stock/report/item_prices/item_prices.py:51 #: erpnext/stock/report/item_shortage_report/item_shortage_report.py:143 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:58 #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 @@ -27007,7 +27032,6 @@ msgstr "物料制造商" #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:111 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:31 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:32 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:58 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:98 #: erpnext/subcontracting/doctype/subcontracting_inward_order_item/subcontracting_inward_order_item.json #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -27267,11 +27291,11 @@ msgstr "物料多规格设置" msgid "Item Variant {0} already exists with same attributes" msgstr "相同规格/属性的多规格物料{0}已存在" -#: erpnext/stock/doctype/item/item.py:852 +#: erpnext/stock/doctype/item/item.py:853 msgid "Item Variants updated" msgstr "多规格物料已更新" -#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:86 +#: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.py:87 msgid "Item Warehouse based reposting has been enabled." msgstr "已启用按物料进行成本追溯调整" @@ -27310,6 +27334,15 @@ msgstr "网站上显示的物料详细规格" msgid "Item Weight Details" msgstr "物料重量" +#. Label of a Link in the Buying Workspace +#. Name of a report +#. Label of a Workspace Sidebar Item +#: erpnext/buying/workspace/buying/buying.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.json +#: erpnext/workspace_sidebar/buying.json +msgid "Item Wise Consumption" +msgstr "" + #. Name of a DocType #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json msgid "Item Wise Tax Detail" @@ -27339,7 +27372,7 @@ msgstr "物料税费信息" msgid "Item Wise Tax Details" msgstr "" -#: erpnext/controllers/taxes_and_totals.py:573 +#: erpnext/controllers/taxes_and_totals.py:556 msgid "Item Wise Tax Details do not match with Taxes and Charges at the following rows:" msgstr "" @@ -27359,11 +27392,11 @@ msgstr "物料与仓库" msgid "Item and Warranty Details" msgstr "物料和保修" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3483 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 msgid "Item for row {0} does not match Material Request" msgstr "行{0}的物料与物料请求不匹配" -#: erpnext/stock/doctype/item/item.py:869 +#: erpnext/stock/doctype/item/item.py:907 msgid "Item has variants." msgstr "物料有多种规格。" @@ -27393,7 +27426,7 @@ msgstr "工序" msgid "Item qty can not be updated as raw materials are already processed." msgstr "因原材料已处理,物料数量不可更新" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1243 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "因勾选了成本价为0,物料 {0} 的单价已设置为0" @@ -27412,10 +27445,14 @@ msgstr "物料成本价将基于到岸成本凭证金额重新计算" msgid "Item valuation reposting in progress. Report might show incorrect item valuation." msgstr "物料成本价追溯调整后台处理中,报表中显示的物料成本价可能不是最新的" -#: erpnext/stock/doctype/item/item.py:1026 +#: erpnext/stock/doctype/item/item.py:1064 msgid "Item variant {0} exists with same attributes" msgstr "有相同属性的多规格物料{0}已存在" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +msgid "Item with name {0} not found in the Purchase Order" +msgstr "" + #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:99 msgid "Item {0} added multiple times under the same parent item {1} at rows {2} and {3}" msgstr "" @@ -27429,7 +27466,7 @@ msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}." msgstr "物料{0}在总括订单{2}下不可订购超过{1}" #: erpnext/assets/doctype/asset/asset.py:344 -#: erpnext/stock/doctype/item/item.py:703 +#: erpnext/stock/doctype/item/item.py:704 msgid "Item {0} does not exist" msgstr "物料{0}不存在" @@ -27437,7 +27474,7 @@ msgstr "物料{0}不存在" msgid "Item {0} does not exist in the system or has expired" msgstr "物料{0}不存在于系统中或已过期" -#: erpnext/controllers/stock_controller.py:561 +#: erpnext/controllers/stock_controller.py:562 msgid "Item {0} does not exist." msgstr "物料{0}不存在" @@ -27453,15 +27490,15 @@ msgstr "物料{0}已被退回" msgid "Item {0} has been disabled" msgstr "物料{0}已禁用" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:790 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "物料{0}无序列号,只有序列化物料可按序列号交货" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:790 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" -#: erpnext/stock/doctype/item/item.py:1205 +#: erpnext/stock/doctype/item/item.py:1243 msgid "Item {0} has reached its end of life on {1}" msgstr "物料{0}已经到达寿命终止日期{1}" @@ -27473,19 +27510,23 @@ msgstr "{0}不是库存产品,已被忽略" msgid "Item {0} is already reserved/delivered against Sales Order {1}." msgstr "物料{0}已被销售订单{1}预留" -#: erpnext/stock/doctype/item/item.py:1225 +#: erpnext/stock/doctype/item/item.py:1263 msgid "Item {0} is cancelled" msgstr "物料{0}已取消" -#: erpnext/stock/doctype/item/item.py:1209 +#: erpnext/stock/doctype/item/item.py:1247 msgid "Item {0} is disabled" msgstr "物料{0}已禁用" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." +msgstr "" + #: erpnext/selling/doctype/installation_note/installation_note.py:79 msgid "Item {0} is not a serialized Item" msgstr "物料{0}未启用序列好管理" -#: erpnext/stock/doctype/item/item.py:1217 +#: erpnext/stock/doctype/item/item.py:1255 msgid "Item {0} is not a stock Item" msgstr "物料{0}不允许库存" @@ -27493,7 +27534,11 @@ msgstr "物料{0}不允许库存" msgid "Item {0} is not a subcontracted item" msgstr "物料{0}非外协物料" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2212 +#: erpnext/stock/doctype/item/item.py:870 +msgid "Item {0} is not a template item." +msgstr "" + +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 msgid "Item {0} is not active or end of life has been reached" msgstr "物料{0}处于失效或寿命终止状态" @@ -27509,7 +27554,7 @@ msgstr "物料{0}必须为非库存物料" msgid "Item {0} must be a non-stock item" msgstr "物料{0}必须是非允许库存物料" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1576 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "在{1} {2}的'供应的原材料'表中未找到物料{0}" @@ -27525,7 +27570,7 @@ msgstr "物料{0}的订单数量{1}不能小于最低订货量{2}(物料主数 msgid "Item {0}: {1} qty produced. " msgstr "物料{0}:已生产数量{1}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1461 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 msgid "Item {} does not exist." msgstr "物料{}不存在" @@ -27635,7 +27680,7 @@ msgstr "用于物料需求的物料号" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1239 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "因勾选了成本价为0,这些物料 {0} 的单价已设置为0" @@ -28268,7 +28313,7 @@ msgstr "最后扫描的仓库" msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}." msgstr "物料{0}在仓库{1}的最后库存交易发生于{2}" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:118 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:128 msgid "Last Synced Transaction" msgstr "" @@ -28547,7 +28592,7 @@ msgstr "图例" msgid "Length (cm)" msgstr "长(公分)" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:911 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:893 msgid "Less Than Amount" msgstr "小于金额" @@ -28688,7 +28733,7 @@ msgstr "发票" msgid "Linked Location" msgstr "链接位置" -#: erpnext/stock/doctype/item/item.py:1078 +#: erpnext/stock/doctype/item/item.py:1116 msgid "Linked with submitted documents" msgstr "与已提交单据关联" @@ -29083,11 +29128,6 @@ msgstr "保养资产" msgid "Maintain Same Rate Throughout Internal Transaction" msgstr "内部交易中保持相同汇率" -#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Maintain Same Rate Throughout the Purchase Cycle" -msgstr "在整个采购循环(流程)使用相同价格" - #. Label of the is_stock_item (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Maintain Stock" @@ -29099,6 +29139,11 @@ msgstr "允许库存" msgid "Maintain same rate throughout sales cycle" msgstr "" +#. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Maintain same rate throughout the purchase cycle" +msgstr "" + #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace #. Option for the 'Status' (Select) field in DocType 'Workstation' @@ -29295,7 +29340,7 @@ msgid "Major/Optional Subjects" msgstr "主修/选修科目" #. Label of the make (Data) field in DocType 'Vehicle' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:123 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 #: erpnext/manufacturing/doctype/job_card/job_card.js:550 #: erpnext/manufacturing/doctype/work_order/work_order.js:857 #: erpnext/manufacturing/doctype/work_order/work_order.js:891 @@ -29464,8 +29509,8 @@ msgstr "必填信息" #. Depreciation Schedule' #. Option for the 'Depreciation Method' (Select) field in DocType 'Asset #. Finance Book' -#. Option for the 'Update frequency of Project' (Select) field in DocType -#. 'Buying Settings' +#. Option for the 'How often should project be updated of Total Purchase Cost +#. ?' (Select) field in DocType 'Buying Settings' #. Option for the '% Complete Method' (Select) field in DocType 'Project' #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json @@ -29524,8 +29569,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:1320 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1336 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 #: 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 @@ -29674,7 +29719,7 @@ msgstr "生产日期" msgid "Manufacturing Manager" msgstr "生产经理" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2570 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 msgid "Manufacturing Quantity is mandatory" msgstr "请填写生产数量" @@ -29950,7 +29995,7 @@ msgstr "工单耗用" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1321 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "工单耗用" @@ -30021,6 +30066,7 @@ msgstr "其他入库" #. Service Item' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:45 #: erpnext/buying/doctype/purchase_order/purchase_order.js:492 #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:361 @@ -30127,11 +30173,11 @@ msgstr "物料需求中的计划物料" msgid "Material Request Type" msgstr "物料需求类型" -#: erpnext/selling/doctype/sales_order/sales_order.py:1164 +#: erpnext/selling/doctype/sales_order/sales_order.py:1158 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1975 +#: erpnext/selling/doctype/sales_order/sales_order.py:1969 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "因原材料可用数量足够,物料需求未创建,。" @@ -30246,7 +30292,7 @@ msgstr "工单发料" msgid "Material Transferred for Manufacturing" msgstr "发料数量(成品套数)" -#. Option for the 'Backflush Raw Materials of Subcontract Based On' (Select) +#. Option for the 'Backflush raw materials of subcontract based on' (Select) #. field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Material Transferred for Subcontract" @@ -30375,11 +30421,11 @@ msgstr "最大付款金额" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4089 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "可以为批号{1}和物料{2}保留最大样本数量{0}。" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4080 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "批号{1}和批号{3}中的物料{2}已保留最大样本数量{0}。" @@ -30823,11 +30869,11 @@ msgstr "" msgid "Miscellaneous Expenses" msgstr "杂项费用" -#: erpnext/controllers/buying_controller.py:679 +#: erpnext/controllers/buying_controller.py:669 msgid "Mismatch" msgstr "不匹配" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 msgid "Missing" msgstr "缺失" @@ -30865,7 +30911,7 @@ msgstr "缺少筛选条件" msgid "Missing Finance Book" msgstr "缺少财务账簿" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1760 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 msgid "Missing Finished Good" msgstr "无成品明细行" @@ -30873,11 +30919,11 @@ msgstr "无成品明细行" msgid "Missing Formula" msgstr "未维护公式" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1079 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 msgid "Missing Item" msgstr "缺少物料" -#: erpnext/setup/doctype/employee/employee.py:573 +#: erpnext/setup/doctype/employee/employee.py:574 msgid "Missing Parameter" msgstr "" @@ -30921,10 +30967,6 @@ msgstr "缺失值" msgid "Mixed Conditions" msgstr "混合条件" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:58 -msgid "Mobile: " -msgstr "手机:" - #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:216 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:248 #: erpnext/accounts/report/purchase_register/purchase_register.py:201 @@ -31193,7 +31235,7 @@ msgstr "" msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "多个财年的日期{0}存在。请设置公司财年" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1767 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "Multiple items cannot be marked as finished item" msgstr "只允许一个明细行勾选了是成品" @@ -31272,27 +31314,20 @@ msgstr "已命名地点" msgid "Naming Series Prefix" msgstr "单据编号模板前缀" -#. Label of the supplier_and_price_defaults_section (Tab Break) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Naming Series and Price Defaults" -msgstr "单据编号及价格默认值" - -#: erpnext/selling/doctype/selling_settings/selling_settings.js:38 -msgid "Naming Series for {0}" -msgstr "" - #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:95 msgid "Naming Series is mandatory" msgstr "命名规则为必填项" +#. Label of the naming_series_details (Small Text) field in DocType 'Buying +#. Settings' #. Label of the naming_series_details (Small Text) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Naming Series options" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:196 +#: erpnext/public/js/utils/naming_series.js:196 msgid "Naming Series updated" msgstr "" @@ -31340,16 +31375,16 @@ msgstr "需求分析" msgid "Negative Batch Report" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:627 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:628 msgid "Negative Quantity is not allowed" msgstr "不能是负数" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1608 -#: erpnext/stock/serial_batch_bundle.py:1543 +#: erpnext/stock/serial_batch_bundle.py:1549 msgid "Negative Stock Error" msgstr "负库存错误" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:632 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:633 msgid "Negative Valuation Rate is not allowed" msgstr "成本价不可以为负数" @@ -31963,7 +31998,7 @@ msgstr "未找到POS配置,请先创建新POS配置" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1597 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1657 #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1678 -#: erpnext/stock/doctype/item/item.py:1450 +#: erpnext/stock/doctype/item/item.py:1488 msgid "No Permission" msgstr "无此权限" @@ -31976,7 +32011,7 @@ msgstr "未创建采购订单" msgid "No Records for these settings." msgstr "无满足筛选条件的数据" -#: erpnext/public/js/utils/unreconcile.js:148 +#: erpnext/public/js/utils/unreconcile.js:147 msgid "No Selection" msgstr "无选择项" @@ -32021,7 +32056,7 @@ msgstr "未找到待核销收付款凭证" msgid "No Work Orders were created" msgstr "无待创建的生产工单" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:844 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:837 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:930 msgid "No accounting entries for the following warehouses" msgstr "没有以下仓库的日记账凭证" @@ -32034,7 +32069,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:802 +#: erpnext/selling/doctype/sales_order/sales_order.py:796 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "未找到物料{0}的有效物料清单,无法保证按序列号交货" @@ -32046,7 +32081,7 @@ msgstr "无额外字段可用" msgid "No available quantity to reserve for item {0} in warehouse {1}" msgstr "仓库{1}中物料{0}无可用数量可预留" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:53 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:63 msgid "No bank accounts found" msgstr "" @@ -32054,7 +32089,7 @@ msgstr "" msgid "No bank statements imported yet" msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:288 msgid "No bank transactions found" msgstr "" @@ -32148,7 +32183,7 @@ msgstr "左侧无更多子节点" msgid "No more children on Right" msgstr "右侧无更多子节点" -#: erpnext/selling/doctype/selling_settings/selling_settings.js:56 +#: erpnext/public/js/utils/naming_series.js:385 msgid "No naming series defined" msgstr "" @@ -32323,7 +32358,7 @@ msgstr "" msgid "No stock available for this batch." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:809 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:810 msgid "No stock ledger entries were created. Please set the quantity or valuation rate for the items properly and try again." msgstr "未生成库存分类账条目。请正确设置物料数量或计价率后重试。" @@ -32415,7 +32450,7 @@ msgstr "非零值" msgid "Non-phantom BOM cannot be created for non-stock item {0}." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:561 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:562 msgid "None of the items have any change in quantity or value." msgstr "物料数量或金额无任何变化。" @@ -32519,7 +32554,7 @@ msgstr "由于{0}超出限额,未获授权" msgid "Not authorized to edit frozen Account {0}" msgstr "无权修改冻结科目{0}" -#: erpnext/public/js/utils/naming_series_dialog.js:301 +#: erpnext/public/js/utils/naming_series.js:326 msgid "Not configured" msgstr "" @@ -32565,7 +32600,7 @@ msgstr "注意:未指定“现金或银行科目”,无法创建收付款凭 msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups." msgstr "注:此成本中心勾选了是组,不能用于会计凭证记账。" -#: erpnext/stock/doctype/item/item.py:694 +#: erpnext/stock/doctype/item/item.py:695 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}" msgstr "注:要合并物料,请为旧物料{0}创建单独的库存对账" @@ -33042,7 +33077,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "每个工单{1}仅能创建一个{0}条目" @@ -33194,7 +33229,7 @@ msgstr "" msgid "Open {0} in a new tab" msgstr "" -#: erpnext/accounts/report/general_ledger/general_ledger.py:395 +#: erpnext/accounts/report/general_ledger/general_ledger.py:403 #: erpnext/public/js/stock_analytics.js:97 msgid "Opening" msgstr "期初" @@ -33353,16 +33388,16 @@ msgstr "已创建期初销售发票" #. Label of the opening_stock (Float) field in DocType 'Item' #. Option for the 'Purpose' (Select) field in DocType 'Stock Reconciliation' -#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:351 +#: erpnext/stock/doctype/item/item.json erpnext/stock/doctype/item/item.py:352 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Opening Stock" msgstr "期初库存" -#: erpnext/stock/doctype/item/item.py:356 +#: erpnext/stock/doctype/item/item.py:357 msgid "Opening Stock entry created with zero valuation rate: {0}" msgstr "" -#: erpnext/stock/doctype/item/item.py:364 +#: erpnext/stock/doctype/item/item.py:365 msgid "Opening Stock entry created: {0}" msgstr "" @@ -33719,7 +33754,7 @@ msgstr "可选。此设置将被应用于各种交易进行过滤。" msgid "Optional. Used with Financial Report Template" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:83 +#: erpnext/public/js/utils/naming_series.js:83 msgid "Optionally, set the number of digits in the series using dot (.) followed by hashes (#). For example, '.####' means that the series will have four digits. Default is five digits." msgstr "" @@ -33853,7 +33888,7 @@ msgstr "采购数量" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1011 +#: erpnext/selling/doctype/sales_order/sales_order.py:1005 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "订单" @@ -34061,7 +34096,7 @@ msgstr "未清金额(公司货币)" #: erpnext/accounts/doctype/cashier_closing/cashier_closing.json #: erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:903 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:885 #: erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.js:300 @@ -34119,7 +34154,7 @@ msgstr "" msgid "Over Billing Allowance (%)" msgstr "超额开票比率(%)" -#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1356 +#: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:1349 msgid "Over Billing Allowance exceeded for Purchase Receipt Item {0} ({1}) by {2}%" msgstr "采购收据物料{0}({1})超账单容差达{2}%。" @@ -34137,7 +34172,7 @@ msgstr "超量出/入库比率(%)" msgid "Over Picking Allowance" msgstr "允许超量拣货(%)" -#: erpnext/controllers/stock_controller.py:1736 +#: erpnext/controllers/stock_controller.py:1737 msgid "Over Receipt" msgstr "超收" @@ -34380,7 +34415,6 @@ msgstr "POS机字段" #: erpnext/accounts/doctype/pos_settings/pos_settings.json #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/pos_register/pos_register.py:174 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:70 #: erpnext/workspace_sidebar/selling.json msgid "POS Invoice" msgstr "POS发票" @@ -34651,7 +34685,7 @@ msgstr "套件明细" msgid "Packed Items" msgstr "套件明细" -#: erpnext/controllers/stock_controller.py:1570 +#: erpnext/controllers/stock_controller.py:1571 msgid "Packed Items cannot be transferred internally" msgstr "套件中的下层物料不可直接调拨" @@ -35099,7 +35133,7 @@ msgstr "部分已收货" #. Option for the 'Status' (Select) field in DocType 'Process Payment #. Reconciliation Log' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:133 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:412 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:415 #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json msgid "Partially Reconciled" @@ -35235,7 +35269,7 @@ msgstr "百万分率" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:240 #: erpnext/accounts/report/general_ledger/general_ledger.js:74 -#: erpnext/accounts/report/general_ledger/general_ledger.py:759 +#: erpnext/accounts/report/general_ledger/general_ledger.py:776 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:51 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:161 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:46 @@ -35361,7 +35395,7 @@ msgstr "交易方不匹配" #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json #: erpnext/accounts/report/general_ledger/general_ledger.js:111 -#: erpnext/accounts/report/general_ledger/general_ledger.py:768 +#: erpnext/accounts/report/general_ledger/general_ledger.py:785 #: erpnext/crm/doctype/contract/contract.json #: erpnext/selling/doctype/party_specific_item/party_specific_item.json #: erpnext/selling/report/address_and_contacts/address_and_contacts.js:22 @@ -35447,7 +35481,7 @@ msgstr "客户/供应商可交易物料" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:231 #: erpnext/accounts/report/general_ledger/general_ledger.js:65 -#: erpnext/accounts/report/general_ledger/general_ledger.py:758 +#: erpnext/accounts/report/general_ledger/general_ledger.py:775 #: erpnext/accounts/report/payment_ledger/payment_ledger.js:41 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:157 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:35 @@ -35750,7 +35784,6 @@ msgstr "收付款凭证{0}已被取消关联" #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:32 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:8 #: erpnext/accounts/workspace/invoicing/invoicing.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:69 #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/payments.json msgid "Payment Entry" @@ -36008,7 +36041,7 @@ msgstr "付款参考" #. Name of a DocType #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1726 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1708 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/payment_order/payment_order.js:19 #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -36087,10 +36120,6 @@ msgstr "" msgid "Payment Schedules" msgstr "" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:123 -msgid "Payment Status" -msgstr "付款状态" - #. Label of the payment_term (Link) field in DocType 'Overdue Payment' #. Label of the payment_term (Link) field in DocType 'Payment Entry Reference' #. Label of the payment_term (Link) field in DocType 'Payment Reference' @@ -37110,7 +37139,7 @@ msgstr "请设置优先级" msgid "Please Set Supplier Group in Buying Settings." msgstr "请设置供应商组采购设置。" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1897 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1879 msgid "Please Specify Account" msgstr "请指定账户" @@ -37142,11 +37171,11 @@ msgstr "请在会计科目表中添加一个临时开账科目" msgid "Please add an account for the Bank Entry rule." msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:170 +#: erpnext/public/js/utils/naming_series.js:170 msgid "Please add at least one naming series." msgstr "" -#: erpnext/public/js/utils/serial_no_batch_selector.js:661 +#: erpnext/public/js/utils/serial_no_batch_selector.js:663 msgid "Please add atleast one Serial No / Batch No" msgstr "请至少添加一个序列号/批次号" @@ -37166,7 +37195,7 @@ msgstr "请将账户添加至根级公司-{}" msgid "Please add {1} role to user {0}." msgstr "请为用户{0}添加{1}角色" -#: erpnext/controllers/stock_controller.py:1747 +#: erpnext/controllers/stock_controller.py:1748 msgid "Please adjust the qty or edit {0} to proceed." msgstr "请调整数量或修改 {0} 后继续" @@ -37273,7 +37302,7 @@ msgstr "请自关联方内部销售或出货单创建采购订单" msgid "Please create purchase receipt or purchase invoice for the item {0}" msgstr "请为物料{0}创建采购入库或采购发票" -#: erpnext/stock/doctype/item/item.py:722 +#: erpnext/stock/doctype/item/item.py:723 msgid "Please delete Product Bundle {0}, before merging {1} into {2}" msgstr "在合并{1}到{2}前,请先删除产品套装{0}" @@ -37342,11 +37371,11 @@ msgstr "请输入零钱科目" msgid "Please enter Approving Role or Approving User" msgstr "请输入角色核准或审批用户" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:682 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:683 msgid "Please enter Batch No" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:975 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:976 msgid "Please enter Cost Center" msgstr "请输入成本中心" @@ -37358,7 +37387,7 @@ msgstr "请输入出货日期" msgid "Please enter Employee Id of this sales person" msgstr "请输入业务员员工号" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:984 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:985 msgid "Please enter Expense Account" msgstr "请输入您的费用科目" @@ -37403,7 +37432,7 @@ msgstr "参考日期请输入" msgid "Please enter Root Type for account- {0}" msgstr "请输入账户-{0}的根类型" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:684 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:685 msgid "Please enter Serial No" msgstr "" @@ -37480,7 +37509,7 @@ msgstr "请输入首次交货日期" msgid "Please enter the phone number first" msgstr "请先输入电话号码" -#: erpnext/controllers/buying_controller.py:1157 +#: erpnext/controllers/buying_controller.py:1147 msgid "Please enter the {schedule_date}." msgstr "请输入{schedule_date}" @@ -37594,12 +37623,12 @@ msgstr "" msgid "Please select Template Type to download template" msgstr "请选择模板类型以下载模板" -#: erpnext/controllers/taxes_and_totals.py:863 +#: erpnext/controllers/taxes_and_totals.py:846 #: erpnext/public/js/controllers/taxes_and_totals.js:813 msgid "Please select Apply Discount On" msgstr "请选择适用的折扣" -#: erpnext/selling/doctype/sales_order/sales_order.py:1890 +#: erpnext/selling/doctype/sales_order/sales_order.py:1884 msgid "Please select BOM against item {0}" msgstr "请选择物料{0}的物料清单" @@ -37615,13 +37644,13 @@ msgstr "请选择银行账户" msgid "Please select Category first" msgstr "请先选择类型。" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1508 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1490 #: erpnext/public/js/controllers/accounts.js:94 #: erpnext/public/js/controllers/accounts.js:145 msgid "Please select Charge Type first" msgstr "请先选择费用类型" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:490 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:494 msgid "Please select Company" msgstr "请选择公司" @@ -37630,7 +37659,7 @@ msgstr "请选择公司" msgid "Please select Company and Posting Date to getting entries" msgstr "请选择公司和记账日期以获取凭证" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:738 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:742 #: erpnext/manufacturing/doctype/plant_floor/plant_floor.js:28 msgid "Please select Company first" msgstr "请先选择公司" @@ -37679,7 +37708,7 @@ msgstr "请选择定期分录入账差异科目" msgid "Please select Posting Date before selecting Party" msgstr "在选择往来单位之前请先选择记账日期" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:739 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:743 msgid "Please select Posting Date first" msgstr "请先选择记账日期" @@ -37687,11 +37716,11 @@ msgstr "请先选择记账日期" msgid "Please select Price List" msgstr "请选择价格表" -#: erpnext/selling/doctype/sales_order/sales_order.py:1892 +#: erpnext/selling/doctype/sales_order/sales_order.py:1886 msgid "Please select Qty against item {0}" msgstr "请选择为物料{0}指定数量" -#: erpnext/stock/doctype/item/item.py:388 +#: erpnext/stock/doctype/item/item.py:389 msgid "Please select Sample Retention Warehouse in Stock Settings first" msgstr "请先在库存设置中选择样品仓" @@ -37744,7 +37773,7 @@ msgstr "请选择委外采购订单" msgid "Please select a Supplier" msgstr "请选择供应商" -#: erpnext/public/js/utils/serial_no_batch_selector.js:665 +#: erpnext/public/js/utils/serial_no_batch_selector.js:667 msgid "Please select a Warehouse" msgstr "请选择仓库" @@ -37805,7 +37834,7 @@ msgstr "请选择行以创建重新过账分录" msgid "Please select a supplier for fetching payments." msgstr "请选择一个供应商以获取付款台账信息" -#: erpnext/public/js/utils/naming_series_dialog.js:165 +#: erpnext/public/js/utils/naming_series.js:165 msgid "Please select a transaction." msgstr "" @@ -37825,7 +37854,7 @@ msgstr "请先设置物料编码再设置仓库" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "请至少选择一个筛选条件:物料编码、批次或序列号" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:782 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37932,7 +37961,7 @@ msgstr "请选择有效单据类型" msgid "Please select weekly off day" msgstr "请选择每周休息日" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1208 #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:618 msgid "Please select {0} first" msgstr "请先选择{0}" @@ -38072,7 +38101,7 @@ msgstr "" msgid "Please set an Address on the Company '%s'" msgstr "请在公司'%s'上设置地址" -#: erpnext/controllers/stock_controller.py:921 +#: erpnext/controllers/stock_controller.py:922 msgid "Please set an Expense Account in the Items table" msgstr "请在物料表中设置费用账户" @@ -38116,7 +38145,7 @@ msgstr "请在公司{0}设置默认费用账户" msgid "Please set default UOM in Stock Settings" msgstr "请在库存设置中设置默认单位" -#: erpnext/controllers/stock_controller.py:780 +#: erpnext/controllers/stock_controller.py:781 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer" msgstr "请在公司 {0} 主数据中维护用于库存直接调拨圆整差异记账的默认销货成本科目," @@ -38235,7 +38264,7 @@ msgstr "请先指定{0}" msgid "Please specify at least one attribute in the Attributes table" msgstr "请指定属性表中的至少一个属性" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:622 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:623 msgid "Please specify either Quantity or Valuation Rate or both" msgstr "请输入数量或(和)成本价" @@ -38406,7 +38435,7 @@ msgstr "过账日期" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json #: erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:890 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:872 #: erpnext/accounts/doctype/payment_entry/payment_entry.json #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json #: erpnext/accounts/doctype/payment_order/payment_order.json @@ -38431,7 +38460,7 @@ msgstr "过账日期" #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py:65 #: 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:680 +#: erpnext/accounts/report/general_ledger/general_ledger.py:697 #: erpnext/accounts/report/gross_profit/gross_profit.py:300 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:181 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:200 @@ -38546,7 +38575,7 @@ msgstr "记账日期时间" msgid "Posting Time" msgstr "记账时间" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2520 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 msgid "Posting date and posting time is mandatory" msgstr "记账日期和记账时间必填" @@ -38725,6 +38754,12 @@ msgstr "预防性维护(保养)" msgid "Prevents the automatic reservation of stock quantities from sales orders when processing sales returns." msgstr "" +#. Description of the 'Disable last purchase rate' (Check) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Prevents the system from automatically using the rate from the last purchase transaction when creating new purchase orders or transactions." +msgstr "" + #. Label of the preview (Button) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:267 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -39018,7 +39053,9 @@ msgstr "价格或产品折扣表是必需的" msgid "Price per Unit (Stock UOM)" msgstr "单价(库存单位)" +#. Label of the pricing_tab (Tab Break) field in DocType 'Buying Settings' #. Label of the item_price_tab (Tab Break) field in DocType 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/supplier/supplier_dashboard.py:13 #: erpnext/selling/doctype/customer/customer_dashboard.py:27 #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -40373,6 +40410,7 @@ msgstr "物料{0}的采购费用" #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:53 #: erpnext/assets/doctype/asset/asset.json #: erpnext/assets/doctype/asset_repair_purchase_invoice/asset_repair_purchase_invoice.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:48 #: erpnext/buying/doctype/purchase_order/purchase_order.js:381 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:63 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js:21 @@ -40409,6 +40447,12 @@ msgstr "采购发票预付款" msgid "Purchase Invoice Item" msgstr "采购发票明细" +#. Label of the purchase_invoice_settings_section (Section Break) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Purchase Invoice Settings" +msgstr "" + #. Name of a report #. Label of a Link in the Financial Reports Workspace #. Label of a Link in the Buying Workspace @@ -40460,6 +40504,7 @@ msgstr "采购发票" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:237 #: erpnext/accounts/report/purchase_register/purchase_register.py:216 +#: erpnext/buying/doctype/buying_settings/buying_settings.js:47 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:39 @@ -40469,7 +40514,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:892 +#: erpnext/controllers/buying_controller.py:882 #: 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 @@ -40586,7 +40631,7 @@ msgstr "采购订单{0}已创建" msgid "Purchase Order {0} is not submitted" msgstr "采购订单{0}未提交" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:864 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 msgid "Purchase Orders" msgstr "采购订单" @@ -40649,6 +40694,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/buying_settings/buying_settings.js:49 #: erpnext/buying/doctype/purchase_order/purchase_order.js:360 #: erpnext/buying/doctype/purchase_order/purchase_order_list.js:69 #: erpnext/setup/doctype/authorization_rule/authorization_rule.json @@ -40663,7 +40709,7 @@ msgstr "采购价格表" msgid "Purchase Receipt" msgstr "采购入库" -#. Description of the 'Auto Create Purchase Receipt' (Check) field in DocType +#. Description of the 'Auto create Purchase Receipt' (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." @@ -40929,7 +40975,6 @@ msgstr "" #. DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:91 #: erpnext/accounts/report/gross_profit/gross_profit.py:345 #: erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:240 @@ -41517,7 +41562,7 @@ msgstr "质量审核" msgid "Quality Review Objective" msgstr "质量审核目标" -#: erpnext/buying/doctype/purchase_order/purchase_order.js:830 +#: erpnext/buying/doctype/purchase_order/purchase_order.js:796 msgid "Quantities updated successfully." msgstr "" @@ -41578,7 +41623,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/public/js/controllers/buying.js:618 #: erpnext/public/js/stock_analytics.js:50 -#: erpnext/public/js/utils/serial_no_batch_selector.js:498 +#: erpnext/public/js/utils/serial_no_batch_selector.js:500 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/selling/page/point_of_sale/pos_item_cart.js:51 @@ -41772,7 +41817,7 @@ msgstr "查询路径字符串" msgid "Queue Size should be between 5 and 100" msgstr "队列大小应介于5至100之间" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:621 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:625 msgid "Quick Journal Entry" msgstr "快速简化日记账凭证" @@ -41827,7 +41872,7 @@ msgstr "报价/线索%" #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.js:1229 #: erpnext/selling/doctype/sales_order_item/sales_order_item.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:65 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:49 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/workspace_sidebar/selling.json @@ -41990,7 +42035,6 @@ msgstr "提单人(电子邮件)" #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/doctype/share_balance/share_balance.json #: erpnext/accounts/doctype/share_transfer/share_transfer.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:92 #: erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:78 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:266 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:320 @@ -42400,8 +42444,8 @@ msgstr "发往客户的原材料" msgid "Raw SQL" msgstr "原始SQL" -#. Description of the 'Validate Consumed Qty (as per BOM)' (Check) field in -#. DocType 'Buying Settings' +#. Description of the 'Validate consumed quantity (as per BOM)' (Check) field +#. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Raw materials consumed qty will be validated based on FG BOM required qty" msgstr "" @@ -42809,11 +42853,10 @@ msgstr "核销银行交易流水" #. Label of the reconciled (Check) field in DocType 'Process Payment #. Reconciliation Log Allocations' #: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:140 -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:410 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:413 #: banking/src/components/features/BankReconciliation/utils.ts:259 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:10 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:16 #: erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json #: erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json msgid "Reconciled" @@ -43337,7 +43380,7 @@ msgstr "被拒的序列号与批号" msgid "Rejected Warehouse" msgstr "拒收仓" -#: erpnext/public/js/utils/serial_no_batch_selector.js:669 +#: erpnext/public/js/utils/serial_no_batch_selector.js:671 msgid "Rejected Warehouse and Accepted Warehouse cannot be same." msgstr "拒收仓库与验收仓库不能相同" @@ -43387,7 +43430,7 @@ msgid "Remaining Balance" msgstr "余额" #. Label of the remark (Small Text) field in DocType 'Journal Entry' -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:651 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:655 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/selling/page/point_of_sale/pos_payment.js:489 msgid "Remark" @@ -43441,7 +43484,7 @@ msgstr "备注" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 -#: erpnext/accounts/report/general_ledger/general_ledger.py:801 +#: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 #: erpnext/accounts/report/purchase_register/purchase_register.py:296 #: erpnext/accounts/report/sales_register/sales_register.py:335 @@ -43480,7 +43523,7 @@ msgstr "" msgid "Remove item if charges is not applicable to that item" msgstr "如果费用不适用某物料,请删除它" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:568 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:569 msgid "Removed items with no change in quantity or value." msgstr "已移除数量或金额没有任何变化的物料行" @@ -43885,6 +43928,7 @@ msgstr "索取资料" #. Quotation Item' #. Label of a Link in the Buying Workspace #. Label of a Workspace Sidebar Item +#: erpnext/buying/doctype/buying_settings/buying_settings.js:46 #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 @@ -44158,7 +44202,7 @@ msgstr "子装配件预留" msgid "Reserved" msgstr "预留" -#: erpnext/controllers/stock_controller.py:1328 +#: erpnext/controllers/stock_controller.py:1329 msgid "Reserved Batch Conflict" msgstr "" @@ -44771,7 +44815,7 @@ msgstr "" msgid "Reversal Of" msgstr "被冲销凭证" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:96 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:100 msgid "Reverse Journal Entry" msgstr "冲销日记账凭证" @@ -44920,10 +44964,7 @@ msgstr "允许超量出/入库的角色" #. Label of the role_to_override_stop_action (Link) field in DocType 'Accounts #. Settings' -#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying -#. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -#: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Role Allowed to Override Stop Action" msgstr "可忽略预算设置的停止控制的角色" @@ -44938,8 +44979,11 @@ msgstr "不受信用额度限制的角色" msgid "Role allowed to bypass period restrictions." msgstr "" +#. Label of the role_to_override_stop_action (Link) field in DocType 'Buying +#. Settings' #. Label of the role_to_override_stop_action (Link) field in DocType 'Selling #. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Role allowed to override stop action" msgstr "" @@ -45140,8 +45184,8 @@ msgstr "小数精度尾差限额" msgid "Rounding Loss Allowance should be between 0 and 1" msgstr "四舍五入损失允许值应在0到1之间" -#: erpnext/controllers/stock_controller.py:792 -#: erpnext/controllers/stock_controller.py:807 +#: erpnext/controllers/stock_controller.py:793 +#: erpnext/controllers/stock_controller.py:808 msgid "Rounding gain/loss Entry for Stock Transfer" msgstr "库存调拨圆整差异分录" @@ -45168,11 +45212,11 @@ msgstr "工艺路线名称" msgid "Row # {0}: Cannot return more than {1} for Item {2}" msgstr "行#{0}:无法退回超过{1}的物料{2}" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:190 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:191 msgid "Row # {0}: Please add Serial and Batch Bundle for Item {1}" msgstr "行号{0}:请为物料{1}添加序列号和批次包" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:209 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:210 msgid "Row # {0}: Please enter quantity for Item {1} as it is not zero." msgstr "第{0}行:物料{1}数量非零,请正确输入。" @@ -45198,7 +45242,7 @@ msgstr "行#{0}(付款表):金额必须为负数" msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "行#{0}(付款表):金额必须为正值" -#: erpnext/stock/doctype/item/item.py:581 +#: erpnext/stock/doctype/item/item.py:582 msgid "Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}." msgstr "行号{0}:仓库{1}已存在类型为{2}的再订货条目" @@ -45399,7 +45443,7 @@ msgstr "行#{0}:有重复参考凭证{1} {2}" msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date" msgstr "行#{0}:预计交货日不能早于采购订单日" -#: erpnext/controllers/stock_controller.py:923 +#: erpnext/controllers/stock_controller.py:924 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}" msgstr "第 {0} 行:物料 {1}. {2} 差异科目必填" @@ -45459,7 +45503,7 @@ msgstr "第{0}行:必须填写起止时间。" msgid "Row #{0}: Item added" msgstr "行#{0}:已添加" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1630 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45487,7 +45531,7 @@ msgstr "" msgid "Row #{0}: Item {1} is not a Customer Provided Item." msgstr "第{0}行:物料{1}不是客户提供物料。" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:765 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:766 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it." msgstr "第{0}行: 物料未启用序列号/批号,不能为其设置序列号/批号" @@ -45540,7 +45584,7 @@ msgstr "第 {0} 行:物料 {2} 可预留库存数量仅有 {1}" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "第{0}行:期初累计折旧不得超过{1}。" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:956 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." msgstr "第{0}行生产工单{3}成品数量{2}工序{1}未完成。请在生产任务单{4}上更新工序状态。" @@ -45565,7 +45609,7 @@ msgstr "第{0}行:请选择将使用此客户提供物料的产成品物料。 msgid "Row #{0}: Please select the Sub Assembly Warehouse" msgstr "行号#{0}:请选择子装配仓库" -#: erpnext/stock/doctype/item/item.py:588 +#: erpnext/stock/doctype/item/item.py:589 msgid "Row #{0}: Please set reorder quantity" msgstr "行#{0}:请设置重订货点数量" @@ -45591,15 +45635,15 @@ msgstr "行号#{0}:数量必须为正数" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "第 {0} 行:物料 {2} 批号 {3} 在仓库 {4} 中预留数量须 <= 可预留数量(实际数量 - 已预留数量) {1}" -#: erpnext/controllers/stock_controller.py:1465 +#: erpnext/controllers/stock_controller.py:1466 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "行号#{0}:物料{1}需进行质量检验" -#: erpnext/controllers/stock_controller.py:1480 +#: erpnext/controllers/stock_controller.py:1481 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "行号#{0}:物料{2}的质量检验{1}未提交" -#: erpnext/controllers/stock_controller.py:1495 +#: erpnext/controllers/stock_controller.py:1496 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "行号#{0}:物料{2}的质量检验{1}被拒收" @@ -45630,11 +45674,11 @@ msgstr "第 {0} 行:物料 {1} 预留数量须大于 0" msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" msgstr "行#{0}:单价必须与{1}:{2}({3} / {4})相同" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1258 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1240 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry" msgstr "行#{0}:源单据类型必须是采购订单、采购发票或日记账凭证" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1244 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1226 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning" msgstr "行号#{0}:参考单据类型必须为销售订单、销售发票、日记账或催款单" @@ -45677,7 +45721,7 @@ msgstr "" msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "第{0}行:工序{3}的序列ID必须为{1}或{2}。" -#: erpnext/controllers/stock_controller.py:307 +#: erpnext/controllers/stock_controller.py:308 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}" msgstr "第{0}行: 序列号 {1} 不属于批号 {2}" @@ -45725,11 +45769,11 @@ msgstr "第{0}行:物料{2}的源仓库{1}不能是客户仓库。" msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "第{0}行:物料{2}的源仓库{1}必须与工作订单中的源仓库{3}相同。" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1103 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1125 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45782,11 +45826,11 @@ msgstr "第{0}行:物料{3}的库存数量{1}({2})不得超过{4}" msgid "Row #{0}: Target Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "第{0}行:目标仓库必须与关联外包收货订单中的客户仓库{1}相同" -#: erpnext/controllers/stock_controller.py:320 +#: erpnext/controllers/stock_controller.py:321 msgid "Row #{0}: The batch {1} has already expired." msgstr "第{0}行:批号 {1} 已过期" -#: erpnext/stock/doctype/item/item.py:597 +#: erpnext/stock/doctype/item/item.py:598 msgid "Row #{0}: The warehouse {1} is not a child warehouse of a group warehouse {2}" msgstr "行号#{0}:仓库{1}不是组仓库{2}的子仓库" @@ -45814,7 +45858,7 @@ msgstr "" msgid "Row #{0}: Work Order exists against full or partial quantity of Item {1}" msgstr "第{0}行:存在针对物料{1}全部或部分数量的工作订单" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:103 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:104 msgid "Row #{0}: You cannot use the inventory dimension '{1}' in Stock Reconciliation to modify the quantity or valuation rate. Stock reconciliation with inventory dimensions is intended solely for performing opening entries." msgstr "行号#{0}:库存对账中不可使用库存维度'{1}'修改数量或估价率,带维度的库存对账仅用于期初录入" @@ -45850,23 +45894,23 @@ msgstr "请为第 {1} 行的物料{0}输入仓库信息" msgid "Row #{idx}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor." msgstr "行号#{idx}:外协供料时不可选择供应商仓库" -#: erpnext/controllers/buying_controller.py:583 +#: erpnext/controllers/buying_controller.py:573 msgid "Row #{idx}: Item rate has been updated as per valuation rate since its an internal stock transfer." msgstr "行号#{idx}:内部调拨时物料单价已按估价率更新" -#: erpnext/controllers/buying_controller.py:1032 +#: erpnext/controllers/buying_controller.py:1022 msgid "Row #{idx}: Please enter a location for the asset item {item_code}." msgstr "行号#{idx}:请为资产物料{item_code}输入位置" -#: erpnext/controllers/buying_controller.py:676 +#: erpnext/controllers/buying_controller.py:666 msgid "Row #{idx}: Received Qty must be equal to Accepted + Rejected Qty for Item {item_code}." msgstr "行号#{idx}:物料{item_code}的接收数量必须等于接受数量+拒收数量" -#: erpnext/controllers/buying_controller.py:689 +#: erpnext/controllers/buying_controller.py:679 msgid "Row #{idx}: {field_label} can not be negative for item {item_code}." msgstr "行号#{idx}:物料{item_code}的{field_label}不能为负数" -#: erpnext/controllers/buying_controller.py:642 +#: erpnext/controllers/buying_controller.py:632 msgid "Row #{idx}: {field_label} is mandatory." msgstr "行号#{idx}:{field_label}为必填项" @@ -45874,7 +45918,7 @@ msgstr "行号#{idx}:{field_label}为必填项" msgid "Row #{idx}: {from_warehouse_field} and {to_warehouse_field} cannot be same." msgstr "行号#{idx}:{from_warehouse_field}和{to_warehouse_field}不能相同" -#: erpnext/controllers/buying_controller.py:1149 +#: erpnext/controllers/buying_controller.py:1139 msgid "Row #{idx}: {schedule_date} cannot be before {transaction_date}." msgstr "行号#{idx}:{schedule_date}不能早于{transaction_date}" @@ -45939,7 +45983,7 @@ msgstr "行号#{}:{}" msgid "Row #{}: {} {} does not exist." msgstr "行号#{}:{} {}不存在" -#: erpnext/stock/doctype/item/item.py:1482 +#: erpnext/stock/doctype/item/item.py:1520 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}." msgstr "行号#{}:{} {}不属于公司{},请选择有效的{}" @@ -45955,7 +45999,7 @@ msgstr "第{0}行,原材料 {1} 工序信息必填" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "第 {0} 行拣货数量少于需求数量,短缺 {1} {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1654 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "行号{0}# 在{2} {3}的'供应原材料'表中未找到物料{1}" @@ -45987,7 +46031,7 @@ msgstr "行号{0}:分配金额{1}不能超过发票未结金额{2}" msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "行号{0}:分配金额{1}不能超过剩余付款金额{2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1315 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "第 {0} 行:生产设置中已勾选 入库成品原材料成本取自工单耗用,工单入库中不允许倒扣原材料,请创建工单耗用物料移动消耗原材料" @@ -46045,7 +46089,7 @@ msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory. msgstr "行号{0}:必须关联交货单物料或包装物料" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:1023 -#: erpnext/controllers/taxes_and_totals.py:1390 +#: erpnext/controllers/taxes_and_totals.py:1373 msgid "Row {0}: Exchange Rate is mandatory" msgstr "请为第{0}行输入汇率" @@ -46086,7 +46130,7 @@ msgstr "行{0}:开始和结束时间必填。" msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "行{0}:{1} 与 {2} 的开始与结束时间有重叠" -#: erpnext/controllers/stock_controller.py:1561 +#: erpnext/controllers/stock_controller.py:1562 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "第 {0} 行,直接调拨发料仓必填" @@ -46210,7 +46254,7 @@ msgstr "行号{0}:数量必须大于0" msgid "Row {0}: Quantity cannot be negative." msgstr "行号{0}:数量不能为负数" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1030 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" msgstr "第{0}行:在记账时间点({2} {3}) 物料{4}在{1}中的可用数量不足" @@ -46222,11 +46266,11 @@ msgstr "" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "行号{0}:折旧已处理后不可变更班次" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1667 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "行号{0}:原材料{1}必须关联外协物料" -#: erpnext/controllers/stock_controller.py:1552 +#: erpnext/controllers/stock_controller.py:1553 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "第 {0} 行,直接调拨收料仓必填" @@ -46250,7 +46294,7 @@ msgstr "行号{0}:{3}科目{1}不属于公司{2}" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "行号{0}:设置{1}周期时,起止日期差值必须大于等于{2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3578 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" @@ -46303,7 +46347,7 @@ msgstr "行 {0}: {2} 项目 {1} 在 {2} {3} 中不存在" msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}." msgstr "第{1}行:数量 ({0}不可以是小数, 要允许小数,请在计量单位{3}主数据中取消勾选'{2}'" -#: erpnext/controllers/buying_controller.py:1014 +#: erpnext/controllers/buying_controller.py:1004 msgid "Row {idx}: Asset Naming Series is mandatory for the auto creation of assets for item {item_code}." msgstr "行号{idx}:自动创建物料{item_code}的资产必须指定资产命名规则。" @@ -46333,7 +46377,7 @@ msgstr "相同科目会被自动合并" msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "其他行已存在相同的付款到期日:{0}" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:144 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:148 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "第 {0} 行,源单据类型不能为收付款凭证" @@ -46399,7 +46443,7 @@ msgstr "" msgid "Rules evaluation started" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:54 +#: erpnext/public/js/utils/naming_series.js:54 msgid "Rules for configuring series" msgstr "" @@ -46696,7 +46740,7 @@ msgstr "销售收入率" #: erpnext/selling/doctype/quotation/quotation_list.js:22 #: erpnext/selling/doctype/sales_order/sales_order.js:1115 #: erpnext/selling/doctype/sales_order/sales_order_list.js:75 -#: erpnext/selling/doctype/selling_settings/selling_settings.js:67 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:51 #: erpnext/selling/workspace/selling/selling.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/setup/workspace/home/home.json @@ -46870,7 +46914,7 @@ msgstr "按来源划分的销售机会" #: erpnext/selling/doctype/quotation/quotation_dashboard.py:11 #: erpnext/selling/doctype/quotation/quotation_list.js:16 #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/selling/doctype/selling_settings/selling_settings.js:66 +#: erpnext/selling/doctype/selling_settings/selling_settings.js:50 #: erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py:60 #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.js:41 @@ -46993,8 +47037,8 @@ msgstr "销售订单为物料{0}的必须项" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "销售订单 {0} 已存在于客户的采购订单 {1}。若要允许多张销售订单,请在 {3} 中启用 {2}" -#: erpnext/selling/doctype/sales_order/sales_order.py:1927 -#: erpnext/selling/doctype/sales_order/sales_order.py:1940 +#: erpnext/selling/doctype/sales_order/sales_order.py:1921 +#: erpnext/selling/doctype/sales_order/sales_order.py:1934 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47405,7 +47449,7 @@ msgstr "相同物料" msgid "Same day" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:604 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:605 msgid "Same item and warehouse combination already entered." msgstr "已输入相同的商品和仓库组合。" @@ -47442,7 +47486,7 @@ msgstr "样品仓" msgid "Sample Size" msgstr "样本大小" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4071 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "采样数量{0}不能超过接收数量{1}" @@ -47733,7 +47777,7 @@ msgstr "按物料号,序列号,批号搜索" msgid "Search company..." msgstr "" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:335 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:338 #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:146 msgid "Search transactions" msgstr "" @@ -47878,7 +47922,7 @@ msgstr "选择品牌..." msgid "Select Columns and Filters" msgstr "选择列与筛选条件" -#: erpnext/accounts/doctype/journal_entry/journal_entry.js:152 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:156 msgid "Select Company" msgstr "选择公司" @@ -48574,7 +48618,7 @@ msgstr "序列号范围" msgid "Serial No Reserved" msgstr "已预留序列号" -#: erpnext/stock/doctype/item/item.py:494 +#: erpnext/stock/doctype/item/item.py:495 msgid "Serial No Series Overlap" msgstr "" @@ -48635,7 +48679,7 @@ msgstr "序列号为必填项" msgid "Serial No is mandatory for Item {0}" msgstr "序列号是物料{0}的必须项" -#: erpnext/public/js/utils/serial_no_batch_selector.js:602 +#: erpnext/public/js/utils/serial_no_batch_selector.js:604 msgid "Serial No {0} already exists" msgstr "序列号{0}已存在" @@ -48921,7 +48965,7 @@ msgstr "仓库{1}下物料{0}的序列号不可用,请尝试更换仓库。" #: 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:655 +#: erpnext/accounts/doctype/journal_entry/journal_entry.js:659 #: 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 @@ -48947,7 +48991,7 @@ msgstr "仓库{1}下物料{0}的序列号不可用,请尝试更换仓库。" #: erpnext/projects/doctype/project/project.json #: erpnext/projects/doctype/project_update/project_update.json #: erpnext/projects/doctype/timesheet/timesheet.json -#: erpnext/public/js/utils/naming_series_dialog.js:34 +#: erpnext/public/js/utils/naming_series.js:34 #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/installation_note/installation_note.json #: erpnext/selling/doctype/quotation/quotation.json @@ -49345,12 +49389,6 @@ msgstr "收料仓" msgid "Set Valuation Rate Based on Source Warehouse" msgstr "成本价基于发料仓" -#. Label of the set_valuation_rate_for_rejected_materials (Check) field in -#. DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Set Valuation Rate for Rejected Materials" -msgstr "设置拒收物料计价率" - #: erpnext/selling/doctype/sales_order/sales_order.js:254 msgid "Set Warehouse" msgstr "仓码" @@ -49456,6 +49494,12 @@ msgstr "" msgid "Set up rules to automatically classify transactions. Drag and drop rules to reorder their priority." msgstr "" +#. Label of the set_valuation_rate_for_rejected_materials (Check) field in +#. DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Set valuation rate for rejected Materials" +msgstr "" + #: erpnext/assets/doctype/asset/asset.py:901 msgid "Set {0} in asset category {1} for company {2}" msgstr "为{2}公司设置资产类别{1}的{0}" @@ -49954,7 +49998,7 @@ msgstr "在科目表中显示余额" msgid "Show Barcode Field in Stock Transactions" msgstr "启用扫条码字段" -#: erpnext/accounts/report/general_ledger/general_ledger.js:193 +#: erpnext/accounts/report/general_ledger/general_ledger.js:199 msgid "Show Cancelled Entries" msgstr "显示已冲销单据" @@ -49962,7 +50006,7 @@ msgstr "显示已冲销单据" msgid "Show Completed" msgstr "显示已完成" -#: erpnext/accounts/report/general_ledger/general_ledger.js:203 +#: erpnext/accounts/report/general_ledger/general_ledger.js:209 msgid "Show Credit / Debit in Company Currency" msgstr "显示公司货币的贷方/借方金额" @@ -50045,7 +50089,7 @@ msgstr "显示关联的销售出库" #. Label of the show_net_values_in_party_account (Check) field in DocType #. 'Process Statement Of Accounts' #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json -#: erpnext/accounts/report/general_ledger/general_ledger.js:198 +#: erpnext/accounts/report/general_ledger/general_ledger.js:204 msgid "Show Net Values in Party Account" msgstr "显示往来单位净值" @@ -50057,7 +50101,7 @@ msgstr "" msgid "Show Open" msgstr "显示未完成" -#: erpnext/accounts/report/general_ledger/general_ledger.js:182 +#: erpnext/accounts/report/general_ledger/general_ledger.js:187 msgid "Show Opening Entries" msgstr "显示开账分录" @@ -50070,11 +50114,6 @@ msgstr "显示期初与期末余额" msgid "Show Operations" msgstr "显示工序" -#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Show Pay Button in Purchase Order Portal" -msgstr "在门户网站采购订单详情界面显示付款按钮" - #: erpnext/accounts/report/sales_payment_summary/sales_payment_summary.js:40 msgid "Show Payment Details" msgstr "显示付款详情" @@ -50090,7 +50129,7 @@ msgstr "打印付款计划" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:136 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:173 -#: erpnext/accounts/report/general_ledger/general_ledger.js:213 +#: erpnext/accounts/report/general_ledger/general_ledger.js:219 msgid "Show Remarks" msgstr "显示备注信息" @@ -50157,6 +50196,11 @@ msgstr "只显示POS" msgid "Show only the Immediate Upcoming Term" msgstr "仅显示即将到期的条款" +#. Label of the show_pay_button (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Show pay button in Purchase Order portal" +msgstr "" + #: erpnext/stock/utils.py:569 msgid "Show pending entries" msgstr "显示待处理条目" @@ -50445,11 +50489,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:908 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2353 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50515,7 +50559,7 @@ msgstr "源仓库{0}必须与外包收货订单中的客户仓库{1}相同。" msgid "Source and Target Location cannot be same" msgstr "源和目标地点不能相同" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:874 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 msgid "Source and target warehouse cannot be same for row {0}" msgstr "第{0}行中的源和收料仓不能相同" @@ -50529,8 +50573,8 @@ msgid "Source of Funds (Liabilities)" msgstr "资金来源(负债)" #: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:857 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:864 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 msgid "Source warehouse is mandatory for row {0}" msgstr "请为第{0}行填写发料仓" @@ -50695,8 +50739,8 @@ msgstr "标准税率费用" #: erpnext/setup/setup_wizard/operations/defaults_setup.py:70 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:493 -#: erpnext/stock/doctype/item/item.py:288 erpnext/tests/utils.py:283 -#: erpnext/tests/utils.py:2504 +#: erpnext/stock/doctype/item/item.py:289 erpnext/tests/utils.py:283 +#: erpnext/tests/utils.py:2518 msgid "Standard Selling" msgstr "标准销售" @@ -51029,7 +51073,7 @@ msgstr "库存结转日志" msgid "Stock Details" msgstr "库存详细信息" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:998 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 msgid "Stock Entries already created for Work Order {0}: {1}" msgstr "工单 {0} 现有入库单 {1} 总入库数量已超工单数量,不可再创建新入库单" @@ -51300,7 +51344,7 @@ msgstr "暂估库存(已收货,未开票)" #. Label of a Link in the Stock Workspace #. Label of a Workspace Sidebar Item #: erpnext/setup/workspace/home/home.json -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json #: erpnext/stock/workspace/stock/stock.json #: erpnext/workspace_sidebar/stock.json @@ -51312,7 +51356,7 @@ msgstr "库存调账" msgid "Stock Reconciliation Item" msgstr "库存调账明细" -#: erpnext/stock/doctype/item/item.py:685 +#: erpnext/stock/doctype/item/item.py:686 msgid "Stock Reconciliations" msgstr "库存对账" @@ -51350,7 +51394,7 @@ msgstr "物料成本价追溯调整设置" #: erpnext/stock/doctype/pick_list/pick_list.js:170 #: erpnext/stock/doctype/pick_list/pick_list.js:175 #: erpnext/stock/doctype/stock_entry/stock_entry_dashboard.py:12 -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:742 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:743 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:680 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1246 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1653 @@ -51378,7 +51422,7 @@ msgstr "库存预留单已取消" #: erpnext/controllers/subcontracting_inward_controller.py:1021 #: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 #: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:880 +#: erpnext/selling/doctype/sales_order/sales_order.py:874 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "库存预留单已创建" @@ -51760,7 +51804,7 @@ msgstr "停止的工单不能取消,先取消停止" #: erpnext/setup/doctype/company/company.py:383 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 -#: erpnext/stock/doctype/item/item.py:329 erpnext/tests/utils.py:248 +#: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 msgid "Stores" msgstr "仓库" @@ -51838,10 +51882,6 @@ msgstr "子工序" msgid "Sub Procedure" msgstr "子流程" -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:129 -msgid "Sub Total" -msgstr "小计" - #: erpnext/manufacturing/doctype/production_plan/production_plan.py:625 msgid "Sub assembly item references are missing. Please fetch the sub assemblies and raw materials again." msgstr "" @@ -52058,7 +52098,7 @@ msgstr "外包收货订单服务物料" msgid "Subcontracting Order" msgstr "委外订单" -#. Description of the 'Auto Create Subcontracting Order' (Check) field in +#. Description of the 'Auto create Subcontracting Order' (Check) field in #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." @@ -52084,7 +52124,7 @@ msgstr "委外订单加工费明细" msgid "Subcontracting Order Supplied Item" msgstr "委外订单原材料明细" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:907 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 msgid "Subcontracting Order {0} created." msgstr "外协订单{0}已创建" @@ -52173,7 +52213,7 @@ msgstr "" msgid "Subdivision" msgstr "细分" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:903 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "提交操作失败" @@ -52348,7 +52388,7 @@ msgstr "核销/对账成功" msgid "Successfully Set Supplier" msgstr "成功设置供应商" -#: erpnext/stock/doctype/item/item.py:407 +#: erpnext/stock/doctype/item/item.py:408 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM." msgstr "已成功更改库存单位,请重新定义新单位的换算系数" @@ -52504,6 +52544,7 @@ msgstr "已发料数量" #: erpnext/accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:29 #: erpnext/accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37 #: erpnext/assets/doctype/asset/asset.json +#: erpnext/buying/doctype/buying_settings/buying_settings.js:44 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:185 #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:270 @@ -52545,8 +52586,8 @@ msgstr "已发料数量" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/doctype/shipment/shipment.json #: erpnext/stock/doctype/stock_entry/stock_entry.json +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:524 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:8 #: erpnext/workspace_sidebar/buying.json erpnext/workspace_sidebar/home.json #: erpnext/workspace_sidebar/invoicing.json #: erpnext/workspace_sidebar/subscription.json @@ -52594,6 +52635,12 @@ msgstr "供应商地址与联系人" msgid "Supplier Contact" msgstr "供应商联系人" +#. Label of the supplier_defaults_section (Section Break) field in DocType +#. 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Supplier Defaults" +msgstr "" + #. Label of the supplier_delivery_note (Data) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -52688,7 +52735,7 @@ msgstr "供应商发票日期" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:58 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/report/general_ledger/general_ledger.html:202 -#: erpnext/accounts/report/general_ledger/general_ledger.py:796 +#: erpnext/accounts/report/general_ledger/general_ledger.py:813 #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:226 msgid "Supplier Invoice No" msgstr "供应商发票号" @@ -52968,19 +53015,10 @@ msgstr "提供商品或服务的供应商。" msgid "Supplier {0} not found in {1}" msgstr "在{1}中找不到供应商{0}" -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:67 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:67 msgid "Supplier(s)" msgstr "供应商" -#. Label of a Link in the Buying Workspace -#. Name of a report -#. Label of a Workspace Sidebar Item -#: erpnext/buying/workspace/buying/buying.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.json -#: erpnext/workspace_sidebar/buying.json -msgid "Supplier-Wise Sales Analytics" -msgstr "供应商直运销售分析" - #. Label of the suppliers (Table) field in DocType 'Request for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "Suppliers" @@ -53042,7 +53080,7 @@ msgstr "售后支持团队" msgid "Support Tickets" msgstr "客服工单" -#: erpnext/public/js/utils/naming_series_dialog.js:89 +#: erpnext/public/js/utils/naming_series.js:89 msgid "Supported Variables:" msgstr "" @@ -53302,8 +53340,8 @@ msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcon msgstr "目标仓库{0}必须与外包收货订单物料中的交货仓库{1}相同。" #: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:853 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:868 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 msgid "Target warehouse is mandatory for row {0}" msgstr "请为第{0}行指定收料仓" @@ -53772,7 +53810,7 @@ msgstr "" #. Detail' #: erpnext/accounts/doctype/item_wise_tax_detail/item_wise_tax_detail.json #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:239 -#: erpnext/controllers/taxes_and_totals.py:1266 +#: erpnext/controllers/taxes_and_totals.py:1249 msgid "Taxable Amount" msgstr "应税金额" @@ -53933,7 +53971,7 @@ msgstr "抵扣税费" msgid "Taxes and Charges Deducted (Company Currency)" msgstr "抵扣税费(本币)" -#: erpnext/stock/doctype/item/item.py:420 +#: erpnext/stock/doctype/item/item.py:421 msgid "Taxes row #{0}: {1} cannot be smaller than {2}" msgstr "第{0}行税项:{1}不能小于{2}" @@ -54123,7 +54161,6 @@ msgstr "条款模板" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/print_format/sales_invoice_print/sales_invoice_print.html:155 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -54315,7 +54352,7 @@ msgstr "门户询价申请功能已禁用。如需启用,请在门户设置中 msgid "The BOM which will be replaced" msgstr "此物料清单将被替换" -#: erpnext/stock/serial_batch_bundle.py:1540 +#: erpnext/stock/serial_batch_bundle.py:1546 msgid "The Batch {0} has negative batch quantity {1}. To fix this, go to the batch and click on Recalculate Batch Qty. If the issue still persists, create an inward entry." msgstr "批次{0}存在负批次数量{1}。要修复此问题,请前往该批次并点击“重新计算批次数量”。若问题仍存在,请创建入库凭证。" @@ -54359,7 +54396,7 @@ msgstr "第{0}行的支付条款可能是重复的。" 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:2805 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "已基于工单生产任务单最大制程损耗重置了制程损耗数量" @@ -54375,7 +54412,7 @@ msgstr "第{0}行的序列号{1}在仓库{2}中不可用" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "序列号{0}已为{1}{2}预留,不能用于其他交易" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1822 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 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 "序列号批次组合{0}对此交易无效。在序列号批次组合{0}中,'交易类型'应为'出库'而非'入库'" @@ -54411,7 +54448,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1317 +#: erpnext/controllers/stock_controller.py:1318 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54517,7 +54554,7 @@ msgstr "以下批次已过期,请补货:
{0}" msgid "The following cancelled repost entries exist for {0}:

{1}

Kindly delete these entries before continuing." msgstr "" -#: erpnext/stock/doctype/item/item.py:923 +#: erpnext/stock/doctype/item/item.py:961 msgid "The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template." msgstr "以下已删除属性存在于变体但不存在于模板。请删除变体或在模板保留属性" @@ -54561,15 +54598,15 @@ msgstr "在{0}这个节日之间不在开始日期和结束日期之间" msgid "The invoice is not fully allocated as there is a difference of {0}." msgstr "" -#: erpnext/controllers/buying_controller.py:1213 +#: erpnext/controllers/buying_controller.py:1203 msgid "The item {item} is not marked as {type_of} item. You can enable it as {type_of} item from its Item master." msgstr "物料{item}未标记为{type_of}物料。可在物料主数据中启用" -#: erpnext/stock/doctype/item/item.py:687 +#: erpnext/stock/doctype/item/item.py:688 msgid "The items {0} and {1} are present in the following {2} :" msgstr "物料{0}和{1}存在于以下{2}中:" -#: erpnext/controllers/buying_controller.py:1206 +#: erpnext/controllers/buying_controller.py:1196 msgid "The items {items} are not marked as {type_of} item. You can enable them as {type_of} item from their Item masters." msgstr "物料{items}未标记为{type_of}物料。可在各自主数据中启用" @@ -54725,7 +54762,7 @@ msgstr "股份不存在{0}" msgid "The stock for the item {0} in the {1} warehouse was negative on the {2}. You should create a positive entry {3} before the date {4} and time {5} to post the correct valuation rate. For more details, please read the documentation." msgstr "物料{0}在仓库{1}的库存于{2}出现负数。应在{4} {5}前创建正数分录{3}以记录正确计价。详情参阅文档" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:736 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:737 msgid "The stock has been reserved for the following Items and Warehouses, un-reserve the same to {0} the Stock Reconciliation:

{1}" msgstr "以下物料和仓库的库存已被预留,请取消预留以{0}库存对账:

{1}" @@ -54747,11 +54784,11 @@ 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 "系统将基于此设置从POS界面创建销售发票或POS发票。对于高流量交易,建议使用POS发票。" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1031 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1032 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage" msgstr "该任务已被列入后台工作。如果在后台处理有任何问题,系统将在此库存对账中添加有关错误的注释,并恢复到草稿阶段" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1042 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1043 msgid "The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Submitted stage" msgstr "任务已加入后台队列。若后台处理出错,系统将在库存对账添加错误注释并恢复为已提交状态" @@ -54823,7 +54860,7 @@ msgstr "{0}({1})必须等于{2}({3})" msgid "The {0} contains Unit Price Items." msgstr "{0}包含单价物料。" -#: erpnext/stock/doctype/item/item.py:491 +#: erpnext/stock/doctype/item/item.py:492 msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" @@ -54876,7 +54913,7 @@ msgstr "" msgid "There are no slots available on this date" msgstr "该日期无可用时段" -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:290 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:289 msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" @@ -54920,7 +54957,7 @@ msgstr "未找到{0}:{1}对应的批次" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "至少须有一行勾选了是成品的明细行" @@ -54976,11 +55013,11 @@ msgstr "此物料是基于模板物料{0}的多规格物料。" msgid "This Month's Summary" msgstr "本月摘要" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:916 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 msgid "This Purchase Order has been fully subcontracted." msgstr "本采购订单已完全外包。" -#: erpnext/selling/doctype/sales_order/sales_order.py:2193 +#: erpnext/selling/doctype/sales_order/sales_order.py:2187 msgid "This Sales Order has been fully subcontracted." msgstr "本销售订单已完全外包。" @@ -55781,7 +55818,7 @@ msgstr "" msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "第{0}行的物料单价要含税,第{1}行的税也必须包括在内" -#: erpnext/stock/doctype/item/item.py:709 +#: erpnext/stock/doctype/item/item.py:710 msgid "To merge, following properties must be same for both items" msgstr "若要合并,两个物料的以下属性必须相同" @@ -55816,7 +55853,7 @@ msgstr "要使用不同的财务账簿,请取消选中“包括默认 FB 资 #: erpnext/accounts/doctype/financial_report_template/financial_report_engine.py:748 #: erpnext/accounts/report/financial_statements.py:621 -#: erpnext/accounts/report/general_ledger/general_ledger.py:310 +#: erpnext/accounts/report/general_ledger/general_ledger.py:318 #: erpnext/accounts/report/trial_balance/trial_balance.py:310 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'" msgstr "要使用不同的财务账簿,请取消选中“包括默认 FB 条目”" @@ -55967,7 +56004,7 @@ msgstr "分配总额" #: erpnext/selling/page/sales_funnel/sales_funnel.py:167 #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:66 #: erpnext/templates/includes/order/order_taxes.html:54 msgid "Total Amount" msgstr "总金额" @@ -56390,7 +56427,7 @@ msgstr "付款申请总金额不得超过{0}金额" msgid "Total Payments" msgstr "总付款" -#: erpnext/selling/doctype/sales_order/sales_order.py:730 +#: erpnext/selling/doctype/sales_order/sales_order.py:724 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "已拣货数量{0}超过订单数量{1}。可在库存设置中设置超拣许可量" @@ -56422,7 +56459,7 @@ msgstr "总采购成本(采购发票)" #. Label of the total_qty (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:65 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:65 #: erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:139 msgid "Total Qty" msgstr "总数量" @@ -56808,7 +56845,7 @@ msgstr "跟踪链接" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/manufacturing/doctype/workstation/workstation_dashboard.py:10 -#: erpnext/public/js/utils/naming_series_dialog.js:218 +#: erpnext/public/js/utils/naming_series.js:219 #: erpnext/selling/doctype/selling_settings/selling_settings.json #: erpnext/setup/doctype/authorization_rule/authorization_rule.json #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json @@ -56819,7 +56856,7 @@ msgstr "交易" #. Label of the currency (Link) field in DocType 'Payment Request' #: erpnext/accounts/doctype/gl_entry/gl_entry.json #: erpnext/accounts/doctype/payment_request/payment_request.json -#: erpnext/accounts/report/general_ledger/general_ledger.py:734 +#: erpnext/accounts/report/general_ledger/general_ledger.py:751 msgid "Transaction Currency" msgstr "交易货币" @@ -57491,11 +57528,11 @@ msgstr "阿联酋增值税设置" #: erpnext/stock/report/available_serial_no/available_serial_no.py:101 #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:87 #: erpnext/stock/report/item_prices/item_prices.py:55 +#: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 #: erpnext/stock/report/stock_ageing/stock_ageing.py:186 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 -#: erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:60 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json #: erpnext/templates/emails/reorder_item.html:11 #: erpnext/templates/includes/rfq/rfq_items.html:17 @@ -57567,7 +57604,7 @@ msgstr "请为第{0}行输入单位换算系数" msgid "UOM Name" msgstr "单位名称" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3993 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "物料{1}的计量单位{0}需要换算系数" @@ -57643,7 +57680,7 @@ msgstr "无法从{0}开始获得分数。你需要有0到100的常规分数" msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "未来{0}天内未找到工序{1}的可用时段,请在{2}中增加'产能计划周期(天)'" -#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:98 +#: erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py:91 msgid "Unable to find variable:" msgstr "无法找到变量:" @@ -57762,7 +57799,7 @@ msgstr "单位" msgid "Unit of Measure (UOM)" msgstr "计量单位" -#: erpnext/stock/doctype/item/item.py:452 +#: erpnext/stock/doctype/item/item.py:453 msgid "Unit of Measure {0} has been entered more than once in Conversion Factor Table" msgstr "单位{0}已经在换算系数表内" @@ -57882,10 +57919,9 @@ msgid "Unreconcile Transaction" msgstr "取消银行交易流水核销" #. Option for the 'Status' (Select) field in DocType 'Bank Transaction' -#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:411 +#: banking/src/components/features/BankReconciliation/BankTransactionList.tsx:414 #: erpnext/accounts/doctype/bank_transaction/bank_transaction.json #: erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js:12 -#: erpnext/accounts/doctype/payment_entry/payment_entry_list.js:13 msgid "Unreconciled" msgstr "未核销" @@ -57908,10 +57944,6 @@ msgstr "未核销单据" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/public/js/utils/unreconcile.js:175 -msgid "Unreconciled successfully" -msgstr "" - #: erpnext/manufacturing/doctype/work_order/work_order.js:952 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 @@ -57957,7 +57989,7 @@ msgstr "计划外" msgid "Unsecured Loans" msgstr "无担保借款" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1730 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:1712 msgid "Unset Matched Payment Request" msgstr "取消匹配付款申请" @@ -58172,12 +58204,6 @@ msgstr "更新库存" msgid "Update Type" msgstr "更新类型" -#. Label of the project_update_frequency (Select) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Update frequency of Project" -msgstr "项目统计数据更新频率" - #. Label of the update_latest_price_in_all_boms (Button) field in DocType 'BOM #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -58218,7 +58244,7 @@ msgstr "" msgid "Updating Costing and Billing fields against this Project..." msgstr "正在更新本项目的成本核算与计费字段..." -#: erpnext/stock/doctype/item/item.py:1466 +#: erpnext/stock/doctype/item/item.py:1504 msgid "Updating Variants..." msgstr "更新多规格物料......" @@ -58676,12 +58702,6 @@ msgstr "校验应用的规则" msgid "Validate Components and Quantities Per BOM" msgstr "工单发料与耗用时强制按物料清单标准用量" -#. Label of the validate_consumed_qty (Check) field in DocType 'Buying -#. Settings' -#: erpnext/buying/doctype/buying_settings/buying_settings.json -msgid "Validate Consumed Qty (as per BOM)" -msgstr "" - #. Label of the validate_material_transfer_warehouses (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json @@ -58705,6 +58725,12 @@ msgstr "仅用于规则检验" msgid "Validate Stock on Save" msgstr "保存时检查库存" +#. Label of the validate_consumed_qty (Check) field in DocType 'Buying +#. Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Validate consumed quantity (as per BOM)" +msgstr "" + #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json @@ -58811,11 +58837,11 @@ msgstr "无成本价" msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "要为{1} {2}生成会计凭证,物料{0}须有成本价" -#: erpnext/stock/doctype/item/item.py:313 +#: erpnext/stock/doctype/item/item.py:314 msgid "Valuation Rate is mandatory if Opening Stock entered" msgstr "库存开账凭证中成本价字段必填" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:788 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:789 msgid "Valuation Rate required for Item {0} at row {1}" msgstr "第{1}的物料{0}需有成本价" @@ -58825,7 +58851,7 @@ msgstr "第{1}的物料{0}需有成本价" msgid "Valuation and Total" msgstr "成本价与总计" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1008 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1009 msgid "Valuation rate for customer provided items has been set to zero." msgstr "客户提供物料的计价单价已设为零" @@ -58975,7 +59001,7 @@ msgstr "差异({})" msgid "Variant" msgstr "多规格物料" -#: erpnext/stock/doctype/item/item.py:938 +#: erpnext/stock/doctype/item/item.py:976 msgid "Variant Attribute Error" msgstr "变体属性错误" @@ -58994,7 +59020,7 @@ msgstr "变体BOM" msgid "Variant Based On" msgstr "多规格物料基于" -#: erpnext/stock/doctype/item/item.py:966 +#: erpnext/stock/doctype/item/item.py:1004 msgid "Variant Based On cannot be changed" msgstr "Variant Based On无法更改" @@ -59012,7 +59038,7 @@ msgstr "多规格物料字段" msgid "Variant Item" msgstr "变体物料" -#: erpnext/stock/doctype/item/item.py:936 +#: erpnext/stock/doctype/item/item.py:974 msgid "Variant Items" msgstr "变体物料" @@ -59393,7 +59419,7 @@ msgstr "凭证号" #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 -#: erpnext/accounts/report/general_ledger/general_ledger.py:751 +#: erpnext/accounts/report/general_ledger/general_ledger.py:768 #: 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 @@ -59433,7 +59459,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:745 +#: erpnext/accounts/report/general_ledger/general_ledger.py:762 msgid "Voucher Subtype" msgstr "源凭证业务类型" @@ -59465,7 +59491,7 @@ msgstr "源凭证业务类型" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 -#: erpnext/accounts/report/general_ledger/general_ledger.py:743 +#: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 #: erpnext/accounts/report/payment_ledger/payment_ledger.py:165 #: erpnext/accounts/report/purchase_register/purchase_register.py:158 @@ -59700,7 +59726,7 @@ msgstr "" msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "销售订单{1}不允许使用仓库{0},应使用{2}" -#: erpnext/controllers/stock_controller.py:820 +#: erpnext/controllers/stock_controller.py:821 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 "仓库 {0} 无库存科目,请在仓库或公司主数据中维护默认库存科目" @@ -59747,7 +59773,7 @@ msgstr "已有业务交易的仓库不能转换到记账仓库。" #. (Select) field in DocType 'Budget' #. Option for the 'Action if Accumulative Monthly Budget Exceeded on Cumulative #. Expense' (Select) field in DocType 'Budget' -#. Option for the 'Action If Same Rate is Not Maintained' (Select) field in +#. Option for the 'Action if same rate is not maintained' (Select) field in #. DocType 'Buying Settings' #. Option for the 'Action if same rate is not maintained throughout sales #. cycle' (Select) field in DocType 'Selling Settings' @@ -59803,6 +59829,12 @@ msgstr "创建新询价时弹出警告信息" msgid "Warn or stop if Item rate is changed in Delivery Notes and Sales Invoices generated from a Sales Order." msgstr "" +#. Description of the 'Maintain same rate throughout the purchase cycle' +#. (Check) field in DocType 'Buying Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json +msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." +msgstr "" + #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" msgstr "警告 - 第{0}行:计费工时超过实际工时" @@ -59986,7 +60018,7 @@ msgstr "网站规格" msgid "Website:" msgstr "网站:" -#: erpnext/public/js/utils/naming_series_dialog.js:95 +#: erpnext/public/js/utils/naming_series.js:95 msgid "Week of the year" msgstr "" @@ -60360,7 +60392,7 @@ msgstr "工单已耗用物料" msgid "Work Order Item" msgstr "工单明细" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:911 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 msgid "Work Order Mismatch" msgstr "" @@ -60422,11 +60454,11 @@ msgstr "生产工单未创建" msgid "Work Order {0} created" msgstr "工作订单{0}已创建" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2369 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:948 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 msgid "Work Order {0}: Job Card not found for the operation {1}" msgstr "工单 {0}: Job Card not found 未找到针对工序 {1} 的生产任务单" @@ -60742,11 +60774,11 @@ msgstr "年度名称" msgid "Year Start Date" msgstr "年度开始日期" -#: erpnext/public/js/utils/naming_series_dialog.js:92 +#: erpnext/public/js/utils/naming_series.js:92 msgid "Year in 2 digits" msgstr "" -#: erpnext/public/js/utils/naming_series_dialog.js:91 +#: erpnext/public/js/utils/naming_series.js:91 msgid "Year in 4 digits" msgstr "" @@ -60799,7 +60831,7 @@ msgstr "您也可以复制粘贴此链接到您的浏览器地址栏中" msgid "You can also set default CWIP account in Company {}" msgstr "您还可以在公司{}主数据中设置默认在建工程科目" -#: erpnext/public/js/utils/naming_series_dialog.js:87 +#: erpnext/public/js/utils/naming_series.js:87 msgid "You can also use variables in the series name by putting them between (.) dots" msgstr "" @@ -60953,6 +60985,10 @@ msgstr "" msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +msgid "You don't have permission to update Received Qty DocField for item {0}" +msgstr "" + #: erpnext/controllers/accounts_controller.py:4440 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60981,7 +61017,7 @@ msgstr "您已在{2}中启用{0}和{1}。这可能导致默认价格表中的价 msgid "You have entered a duplicate Delivery Note on Row" msgstr "您在第行输入了重复的送货单" -#: banking/src/components/features/BankReconciliation/BankPicker.tsx:54 +#: banking/src/components/features/BankReconciliation/BankPicker.tsx:64 msgid "You have not added any bank accounts to your company." msgstr "" @@ -60989,7 +61025,7 @@ msgstr "" msgid "You have not performed any reconciliations in this session yet." msgstr "" -#: erpnext/stock/doctype/item/item.py:1142 +#: erpnext/stock/doctype/item/item.py:1180 msgid "You have to enable auto re-order in Stock Settings to maintain re-order levels." msgstr "您必须在库存设置中启用自动重订货才能维护重订货点。" @@ -61060,8 +61096,11 @@ msgstr "零税率" msgid "Zero quantity" msgstr "零数量" +#. Label of the zero_quantity_line_items_section (Section Break) field in +#. DocType 'Buying Settings' #. Label of the section_break_zero_qty (Section Break) field in DocType #. 'Selling Settings' +#: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Zero-Quantity Line Items" msgstr "" @@ -61173,7 +61212,7 @@ msgstr "汇率服务商" msgid "fieldname" msgstr "字段名称" -#: erpnext/public/js/utils/naming_series_dialog.js:97 +#: erpnext/public/js/utils/naming_series.js:97 msgid "fieldname on the document e.g." msgstr "" @@ -61391,6 +61430,10 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "唯一值,例如SAVE20,用于获取折扣" +#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +msgid "updated delivered quantity for item {0} to {1}" +msgstr "" + #: erpnext/accounts/report/budget_variance_report/budget_variance_report.js:9 msgid "variance" msgstr "差异" @@ -61449,7 +61492,8 @@ msgstr "{0}优惠券已使用{1}次,可用次数已耗尽" msgid "{0} Digest" msgstr "{0}统计信息" -#: erpnext/public/js/utils/naming_series_dialog.js:247 +#: erpnext/public/js/utils/naming_series.js:263 +#: erpnext/public/js/utils/naming_series.js:403 msgid "{0} Naming Series" msgstr "" @@ -61469,7 +61513,7 @@ msgstr "{0} 工序:{1}" msgid "{0} Request for {1}" msgstr "{0}申请{1}" -#: erpnext/stock/doctype/item/item.py:391 +#: erpnext/stock/doctype/item/item.py:392 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item" msgstr "{0}保留样品基于批号,请在物料主数据中勾选启用批号管理" @@ -61582,7 +61626,7 @@ msgid "{0} entered twice in Item Tax" msgstr "{0}输入了两次税项" #: erpnext/setup/doctype/item_group/item_group.py:47 -#: erpnext/stock/doctype/item/item.py:522 +#: erpnext/stock/doctype/item/item.py:523 msgid "{0} entered twice {1} in Item Taxes" msgstr "{0}在物料税{1}中重复输入" @@ -61750,7 +61794,7 @@ msgstr "{0}参数无效" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0}收付款凭证不能由{1}过滤" -#: erpnext/controllers/stock_controller.py:1739 +#: erpnext/controllers/stock_controller.py:1740 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "已收到物料 {1} 数量 {0} 到仓库 {2},占用库容 {3}" @@ -61763,7 +61807,7 @@ msgstr "{0}到{1}" msgid "{0} transactions will be imported into the system. Please review the details below and click the 'Import' button to proceed." msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:726 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:727 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation." msgstr "仓库 {2} 中物料 {1} 已被预留了{0} ,请取消预留后再 {3} 库存调账" @@ -61965,7 +62009,7 @@ msgstr "{0} {1}: 科目{2}无效" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}在{2}会计分录只能用货币单位:{3}" -#: erpnext/controllers/stock_controller.py:952 +#: erpnext/controllers/stock_controller.py:953 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}:请为物料 {2} 填写成本中心" @@ -62051,23 +62095,23 @@ msgstr "{0}:{1}不存在" msgid "{0}: {1} is a group account." msgstr "{0}:{1}为组科目。" -#: erpnext/accounts/doctype/payment_entry/payment_entry.js:993 +#: erpnext/accounts/doctype/payment_entry/payment_entry.js:975 msgid "{0}: {1} must be less than {2}" msgstr "{0}:{1}必须小于{2}" -#: erpnext/controllers/buying_controller.py:991 +#: erpnext/controllers/buying_controller.py:981 msgid "{count} Assets created for {item_code}" msgstr "已为{item_code}创建{count}项资产" -#: erpnext/controllers/buying_controller.py:891 +#: erpnext/controllers/buying_controller.py:881 msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype}{name}已取消或关闭" -#: erpnext/controllers/stock_controller.py:2146 +#: erpnext/controllers/stock_controller.py:2147 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "{item_name}的样本量({sample_size})不得超过验收数量({accepted_quantity})" -#: erpnext/controllers/buying_controller.py:702 +#: erpnext/controllers/buying_controller.py:692 msgid "{ref_doctype} {ref_name} is {status}." msgstr "{ref_doctype}{ref_name}的状态为{status}" From ee33574a6d0a8d6b639a55f85dfc1504c086ff7a Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 20 May 2026 10:40:15 +0530 Subject: [PATCH 032/249] fix: faster range calculation on process period closing voucher --- .../process_period_closing_voucher.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py b/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py index 9a567ec69f2..2f351e136e9 100644 --- a/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py +++ b/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py @@ -72,8 +72,8 @@ class ProcessPeriodClosingVoucher(Document): pcv = frappe.get_doc("Period Closing Voucher", self.parent_pcv) if pcv.is_first_period_closing_voucher(): gl = qb.DocType("GL Entry") - min = qb.from_(gl).select(Min(gl.posting_date)).where(gl.company.eq(pcv.company)).run()[0][0] - max = qb.from_(gl).select(Max(gl.posting_date)).where(gl.company.eq(pcv.company)).run()[0][0] + min = qb.from_(gl).select(Min(gl.posting_date)).run()[0][0] + max = qb.from_(gl).select(Max(gl.posting_date)).run()[0][0] dates = self.get_dates(get_datetime(min), get_datetime(max)) for x in dates: From eba58b28372721e2c8c7563a19e10afa7d8bc5ca Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 20 May 2026 11:19:00 +0530 Subject: [PATCH 033/249] refactor: ppcv select with for update and skip locked --- .../process_period_closing_voucher.py | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py b/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py index 2f351e136e9..7a39f0f9053 100644 --- a/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py +++ b/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py @@ -93,12 +93,16 @@ class ProcessPeriodClosingVoucher(Document): def start_pcv_processing(docname: str): if frappe.db.get_value("Process Period Closing Voucher", docname, "status") in ["Queued", "Running"]: frappe.db.set_value("Process Period Closing Voucher", docname, "status", "Running") - if normal_balances := frappe.db.get_all( - "Process Period Closing Voucher Detail", - filters={"parent": docname, "status": "Queued"}, - fields=["processing_date", "report_type", "parentfield"], - order_by="parentfield, idx, processing_date", - limit=4, + + ppcvd = qb.DocType("Process Period Closing Voucher Detail") + if normal_balances := ( + qb.from_(ppcvd) + .select(ppcvd.processing_date, ppcvd.report_type, ppcvd.parentfield) + .where(ppcvd.parent.eq(docname) & ppcvd.status.eq("Queued")) + .orderby(ppcvd.parentfield, ppcvd.idx, ppcvd.processing_date) + .limit(4) + .for_update(skip_locked=True) + .run(as_dict=True) ): if not is_scheduler_inactive(): for x in normal_balances: @@ -238,12 +242,15 @@ def get_gle_for_closing_account(pcv, dimension_balance, dimensions): @frappe.whitelist() def schedule_next_date(docname: str): - if to_process := frappe.db.get_all( - "Process Period Closing Voucher Detail", - filters={"parent": docname, "status": "Queued"}, - fields=["processing_date", "report_type", "parentfield"], - order_by="parentfield, idx, processing_date", - limit=1, + ppcvd = qb.DocType("Process Period Closing Voucher Detail") + if to_process := ( + qb.from_(ppcvd) + .select(ppcvd.processing_date, ppcvd.report_type, ppcvd.parentfield) + .where(ppcvd.parent.eq(docname) & ppcvd.status.eq("Queued")) + .orderby(ppcvd.parentfield, ppcvd.idx, ppcvd.processing_date) + .limit(1) + .for_update(skip_locked=True) + .run(as_dict=True) ): if not is_scheduler_inactive(): frappe.db.set_value( From b9e08f3ce40f546a31157d10590bbb51986979da Mon Sep 17 00:00:00 2001 From: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com> Date: Wed, 20 May 2026 11:37:26 +0530 Subject: [PATCH 034/249] fix(stock): remove recalculate current qty function (#54774) --- .../stock_reconciliation.py | 78 ------------------- .../test_stock_reconciliation.py | 2 +- erpnext/stock/stock_ledger.py | 1 - 3 files changed, 1 insertion(+), 80 deletions(-) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index f4e8f40ebf6..3457d963b69 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -1048,84 +1048,6 @@ class StockReconciliation(StockController): else: self._cancel() - def recalculate_current_qty(self, voucher_detail_no, sle_creation, add_new_sle=False): - for row in self.items: - if voucher_detail_no != row.name: - continue - - if row.current_qty < 0: - return - - val_rate = 0.0 - current_qty = 0.0 - if row.current_serial_and_batch_bundle: - current_qty = self.get_current_qty_for_serial_or_batch(row, sle_creation) - elif row.serial_no: - item_dict = get_stock_balance_for( - row.item_code, - row.warehouse, - self.posting_date, - self.posting_time, - row=row, - company=self.company, - ) - - current_qty = item_dict.get("qty") - row.current_serial_no = item_dict.get("serial_nos") - row.current_valuation_rate = item_dict.get("rate") - val_rate = item_dict.get("rate") - elif row.batch_no: - current_qty = get_batch_qty_for_stock_reco( - row.item_code, - row.warehouse, - row.batch_no, - self.posting_date, - self.posting_time, - self.name, - sle_creation, - ) - - precesion = row.precision("current_qty") - if flt(current_qty, precesion) != flt(row.current_qty, precesion): - if not row.serial_no: - val_rate = get_incoming_rate( - frappe._dict( - { - "item_code": row.item_code, - "warehouse": row.warehouse, - "qty": current_qty * -1, - "serial_and_batch_bundle": row.current_serial_and_batch_bundle, - "batch_no": row.batch_no, - "voucher_type": self.doctype, - "voucher_no": self.name, - "company": self.company, - "posting_date": self.posting_date, - "posting_time": self.posting_time, - } - ) - ) - - row.current_valuation_rate = val_rate - row.current_qty = current_qty - row.db_set( - { - "current_qty": row.current_qty, - "current_valuation_rate": row.current_valuation_rate, - "current_amount": flt(row.current_qty * row.current_valuation_rate), - } - ) - - if add_new_sle and not frappe.db.get_value( - "Stock Ledger Entry", - {"voucher_detail_no": row.name, "actual_qty": ("<", 0), "is_cancelled": 0}, - "name", - ): - if not row.current_serial_and_batch_bundle: - self.set_current_serial_and_batch_bundle(voucher_detail_no, save=True) - row.reload() - - self.add_missing_stock_ledger_entry(row, voucher_detail_no, sle_creation) - def add_missing_stock_ledger_entry(self, row, voucher_detail_no, sle_creation): if row.current_qty == 0: return diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py index 25107ae12e6..2ad1fb42f13 100644 --- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py @@ -1044,7 +1044,7 @@ class TestStockReconciliation(ERPNextTestSuite, StockTestMixin): sr.reload() self.assertTrue(sr.items[0].serial_and_batch_bundle) - self.assertTrue(sr.items[0].current_serial_and_batch_bundle) + self.assertFalse(sr.items[0].current_serial_and_batch_bundle) def test_not_reconcile_all_batch(self): from erpnext.stock.doctype.batch.batch import get_batch_qty diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index f0d622de19f..83c7aecd38d 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -1061,7 +1061,6 @@ class update_entries_after: def reset_actual_qty_for_stock_reco(self, sle): doc = frappe.get_doc("Stock Reconciliation", sle.voucher_no) - doc.recalculate_current_qty(sle.voucher_detail_no, sle.creation, sle.actual_qty > 0) if sle.actual_qty < 0: doc.reload() From 38eeb6994c00c6eb25dc169ff96c632ce4b3cd0f Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 19 May 2026 23:31:14 +0530 Subject: [PATCH 035/249] test: fixed test cases --- .../controllers/subcontracting_controller.py | 6 +- erpnext/manufacturing/doctype/bom/bom.py | 2 +- .../doctype/work_order/test_work_order.py | 8 +- .../doctype/work_order/work_order.py | 5 +- .../stock/doctype/stock_entry/stock_entry.py | 22 +++-- .../stock_entry_handler/disassemble.py | 17 +++- .../stock_entry_handler/manufacturing.py | 85 ++++++++++++++----- .../material_receipt_issue.py | 4 +- .../stock_entry_handler/material_transfer.py | 12 +++ .../stock_entry_handler/subcontracting.py | 2 +- .../stock_entry_detail/stock_entry_detail.py | 28 ------ .../stock_entry_type/stock_entry_type.py | 6 +- .../subcontracting_inward_order.py | 13 ++- 13 files changed, 132 insertions(+), 78 deletions(-) diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py index 6e7254a9dc0..0ab520d8548 100644 --- a/erpnext/controllers/subcontracting_controller.py +++ b/erpnext/controllers/subcontracting_controller.py @@ -1403,16 +1403,18 @@ def make_rm_stock_entry( items_dict = { rm_item_code: { rm_detail_field: rm_item.get("name"), + "item_code": rm_item_code, "item_name": rm_item.get("item_name") or item_wh.get(rm_item_code, {}).get("item_name", ""), "description": item_wh.get(rm_item_code, {}).get("description", ""), "qty": qty, - "from_warehouse": rm_item.get("warehouse") + "s_warehouse": rm_item.get("warehouse") or rm_item.get("reserve_warehouse"), - "to_warehouse": source_doc.supplier_warehouse, + "t_warehouse": source_doc.supplier_warehouse, "stock_uom": rm_item.get("stock_uom"), "serial_and_batch_bundle": rm_item.get("serial_and_batch_bundle"), "main_item_code": fg_item_code, + "subcontracted_item": fg_item_code, "allow_alternative_item": item_wh.get(rm_item_code, {}).get( "allow_alternative_item" ), diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index ce59cdf4d97..87ccc105dab 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -2005,7 +2005,7 @@ def get_secondary_items_from_sub_assemblies(bom_no, company, qty, secondary_item def get_backflush_based_on(bom_no=None): backflush_based_on = None if bom_no: - backflush_based_on = frappe.get_cached_value("BOM", bom_no, "backflush_based_on") + backflush_based_on = frappe.db.get_value("BOM", bom_no, "backflush_based_on") if not backflush_based_on: backflush_based_on = frappe.db.get_single_value( diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py index 8a3dd1a46e3..4ae120ece7f 100644 --- a/erpnext/manufacturing/doctype/work_order/test_work_order.py +++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py @@ -684,7 +684,10 @@ class TestWorkOrder(ERPNextTestSuite): def test_cost_center_for_manufacture(self): wo_order = make_wo_order_test_record() - ste = make_stock_entry(wo_order.name, "Material Transfer for Manufacture", wo_order.qty) + ste = frappe.get_doc( + make_stock_entry(wo_order.name, "Material Transfer for Manufacture", wo_order.qty) + ) + ste.save() self.assertEqual(ste.get("items")[0].get("cost_center"), "_Test Cost Center - _TC") def test_operation_time_with_batch_size(self): @@ -1320,7 +1323,6 @@ class TestWorkOrder(ERPNextTestSuite): stock_entry = frappe.get_doc(make_stock_entry(wo_order.name, "Manufacture", 10)) stock_entry.set_work_order_details() - ManufactureStockEntry(stock_entry).set_serial_nos_for_finished_good() for row in stock_entry.items: if row.item_code == fg_item: self.assertTrue(row.serial_and_batch_bundle) @@ -1361,7 +1363,6 @@ class TestWorkOrder(ERPNextTestSuite): stock_entry = frappe.get_doc(make_stock_entry(wo_order.name, "Manufacture", 10)) stock_entry.set_work_order_details() - ManufactureStockEntry(stock_entry).set_serial_nos_for_finished_good() for row in stock_entry.items: if row.item_code == fg_item: self.assertTrue(row.serial_and_batch_bundle) @@ -4292,7 +4293,6 @@ class TestWorkOrder(ERPNextTestSuite): ) material_transfer_entry.submit() - manufacture_entry = frappe.get_doc(make_stock_entry(wo_order.name, "Manufacture", 1)) manufacture_entry.save() diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py index 785bdc36e64..4f99539a7da 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.py +++ b/erpnext/manufacturing/doctype/work_order/work_order.py @@ -2087,8 +2087,9 @@ class WorkOrder(Document): additional_items = frappe._dict() for row in stock_entry.items: - if row.item_code not in required_items: - additional_items.setdefault(row.item_code, []).append(row) + item_code = row.original_item if row.original_item else row.item_code + if item_code not in required_items: + additional_items.setdefault(item_code, []).append(row) self.flags.ignore_validate_update_after_submit = True diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index e6afc5798d1..7ec1eede5c2 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -255,6 +255,8 @@ class StockEntry(StockController, SubcontractingInwardController): if self.se_handler_class and hasattr(self.se_handler_class, "before_validate"): self.se_handler_class(self).before_validate() + self.set_default_cost_center() + apply_rule = self.apply_putaway_rule and (self.purpose in ["Material Transfer", "Material Receipt"]) if self.get("items") and apply_rule: @@ -268,6 +270,17 @@ class StockEntry(StockController, SubcontractingInwardController): if not item.project: item.project = self.project + def set_default_cost_center(self): + for row in self.items: + if not row.cost_center: + row.cost_center = get_default_cost_center( + row, + row, + get_item_group_defaults(row.item_code, self.company), + get_brand_defaults(row.item_code, self.company), + self.company, + ) + def validate(self): if self.se_handler_class: self.se_handler_class(self).validate() @@ -318,7 +331,6 @@ class StockEntry(StockController, SubcontractingInwardController): self.se_handler_class(self).on_submit() self.make_bundle_using_old_serial_batch_fields() - self.update_disassembled_order() self.adjust_stock_reservation_entries_for_return() self.update_stock_reservation_entries() self.update_stock_ledger() @@ -346,7 +358,6 @@ class StockEntry(StockController, SubcontractingInwardController): if self.work_order and self.purpose == "Material Consumption for Manufacture": self.validate_work_order_status() - self.update_disassembled_order() self.cancel_stock_reservation_entries_for_inward() self.update_stock_ledger() @@ -1167,13 +1178,6 @@ class StockEntry(StockController, SubcontractingInwardController): self._wo_doc = frappe.get_doc("Work Order", self.work_order) return getattr(self, "_wo_doc", None) - def update_disassembled_order(self): - if not self.work_order: - return - if self.purpose == "Disassemble" and self.fg_completed_qty: - pro_doc = frappe.get_doc("Work Order", self.work_order) - pro_doc.run_method("update_disassembled_qty", self.fg_completed_qty, self._action == "cancel") - def make_stock_reserve_for_wip_and_fg(self): if self.is_stock_reserve_for_work_order(): pro_doc = frappe.get_doc("Work Order", self.work_order) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py index 699e66ec368..ff9834917b7 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py @@ -62,7 +62,6 @@ class DisassembleStockEntry: "docstatus": 1, }, pluck="name", - limit_page_length=2, ) if len(manufacture_entries) == 1: self.doc.source_stock_entry = manufacture_entries[0] @@ -200,6 +199,8 @@ class DisassembleStockEntry: item_args["bom_secondary_item"] = row.get("name") row.qty = row.qty * self.doc.fg_completed_qty + if row.get("process_loss_per"): + row.qty -= flt(row.qty * row.get("process_loss_per") / 100) item_args["qty"] = ceil_qty_if_uom_has_whole_number(row.qty, item_args["uom"]) self.doc.append("items", item_args) @@ -284,6 +285,10 @@ class DisassembleStockEntry: def on_submit(self): self.set_serial_batch_for_disassembly() + self.update_disassembled_order() + + def on_cancel(self): + self.update_disassembled_order() def set_serial_batch_for_disassembly(self): if self.doc.get("source_stock_entry"): @@ -388,6 +393,16 @@ class DisassembleStockEntry: row.serial_and_batch_bundle = bundle_doc.name row.use_serial_batch_fields = 0 + def update_disassembled_order(self): + if not self.doc.work_order: + return + + if self.doc.fg_completed_qty: + pro_doc = frappe.get_doc("Work Order", self.doc.work_order) + pro_doc.run_method( + "update_disassembled_qty", self.doc.fg_completed_qty, self.doc._action == "cancel" + ) + def get_available_materials(work_order, stock_entry_doc=None) -> dict: data = get_stock_entry_data(work_order, stock_entry_doc=stock_entry_doc) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py index 95d12a883ad..72011725d6f 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py @@ -97,10 +97,14 @@ class BaseManufactureStockEntry: secondary_items = get_secondary_items(self.doc.bom_no, self.doc.work_order) for row in secondary_items: item_args = self.get_item_dict(row) - item_args["is_legacy_scrap_item"] = row.get("is_legacy") and row.type == "Scrap" + item_args["is_legacy_scrap_item"] = bool(row.get("is_legacy")) item_args["type"] = row.type item_args["bom_secondary_item"] = row.name - item_args["t_warehouse"] = self.doc.to_warehouse + + if row.type == "Scrap" and self.wo_doc and self.wo_doc.get("scrap_warehouse"): + item_args["t_warehouse"] = self.wo_doc.scrap_warehouse + else: + item_args["t_warehouse"] = self.doc.to_warehouse row.qty = row.qty * self.doc.fg_completed_qty if row.get("process_loss_per"): @@ -197,7 +201,7 @@ class BaseManufactureStockEntry: row = frappe._dict({"serial_nos": serial_nos[0 : cint(item_details.qty)]}) _id = create_serial_and_batch_bundle( - self.se_doc, + self.doc, row, frappe._dict( { @@ -485,11 +489,13 @@ class ManufactureStockEntry(BaseManufactureStockEntry): return alternative_items def set_alternative_item_details(self, row, alternative_item_details): - if self.doc.work_order: - row.allow_alternative_item = self.wo_doc.allow_alternative_item + if self.doc.work_order and row.get("allow_alternative_item") is None: + row["allow_alternative_item"] = self.wo_doc.allow_alternative_item - if row.allow_alternative_item: + if row["allow_alternative_item"]: + original_item = row["item_code"] row.update(alternative_item_details) + row["original_item"] = original_item def add_raw_materials_based_on_transfer(self): self.prepare_available_materials_based_on_transfer() @@ -504,18 +510,46 @@ class ManufactureStockEntry(BaseManufactureStockEntry): for row in self.available_materials: row = self.available_materials[row] item_args = self.get_item_dict(row) - qty = (flt(row.qty) * flt(self.doc.fg_completed_qty)) / pending_qty_to_mfg + if not self.doc.get("is_return"): + qty = (flt(row.qty) * flt(self.doc.fg_completed_qty)) / pending_qty_to_mfg + else: + qty = row.qty + item_args["qty"] = ceil_qty_if_uom_has_whole_number(qty, row.uom) item_args["transfer_qty"] = item_args["qty"] - if row.serial_nos or (row.batches and len(row.batches) == 1): - item_args["serial_no"] = row.serial_nos[0 : cint(qty)] - item_args["batch_no"] = next(iter(row.batches.values())) - if not item_args["uom"]: - item_args["uom"] = row.stock_uom + if not self.doc.get("is_return"): + item_args["t_warehouse"] = None + item_args["s_warehouse"] = row.warehouse + else: + # In case of return, source and target warehouse will be swapped + item_args["s_warehouse"] = row.s_warehouse + item_args["t_warehouse"] = row.t_warehouse + + if row.serial_nos or row.batches: + self.assign_serial_batches_to_materials(item_args, row, qty) + else: self.doc.append("items", item_args) - elif row.batches: - self.split_items_based_on_batches(qty, item_args, row) + + def assign_serial_batches_to_materials(self, item_args, row, qty): + if row.serial_nos: + if serial_nos := row.serial_nos[0 : cint(qty)]: + item_args["serial_no"] = "\n".join(serial_nos) + + if not item_args["uom"]: + item_args["uom"] = row.stock_uom + + item_args["use_serial_batch_fields"] = 1 + self.doc.append("items", item_args) + elif row.batches and len(row.batches) == 1: + item_args["batch_no"] = next(iter(row.batches.keys())) + if not item_args["uom"]: + item_args["uom"] = row.stock_uom + + item_args["use_serial_batch_fields"] = 1 + self.doc.append("items", item_args) + elif row.batches: + self.split_items_based_on_batches(qty, item_args, row) def split_items_based_on_batches(self, qty, item_args, row): for batch_no, batch_qty in row.batches.items(): @@ -533,7 +567,9 @@ class ManufactureStockEntry(BaseManufactureStockEntry): if not item_args["uom"]: item_args["uom"] = row.stock_uom + item_args["batch_no"] = batch_no item_args["transfer_qty"] = item_args["qty"] + item_args["use_serial_batch_fields"] = 1 self.doc.append("items", item_args) @@ -577,8 +613,8 @@ class ManufactureStockEntry(BaseManufactureStockEntry): key = (row.item_code, row.warehouse) if key not in self.available_materials: self.available_materials[key] = frappe._dict(row) - - self.available_materials[key].qty += row.qty + else: + self.available_materials[key].qty += row.qty if row.serial_and_batch_bundle: self.available_materials[key].update(self.get_sabb_details(row.serial_and_batch_bundle)) @@ -835,9 +871,19 @@ def get_bom_items(bom_no, use_multi_level_bom=None, qty=None, fetch_secondary_it doctype.conversion_factor, ) elif table_name == "BOM Item": - query = query.select(doctype.allow_alternative_item, doctype.uom, doctype.conversion_factor) + query = query.select( + doctype.allow_alternative_item, doctype.uom, doctype.conversion_factor, doctype.bom_no + ) - return query.run(as_dict=1) + items = query.run(as_dict=1) + item_dict = {} + for item in items: + if item.item_code in item_dict: + item_dict[item.item_code].qty += item.qty + else: + item_dict[item.item_code] = item + + return list(item_dict.values()) def get_secondary_items(bom_no, work_order=None): @@ -856,13 +902,12 @@ def get_secondary_items(bom_no, work_order=None): def get_secondary_items_from_sub_assemblies(bom_no): items = [] bom_items = get_bom_items(bom_no) - items.extend(bom_items) for row in bom_items: if not row.bom_no: continue items.extend(get_bom_items(row.bom_no, qty=row.qty, fetch_secondary_items=True)) - get_secondary_items_from_sub_assemblies(row.bom_no) + items.extend(get_secondary_items_from_sub_assemblies(row.bom_no)) return items diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py index 3d5fa95c730..8908c0f9730 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py @@ -17,9 +17,9 @@ class MaterialReceiptStockEntry: def set_default_warehouse(self): for row in self.doc.items: + row.s_warehouse = None if not row.t_warehouse and self.doc.to_warehouse: row.t_warehouse = self.doc.to_warehouse - row.s_warehouse = None def validate_warehouse(self): for row in self.doc.items: @@ -33,9 +33,9 @@ class BaseMaterialIssueStockEntry: def set_default_warehouse(self): for row in self.doc.items: + row.t_warehouse = None if not row.s_warehouse and self.doc.from_warehouse: row.s_warehouse = self.doc.from_warehouse - row.t_warehouse = None def validate_warehouse(self): for row in self.doc.items: diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py index 1b775eb75d0..cb658f7a121 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py @@ -131,6 +131,14 @@ class MaterialTransferForManufactureStockEntry(BaseMaterialTransferStockEntry): title=_("Missing Item"), ) + def get_matched_items(self, item_code): + items = [item for item in self.doc.items if item.s_warehouse] + for row in items: + if row.item_code == item_code or row.original_item == item_code: + return row + + return {} + def add_items(self): item_dict = self.get_pending_raw_materials() if self.doc.to_warehouse and self.wo_doc: @@ -189,6 +197,10 @@ class MaterialTransferForManufactureStockEntry(BaseMaterialTransferStockEntry): else: item_dict[item]["qty"] = 0 + item_dict[item]["transfer_qty"] = flt(item_dict[item]["qty"]) * flt( + item_dict[item].get("conversion_factor") or 1 + ) + # delete items with 0 qty list_of_items = list(item_dict.keys()) for item in list_of_items: diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py index 9dac0f1dd40..9c3546d34d7 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py @@ -91,7 +91,7 @@ class SendToSubcontractorStockEntry: ) def validate_subcontracting_order_for_transfer(self, child_row): - if not self.doc.subcontracted_item: + if not child_row.subcontracted_item: frappe.throw( _("Row {0}: Subcontracted Item is mandatory for the raw material {1}").format( child_row.idx, bold(child_row.item_code) diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py index 6d9e40052b1..5b933427ee4 100644 --- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py +++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py @@ -196,7 +196,6 @@ class StockEntryDetail(Document): ) def set_actual_qty(self, posting_date, posting_time): - allow_negative_stock = is_negative_stock_allowed(item_code=self.item_code) previous_sle = get_previous_sle( { "item_code": self.item_code, @@ -209,33 +208,6 @@ class StockEntryDetail(Document): # get actual stock at source warehouse self.actual_qty = previous_sle.get("qty_after_transaction") or 0 - # validate qty during submit - if ( - self.docstatus == 1 - and self.s_warehouse - and not allow_negative_stock - and flt(self.actual_qty, self.precision("actual_qty")) - < flt(self.transfer_qty, self.precision("actual_qty")) - ): - frappe.throw( - _( - "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" - ).format( - self.idx, - bold(self.s_warehouse), - formatdate(posting_date), - format_time(posting_time), - bold(self.item_code), - ) - + "

" - + _("Available quantity is {0}, you need {1}").format( - bold(flt(self.actual_qty, self.precision("actual_qty"))), - bold(self.transfer_qty), - ), - NegativeStockError, - title=_("Insufficient Stock"), - ) - def delink_asset_repair_sabb(self, asset_repair): if not self.serial_and_batch_bundle: return diff --git a/erpnext/stock/doctype/stock_entry_type/stock_entry_type.py b/erpnext/stock/doctype/stock_entry_type/stock_entry_type.py index 9a3f5d39055..4e4acd38da7 100644 --- a/erpnext/stock/doctype/stock_entry_type/stock_entry_type.py +++ b/erpnext/stock/doctype/stock_entry_type/stock_entry_type.py @@ -122,10 +122,10 @@ class ManufactureEntry: if backflush_based_on != "BOM": available_serial_batches = self.get_transferred_serial_batches() - items_list = [] for item_code, _dict in item_dict.items(): _dict.from_warehouse = self.source_wh.get(item_code) or self.wip_warehouse _dict.to_warehouse = "" + _dict.item_code = item_code if backflush_based_on != "BOM" and not frappe.db.get_value( "Job Card", self.job_card, "skip_material_transfer" @@ -139,9 +139,7 @@ class ManufactureEntry: _dict.qty = calculated_qty self.update_available_serial_batches(_dict, available_serial_batches) - items_list.append(_dict) - - self.stock_entry.append("items", items_list) + self.stock_entry.append("items", _dict) def parse_available_serial_batches(self, item_dict, available_serial_batches): key = (item_dict.item_code, item_dict.from_warehouse) diff --git a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py index c3b5358e9d5..db44245e2ce 100644 --- a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py +++ b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py @@ -372,8 +372,9 @@ class SubcontractingInwardOrder(SubcontractingController): items_dict = { rm_item.get("rm_item_code"): { "scio_detail": rm_item.get("name"), + "item_code": rm_item.get("rm_item_code"), "qty": calculate_qty_as_per_bom(rm_item), - "to_warehouse": rm_item.get("warehouse"), + "t_warehouse": rm_item.get("warehouse"), "stock_uom": rm_item.get("stock_uom"), } } @@ -413,8 +414,9 @@ class SubcontractingInwardOrder(SubcontractingController): items_dict = { rm_item.get("rm_item_code"): { "scio_detail": rm_item.get("name"), + "item_code": rm_item.get("rm_item_code"), "qty": rm_item.received_qty - rm_item.work_order_qty - rm_item.returned_qty, - "from_warehouse": rm_item.get("warehouse"), + "s_warehouse": rm_item.get("warehouse"), "stock_uom": rm_item.get("stock_uom"), } } @@ -465,7 +467,8 @@ class SubcontractingInwardOrder(SubcontractingController): items_dict = { fg_item.item_code: { "qty": qty, - "from_warehouse": fg_item.delivery_warehouse, + "item_code": fg_item.item_code, + "s_warehouse": fg_item.delivery_warehouse, "stock_uom": fg_item.stock_uom, "scio_detail": fg_item.name, "is_finished_item": 1, @@ -490,7 +493,8 @@ class SubcontractingInwardOrder(SubcontractingController): items_dict = { secondary_item.item_code: { "qty": secondary_item.produced_qty - secondary_item.delivered_qty, - "from_warehouse": secondary_item.warehouse, + "item_code": secondary_item.item_code, + "s_warehouse": secondary_item.warehouse, "stock_uom": secondary_item.stock_uom, "scio_detail": secondary_item.name, "type": secondary_item.type, @@ -536,6 +540,7 @@ class SubcontractingInwardOrder(SubcontractingController): items_dict = { fg_item.item_code: { "qty": qty, + "item_code": fg_item.item_code, "stock_uom": fg_item.stock_uom, "scio_detail": fg_item.name, "is_finished_item": 1, From 12bb86d688fe6372c5c3bf6a3c58ccaa2896c609 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Wed, 20 May 2026 12:58:01 +0530 Subject: [PATCH 036/249] chore: remove frappe-semgrep-rules submodule (#55083) --- frappe-semgrep-rules | 1 - 1 file changed, 1 deletion(-) delete mode 160000 frappe-semgrep-rules diff --git a/frappe-semgrep-rules b/frappe-semgrep-rules deleted file mode 160000 index a05bce32ad3..00000000000 --- a/frappe-semgrep-rules +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a05bce32ad3e37cf9a87a6913e9b08e45c8ba8cf From eb67afa01aeb758d706bf2879c77001fdb7f42f3 Mon Sep 17 00:00:00 2001 From: MochaMind Date: Wed, 20 May 2026 13:53:53 +0530 Subject: [PATCH 037/249] fix: sync translations from crowdin (#55065) --- erpnext/locale/fa.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/erpnext/locale/fa.po b/erpnext/locale/fa.po index 4ce9b0462b6..ddb270d4e00 100644 --- a/erpnext/locale/fa.po +++ b/erpnext/locale/fa.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" "POT-Creation-Date: 2026-05-17 10:04+0000\n" -"PO-Revision-Date: 2026-05-18 20:21\n" +"PO-Revision-Date: 2026-05-19 20:28\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -2285,7 +2285,7 @@ msgstr "" #. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Action if same rate is not maintained" -msgstr "" +msgstr "اقدام در صورت عدم حفظ نرخ یکسان" #. Label of the maintain_same_rate_action (Select) field in DocType 'Selling #. Settings' @@ -4082,7 +4082,7 @@ msgstr "اجازه افزودن یک آیتم چندین بار در یک ترا #. Label of the allow_multiple_items (Check) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Allow Item to be added multiple times in a transaction" -msgstr "" +msgstr "اجازه دهید آیتم چندین بار در یک تراکنش اضافه شود" #. Label of the allow_lead_duplication_based_on_emails (Check) field in DocType #. 'CRM Settings' @@ -6194,7 +6194,7 @@ msgstr "مقدار ویژگی" #: erpnext/stock/doctype/item/item.py:896 msgid "Attribute Value {0} is not valid for the selected attribute {1}." -msgstr "" +msgstr "مقدار ویژگی {0} برای ویژگی انتخاب شده {1} معتبر نیست." #: erpnext/stock/doctype/item/item.py:1042 msgid "Attribute table is mandatory" @@ -6206,11 +6206,11 @@ msgstr "مقدار مشخصه: {0} باید فقط یک بار ظاهر شود" #: erpnext/stock/doctype/item/item.py:890 msgid "Attribute {0} is disabled." -msgstr "" +msgstr "ویژگی {0} غیرفعال است." #: erpnext/stock/doctype/item/item.py:878 msgid "Attribute {0} is not valid for the selected template." -msgstr "" +msgstr "ویژگی {0} برای الگوی انتخاب شده معتبر نیست." #: erpnext/stock/doctype/item/item.py:1046 msgid "Attribute {0} selected multiple times in Attributes Table" @@ -6404,13 +6404,13 @@ msgstr "بستن خودکار فرصت پاسخ‌داده‌شده پس از ت #. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Auto create Purchase Receipt" -msgstr "" +msgstr "ایجاد خودکار رسید خرید" #. Label of the auto_create_subcontracting_order (Check) field in DocType #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Auto create Subcontracting Order" -msgstr "" +msgstr "ایجاد خودکار سفارش پیمانکاری فرعی" #. Label of the auto_create_assets (Check) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json @@ -16959,7 +16959,7 @@ msgstr "غیر فعال کردن به حروف" #: erpnext/accounts/report/general_ledger/general_ledger.js:182 msgid "Disable Opening Balance Calculation" -msgstr "" +msgstr "غیرفعال کردن محاسبه تراز اولیه" #. Label of the disable_rounded_total (Check) field in DocType 'POS Profile' #. Label of the disable_rounded_total (Check) field in DocType 'Purchase @@ -17004,7 +17004,7 @@ msgstr "" #. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Disable last purchase rate" -msgstr "" +msgstr "غیرفعال کردن آخرین نرخ خرید" #. Description of the 'Disabled' (Check) field in DocType 'Financial Report #. Template' @@ -29052,7 +29052,7 @@ msgstr "" #. Label of the maintain_same_rate (Check) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Maintain same rate throughout the purchase cycle" -msgstr "" +msgstr "حفظ نرخ یکسان در طول چرخه خرید" #. Group in Asset's connections #. Label of a Card Break in the Assets Workspace @@ -59736,7 +59736,7 @@ msgstr "" #. (Check) field in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Warn or stop if Item rate is changed in Purchase Invoice or Purchase Receipt generated from a Purchase Order." -msgstr "" +msgstr "در صورت تغییر نرخ آیتم در فاکتور خرید یا رسید خرید تولیدشده از سفارش خرید، هشدار دهید یا متوقف کنید." #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.py:134 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours" @@ -59862,7 +59862,7 @@ msgstr "" #: banking/src/pages/BankStatementImporter.tsx:140 msgid "We support uploading CSV, XLSX and XLS files. Please make sure the file contains the correct columns." -msgstr "" +msgstr "ما از آپلود فایل‌های CSV، XLSX و XLS پشتیبانی می‌کنیم. لطفاً مطمئن شوید که فایل حاوی ستون‌های صحیح است." #: erpnext/www/support/index.html:7 msgid "We're here to help!" From 6c6fa722af8e12936903b4a9536dbfedd028d190 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Wed, 20 May 2026 14:09:24 +0530 Subject: [PATCH 038/249] chore: migrate Address/Contact custom fields from JSON fixtures to install (#55084) Co-authored-by: Claude Sonnet 4.6 --- erpnext/accounts/custom/address.json | 126 ------------------ .../erpnext_integrations/custom/contact.json | 60 --------- erpnext/patches.txt | 1 + .../migrate_address_contact_custom_fields.py | 16 +++ erpnext/setup/install.py | 32 +++++ 5 files changed, 49 insertions(+), 186 deletions(-) delete mode 100644 erpnext/accounts/custom/address.json delete mode 100644 erpnext/erpnext_integrations/custom/contact.json create mode 100644 erpnext/patches/v16_0/migrate_address_contact_custom_fields.py diff --git a/erpnext/accounts/custom/address.json b/erpnext/accounts/custom/address.json deleted file mode 100644 index 5c921da9b7a..00000000000 --- a/erpnext/accounts/custom/address.json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "custom_fields": [ - { - "_assign": null, - "_comments": null, - "_liked_by": null, - "_user_tags": null, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "collapsible_depends_on": null, - "columns": 0, - "creation": "2018-12-28 22:29:21.828090", - "default": null, - "depends_on": null, - "description": null, - "docstatus": 0, - "dt": "Address", - "fetch_from": null, - "fetch_if_empty": 0, - "fieldname": "tax_category", - "fieldtype": "Link", - "hidden": 0, - "hide_border": 0, - "hide_days": 0, - "hide_seconds": 0, - "idx": 15, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_preview": 0, - "in_standard_filter": 0, - "insert_after": "fax", - "label": "Tax Category", - "length": 0, - "mandatory_depends_on": null, - "modified": "2018-12-28 22:29:21.828090", - "modified_by": "Administrator", - "name": "Address-tax_category", - "no_copy": 0, - "options": "Tax Category", - "owner": "Administrator", - "parent": null, - "parentfield": null, - "parenttype": null, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "print_width": null, - "read_only": 0, - "read_only_depends_on": null, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "translatable": 0, - "unique": 0, - "width": null - }, - { - "_assign": null, - "_comments": null, - "_liked_by": null, - "_user_tags": null, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "collapsible_depends_on": null, - "columns": 0, - "creation": "2020-10-14 17:41:40.878179", - "default": "0", - "depends_on": null, - "description": null, - "docstatus": 0, - "dt": "Address", - "fetch_from": null, - "fetch_if_empty": 0, - "fieldname": "is_your_company_address", - "fieldtype": "Check", - "hidden": 0, - "hide_border": 0, - "hide_days": 0, - "hide_seconds": 0, - "idx": 20, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_preview": 0, - "in_standard_filter": 0, - "insert_after": "linked_with", - "label": "Is Your Company Address", - "length": 0, - "mandatory_depends_on": null, - "modified": "2020-10-14 17:41:40.878179", - "modified_by": "Administrator", - "name": "Address-is_your_company_address", - "no_copy": 0, - "options": null, - "owner": "Administrator", - "parent": null, - "parentfield": null, - "parenttype": null, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "print_width": null, - "read_only": 0, - "read_only_depends_on": null, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "translatable": 0, - "unique": 0, - "width": null - } - ], - "custom_perms": [], - "doctype": "Address", - "property_setters": [], - "sync_on_migrate": 1 -} \ No newline at end of file diff --git a/erpnext/erpnext_integrations/custom/contact.json b/erpnext/erpnext_integrations/custom/contact.json deleted file mode 100644 index 98a4bbc795b..00000000000 --- a/erpnext/erpnext_integrations/custom/contact.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "custom_fields": [ - { - "_assign": null, - "_comments": null, - "_liked_by": null, - "_user_tags": null, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "collapsible_depends_on": null, - "columns": 0, - "creation": "2019-12-02 11:00:03.432994", - "default": null, - "depends_on": null, - "description": null, - "docstatus": 0, - "dt": "Contact", - "fetch_from": null, - "fetch_if_empty": 0, - "fieldname": "is_billing_contact", - "fieldtype": "Check", - "hidden": 0, - "idx": 27, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "insert_after": "is_primary_contact", - "label": "Is Billing Contact", - "length": 0, - "modified": "2019-12-02 11:00:03.432994", - "modified_by": "Administrator", - "name": "Contact-is_billing_contact", - "no_copy": 0, - "options": null, - "owner": "Administrator", - "parent": null, - "parentfield": null, - "parenttype": null, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "print_width": null, - "read_only": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "translatable": 0, - "unique": 0, - "width": null - } - ], - "custom_perms": [], - "doctype": "Contact", - "property_setters": [], - "sync_on_migrate": 1 -} \ No newline at end of file diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 805876f2ccc..b17841bade5 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -482,3 +482,4 @@ erpnext.patches.v16_0.scr_inv_dimension erpnext.patches.v16_0.packed_item_inv_dimen erpnext.patches.v16_0.set_not_applicable_on_german_item_tax_templates erpnext.patches.v16_0.clear_procedures_from_receivable_report +erpnext.patches.v16_0.migrate_address_contact_custom_fields diff --git a/erpnext/patches/v16_0/migrate_address_contact_custom_fields.py b/erpnext/patches/v16_0/migrate_address_contact_custom_fields.py new file mode 100644 index 00000000000..6edce540eff --- /dev/null +++ b/erpnext/patches/v16_0/migrate_address_contact_custom_fields.py @@ -0,0 +1,16 @@ +import frappe + +from erpnext.setup.install import create_address_and_contact_custom_fields + + +def execute(): + """Replace fixture-based custom fields on Address and Contact with programmatic ones.""" + for custom_field in ( + "Address-tax_category", + "Address-is_your_company_address", + "Contact-is_billing_contact", + ): + if frappe.db.exists("Custom Field", custom_field): + frappe.delete_doc("Custom Field", custom_field, ignore_missing=True, force=True) + + create_address_and_contact_custom_fields() diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index b80ad82c9d3..043ac0a7193 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -25,6 +25,7 @@ def after_install(): setup_repost_defaults() create_print_setting_custom_fields() create_marketing_campaign_custom_fields() + create_address_and_contact_custom_fields() create_custom_company_links() add_all_roles_to("Administrator") create_default_success_action() @@ -145,6 +146,37 @@ def create_marketing_campaign_custom_fields(): ) +def create_address_and_contact_custom_fields(): + create_custom_fields( + { + "Address": [ + { + "label": _("Tax Category"), + "fieldname": "tax_category", + "fieldtype": "Link", + "options": "Tax Category", + "insert_after": "fax", + }, + { + "label": _("Is Your Company Address"), + "fieldname": "is_your_company_address", + "fieldtype": "Check", + "default": "0", + "insert_after": "linked_with", + }, + ], + "Contact": [ + { + "label": _("Is Billing Contact"), + "fieldname": "is_billing_contact", + "fieldtype": "Check", + "insert_after": "is_primary_contact", + }, + ], + } + ) + + def create_default_success_action(): for success_action in get_default_success_action(): if not frappe.db.exists("Success Action", success_action.get("ref_doctype")): From a3950590da9efb5373c4a163e26433b0bcf1c042 Mon Sep 17 00:00:00 2001 From: Pandiyan P Date: Wed, 20 May 2026 14:22:17 +0530 Subject: [PATCH 039/249] fix(manufacturing): fetch from_bom name in production plan (#55085) --- .../manufacturing/doctype/production_plan/production_plan.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py index 5c345666df0..02b7ad06bd2 100644 --- a/erpnext/manufacturing/doctype/production_plan/production_plan.py +++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py @@ -1314,6 +1314,7 @@ def get_exploded_items(item_details, company, bom_no, include_non_stock_items, p item_uom.conversion_factor, item.safety_stock, bom.item.as_("main_bom_item"), + bom.name.as_("main_bom"), ) .where( (bei.docstatus < 2) @@ -1383,6 +1384,7 @@ def get_subitems( item.purchase_uom, item_uom.conversion_factor, bom.item.as_("main_bom_item"), + bom.name.as_("main_bom"), bom_item.is_phantom_item, ) .where( From bd84434d34065207feca2ce05157542828884dec Mon Sep 17 00:00:00 2001 From: Shllokkk <140623894+Shllokkk@users.noreply.github.com> Date: Wed, 20 May 2026 14:41:06 +0530 Subject: [PATCH 040/249] fix: incorrect error message string in sales order (#55090) --- erpnext/selling/doctype/sales_order/sales_order.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 4f2df0223f7..ae9f57bee2d 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -454,7 +454,7 @@ class SalesOrder(SellingController): and not cint(d.delivered_by_supplier) ): frappe.throw( - _("Delivery warehouse required for stock item {0}").format(d.item_code), WarehouseRequired + _("Source warehouse required for stock item {0}").format(d.item_code), WarehouseRequired ) def validate_with_previous_doc(self): From 4c8f95a1a521032b6a7845d4e429aa467694acb0 Mon Sep 17 00:00:00 2001 From: soham7117 Date: Fri, 15 May 2026 16:47:13 +0530 Subject: [PATCH 041/249] feat: added cost of goods sold Signed-off-by: soham7117 --- .../chart_of_accounts/verified/philippines.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/philippines.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/philippines.json index ea3977711a7..f096dcbed79 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/philippines.json +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/philippines.json @@ -570,6 +570,18 @@ "account_number": "5000", "is_group": 1, "root_type": "Expense", + + "Cost of Goods Sold": { + "account_number": "5001", + "is_group": 1, + "root_type": "Expense", + "Cost of Goods Sold": { + "account_number": "5010", + "is_group": 0, + "root_type": "Expense", + "account_type": "Cost of Goods Sold" + } + }, "Operating Expenses": { "account_number": "5100", "is_group": 1, From 88f6f182e3753ba59a9b9eca8a3dd90e1fa26992 Mon Sep 17 00:00:00 2001 From: soham7117 Date: Wed, 20 May 2026 14:25:51 +0530 Subject: [PATCH 042/249] feat: removed extra page break Signed-off-by: soham7117 --- .../doctype/account/chart_of_accounts/verified/philippines.json | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/philippines.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/philippines.json index f096dcbed79..30a3baf83e2 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/philippines.json +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/philippines.json @@ -570,7 +570,6 @@ "account_number": "5000", "is_group": 1, "root_type": "Expense", - "Cost of Goods Sold": { "account_number": "5001", "is_group": 1, From 0bbddf49941affeb7855f187e40a8bd0756a8139 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 20 May 2026 15:16:05 +0530 Subject: [PATCH 043/249] fix: set bin details when adding item using update items (#55096) --- erpnext/controllers/accounts_controller.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 36dd0ddb88c..ee65b43d640 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -73,6 +73,7 @@ from erpnext.stock.get_item_details import ( ItemDetailsCtx, _get_item_tax_template, _get_item_tax_template_from_item_group, + get_bin_details, get_conversion_factor, get_item_details, get_item_tax_map, @@ -3753,6 +3754,7 @@ def set_order_defaults(parent_doctype, parent_doctype_name, child_doctype, child child_item.warehouse = get_item_warehouse_(p_doc, item, overwrite_warehouse=True) conversion_factor = flt(get_conversion_factor(item.item_code, child_item.uom).get("conversion_factor")) child_item.conversion_factor = flt(trans_item.get("conversion_factor")) or conversion_factor + child_item.update(get_bin_details(child_item.item_code, child_item.warehouse, p_doc.get("company"))) if child_doctype in ["Purchase Order Item", "Supplier Quotation Item"]: # Initialized value will update in parent validation From 00057b179888a9744be6a153799f52512f4694ce Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 20 May 2026 16:58:01 +0530 Subject: [PATCH 044/249] =?UTF-8?q?fix:=20valuation=20rate=20missing=20for?= =?UTF-8?q?=20standalone=20credit=20notes=20for=20moving=20av=E2=80=A6=20(?= =?UTF-8?q?#55102)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erpnext/controllers/selling_controller.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index 01d9231ccb5..4a7cae8fcfd 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -579,6 +579,7 @@ class SellingController(StockController): or ( get_valuation_method(d.item_code, self.company) == "Moving Average" and self.get("is_return") + and not is_standalone ) ): d.incoming_rate = get_incoming_rate( From 3084e3654c32c954a97412db15d540ae3dc5ff03 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 20 May 2026 17:18:15 +0530 Subject: [PATCH 045/249] fix: item price with party condition (#55100) --- erpnext/stock/doctype/batch/test_batch.py | 1 + erpnext/stock/doctype/item/test_item.py | 1 + erpnext/stock/get_item_details.py | 13 ++++++++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/batch/test_batch.py b/erpnext/stock/doctype/batch/test_batch.py index 1ba25cb44f3..ed4a8c5509c 100644 --- a/erpnext/stock/doctype/batch/test_batch.py +++ b/erpnext/stock/doctype/batch/test_batch.py @@ -543,6 +543,7 @@ class TestBatch(ERPNextTestSuite): "plc_conversion_rate": 1, "customer": "_Test Customer", "name": None, + "qty": 1, } ) diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py index 5404c58fb07..0725dacc18b 100644 --- a/erpnext/stock/doctype/item/test_item.py +++ b/erpnext/stock/doctype/item/test_item.py @@ -161,6 +161,7 @@ class TestItem(ERPNextTestSuite): "conversion_factor": 1, "price_list_uom_dependant": 1, "ignore_pricing_rule": 1, + "qty": 1, } ) ) diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 69553153efa..4e9126c40c1 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -1202,9 +1202,15 @@ def get_item_price( if not ignore_party: if pctx.customer: - query = query.where(ip.customer == pctx.customer) + query = query.where( + (ip.customer == pctx.customer) + | ((IfNull(ip.customer, "") == "") & (IfNull(ip.supplier, "") == "")) + ).orderby(IfNull(ip.customer, ""), order=frappe.qb.desc) elif pctx.supplier: - query = query.where(ip.supplier == pctx.supplier) + query = query.where( + (ip.supplier == pctx.supplier) + | ((IfNull(ip.customer, "") == "") & (IfNull(ip.supplier, "") == "")) + ).orderby(IfNull(ip.supplier, ""), order=frappe.qb.desc) else: query = query.where((IfNull(ip.customer, "") == "") & (IfNull(ip.supplier, "") == "")) @@ -1262,9 +1268,6 @@ def get_price_list_rate_for(ctx: ItemDetailsCtx, item_code: str): if desired_qty and check_packing_list(price_list_rate[0].name, desired_qty, item_code): item_price_data = price_list_rate else: - for field in ["customer", "supplier"]: - del pctx[field] - general_price_list_rate = get_item_price(pctx, item_code, ignore_party=ctx.get("ignore_party")) if not general_price_list_rate and ctx.get("uom") != ctx.get("stock_uom"): From 8845be94199a3e5426cf30d578bee2b4f3f5708a Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Wed, 20 May 2026 18:03:21 +0200 Subject: [PATCH 046/249] fix: allow direct drop-ship on Purchase Orders without Sales Order (#54930) --- .../doctype/purchase_order/purchase_order.js | 4 +- .../doctype/purchase_order/purchase_order.py | 13 ++- .../purchase_order/test_purchase_order.py | 82 +++++++++++++++++++ .../purchase_order_item.json | 6 +- erpnext/stock/doctype/item/item.json | 4 +- erpnext/stock/get_item_details.py | 4 +- 6 files changed, 100 insertions(+), 13 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 54b9a2a0ca1..85c159ed491 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -333,7 +333,7 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends ( if (is_drop_ship && !["Completed", "Delivered"].includes(doc.status)) { this.frm.add_custom_button( __("Deliver (Dropship)"), - this.delivered_by_supplier.bind(this), + this.update_dropship_delivered_qty.bind(this), __("Status") ); @@ -698,7 +698,7 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends ( this.frm.cscript.update_status("Close", "Closed"); } - delivered_by_supplier() { + update_dropship_delivered_qty() { const data = this.frm.doc.items .filter((item) => item.delivered_by_supplier == 1) .map((item) => { diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index 6a621fb6774..ba928c6dbb7 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -664,12 +664,21 @@ class PurchaseOrder(BuyingController): if not self.is_against_so(): return for item in removed_items: + sales_order_item = item.get("sales_order_item") + if not sales_order_item: + continue + prev_ordered_qty = flt( - frappe.get_cached_value("Sales Order Item", item.get("sales_order_item"), "ordered_qty") + frappe.get_cached_value("Sales Order Item", sales_order_item, "ordered_qty") + ) + # `Sales Order Item.ordered_qty` is tracked in stock UOM (see status_updater); + # use the row's stock_qty so PO UOMs that differ from stock UOM decrement correctly. + qty_in_stock_uom = flt(item.get("stock_qty")) or flt(item.qty) * flt( + item.get("conversion_factor") or 1 ) frappe.db.set_value( - "Sales Order Item", item.get("sales_order_item"), "ordered_qty", prev_ordered_qty - item.qty + "Sales Order Item", sales_order_item, "ordered_qty", prev_ordered_qty - qty_in_stock_uom ) def auto_create_subcontracting_order(self): diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py index e99bc94b8e7..c361e66229e 100644 --- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py @@ -1436,6 +1436,88 @@ class TestPurchaseOrder(ERPNextTestSuite): pi2 = make_pi_from_po(po.name) self.assertEqual(len(pi2.items), 2) + def test_get_item_details_propagates_drop_ship_flag_to_po(self): + """`get_item_details` should propagate the Item master's + `delivered_by_supplier` flag to Purchase Orders, not only to Sales + Orders/Invoices, so that POs can be created as drop-ship directly + (via the standard item lookup the form uses) without going through + the Sales Order → Purchase Order mapping pipeline. + """ + from erpnext.stock.get_item_details import ItemDetailsCtx, get_item_details + + item = make_item("_Test Drop Ship From Master", {"is_stock_item": 1, "delivered_by_supplier": 1}) + + ctx = ItemDetailsCtx( + { + "item_code": item.item_code, + "doctype": "Purchase Order", + "company": "_Test Company", + "supplier": "_Test Supplier", + "transaction_date": nowdate(), + "currency": "INR", + "conversion_rate": 1.0, + "buying_price_list": "Standard Buying", + "price_list_currency": "INR", + "plc_conversion_rate": 1.0, + "qty": 1, + } + ) + + details = get_item_details(ctx, frappe.new_doc("Purchase Order")) + self.assertEqual(details.get("delivered_by_supplier"), 1) + + def test_drop_ship_po_allows_non_company_shipping_address_without_so(self): + """A PO with a drop-ship item should save with a non-company shipping + address even when there is no linked Sales Order. + Regression test for https://github.com/frappe/erpnext/issues/51629. + """ + from erpnext.crm.doctype.prospect.test_prospect import make_address + + item = make_item("_Test Drop Ship Direct PO", {"is_stock_item": 1, "delivered_by_supplier": 1}) + + customer_shipping = make_address( + address_title="Drop Ship Direct PO", address_type="Shipping", address_line1="1" + ) + customer_shipping.append("links", {"link_doctype": "Customer", "link_name": "_Test Customer"}) + customer_shipping.save() + + po = create_purchase_order(item=item.item_code, qty=1, do_not_save=True) + # In the UI, `get_item_details` propagates the master flag to the row when + # the item is added; here we simulate that step explicitly. + po.items[0].delivered_by_supplier = 1 + po.items[0].warehouse = "" + po.shipping_address = customer_shipping.name + po.save() + + self.assertEqual(po.items[0].delivered_by_supplier, 1) + self.assertFalse(po.items[0].warehouse) + self.assertEqual(po.shipping_address, customer_shipping.name) + + def test_drop_ship_flag_overridable_per_po_line(self): + """The drop-ship default from the Item master should be overridable + on individual PO lines (e.g. ordering a normally drop-shipped item + into the own warehouse for samples or stock). + """ + item = make_item("_Test Drop Ship Override", {"is_stock_item": 1, "delivered_by_supplier": 1}) + + po = create_purchase_order(item=item.item_code, qty=1, do_not_save=True) + po.items[0].delivered_by_supplier = 0 + po.save() + + self.assertEqual(po.items[0].delivered_by_supplier, 0) + self.assertEqual(po.items[0].warehouse, "_Test Warehouse - _TC") + + def test_remove_unlinked_item_from_mixed_po_does_not_crash(self): + """In a PO that mixes SO-linked and freely-added items, removing an + item that has no `sales_order_item` via Update Items must not crash + on the missing reference. + """ + po = create_purchase_order(do_not_submit=True) + # Force the SO codepath without needing a real linked Sales Order: + po.items[0].sales_order = "DUMMY-SO" + + po.update_ordered_qty_in_so_for_removed_items([frappe._dict({"sales_order_item": None, "qty": 1})]) + def create_po_for_sc_testing(): from erpnext.controllers.tests.test_subcontracting_controller import ( diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json index 2479a00e2de..8db422fee7c 100644 --- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -539,12 +539,10 @@ }, { "default": "0", - "depends_on": "delivered_by_supplier", "fieldname": "delivered_by_supplier", "fieldtype": "Check", "label": "To be Delivered to Customer", - "print_hide": 1, - "read_only": 1 + "print_hide": 1 }, { "depends_on": "eval:doc.against_blanket_order", @@ -941,7 +939,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2026-05-14 12:16:16.192936", + "modified": "2026-05-20 00:50:16.192936", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order Item", diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index 1f2581a4981..699379d3501 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -648,7 +648,7 @@ }, { "default": "0", - "description": "Enable for drop shipping - supplier delivers directly to the customer without passing through your warehouse.", + "description": "If checked, this item is treated as drop-shipped by default in Sales Orders, Sales Invoices and Purchase Orders. The flag can be overridden on each transaction line.", "fieldname": "delivered_by_supplier", "fieldtype": "Check", "label": "Delivered by Supplier (Drop Ship)", @@ -1077,7 +1077,7 @@ "image_field": "image", "links": [], "make_attachments_public": 1, - "modified": "2026-04-28 17:31:47.613279", + "modified": "2026-05-14 02:09:33.455292", "modified_by": "Administrator", "module": "Stock", "name": "Item", diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 4e9126c40c1..d40511d5e2c 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -493,9 +493,7 @@ def get_basic_details(ctx: ItemDetailsCtx, item, overwrite_warehouse=True) -> It "discount_percentage": 0.0, "discount_amount": flt(ctx.discount_amount) or 0.0, "update_stock": ctx.update_stock if ctx.doctype in ["Sales Invoice", "Purchase Invoice"] else 0, - "delivered_by_supplier": item.delivered_by_supplier - if ctx.doctype in ["Sales Order", "Sales Invoice"] - else 0, + "delivered_by_supplier": item.delivered_by_supplier, "is_fixed_asset": item.is_fixed_asset, "last_purchase_rate": item.last_purchase_rate if ctx.doctype in ["Purchase Order"] else 0, "transaction_date": ctx.transaction_date, From d85f6a4541e417c237cdfaab1121caf6ad4f0f2e Mon Sep 17 00:00:00 2001 From: Daniel Radl Date: Wed, 20 May 2026 18:22:09 +0200 Subject: [PATCH 047/249] chore: migrate to new docker publish workflow (#54499) --- .github/workflows/docker-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml index d42b89e998e..77fe1b06ac4 100644 --- a/.github/workflows/docker-release.yml +++ b/.github/workflows/docker-release.yml @@ -15,4 +15,4 @@ jobs: - name: curl run: | apk add curl bash - curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${{ secrets.CI_PAT }}" https://api.github.com/repos/frappe/frappe_docker/actions/workflows/build_stable.yml/dispatches -d '{"ref":"main"}' + curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${{ secrets.CI_PAT }}" https://api.github.com/repos/frappe/frappe_docker/actions/workflows/core-build-stable.yml/dispatches -d '{"ref":"main"}' From a3a7733440fa737a5f319d99bebcc0f4dabebc00 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 20 May 2026 17:17:43 +0530 Subject: [PATCH 048/249] test: fixed test cases --- .../stock_entry_handler/material_transfer.py | 23 +++++++++++++++---- .../stock_entry_handler/subcontracting.py | 4 ++-- .../stock_entry_type/stock_entry_type.py | 9 ++++---- .../subcontracting_inward_order.py | 4 +++- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py index cb658f7a121..1d7b26653c3 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py @@ -89,6 +89,20 @@ class MaterialTransferStockEntry(BaseMaterialTransferStockEntry): self.validate_warehouse() self.validate_same_source_target_warehouse() + def on_submit(self): + self.update_subcontract_order_supplied_items() + + def on_cancel(self): + self.update_subcontract_order_supplied_items() + + def update_subcontract_order_supplied_items(self): + if not self.doc.get(self.doc.subcontract_data.order_field): + return + + from .subcontracting import SendToSubcontractorStockEntry + + SendToSubcontractorStockEntry(self.doc).update_subcontract_order_supplied_items() + class MaterialTransferForManufactureStockEntry(BaseMaterialTransferStockEntry): def before_validate(self): @@ -141,9 +155,10 @@ class MaterialTransferForManufactureStockEntry(BaseMaterialTransferStockEntry): def add_items(self): item_dict = self.get_pending_raw_materials() - if self.doc.to_warehouse and self.wo_doc: - for item in item_dict.values(): - item["s_warehouse"] = item.get("from_warehouse") + + for item in item_dict.values(): + item["s_warehouse"] = item.get("from_warehouse") + if self.wo_doc and not item.get("t_warehouse"): item["t_warehouse"] = self.wo_doc.wip_warehouse for item_code in item_dict: @@ -362,7 +377,7 @@ class MaterialRequestStockEntry(BaseMaterialTransferStockEntry): if mreq_item.item_code != row.item_code: frappe.throw( - _("Item for row {0} does not match Material Request").format(self.idx), + _("Item for row {0} does not match Material Request").format(row.idx), frappe.MappingMismatchError, ) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py index 9c3546d34d7..520d16c02f7 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py @@ -75,7 +75,7 @@ class SendToSubcontractorStockEntry: self.doc.get(self.doc.subcontract_data.order_field), ) ) - elif not self.doc.get(self.doc.subcontract_data.rm_detail_field): + elif not child_row.get(self.doc.subcontract_data.rm_detail_field): order_rm_detail = self.get_order_rm_detail(child_row) if order_rm_detail: child_row.db_set(self.doc.subcontract_data.rm_detail_field, order_rm_detail) @@ -97,7 +97,7 @@ class SendToSubcontractorStockEntry: child_row.idx, bold(child_row.item_code) ) ) - elif not self.doc.get(self.doc.subcontract_data.rm_detail_field): + elif not child_row.get(self.doc.subcontract_data.rm_detail_field): order_rm_detail = self.get_order_rm_detail(child_row) if order_rm_detail: child_row.db_set(self.doc.subcontract_data.rm_detail_field, order_rm_detail) diff --git a/erpnext/stock/doctype/stock_entry_type/stock_entry_type.py b/erpnext/stock/doctype/stock_entry_type/stock_entry_type.py index 4e4acd38da7..c7e4fc0f500 100644 --- a/erpnext/stock/doctype/stock_entry_type/stock_entry_type.py +++ b/erpnext/stock/doctype/stock_entry_type/stock_entry_type.py @@ -123,8 +123,8 @@ class ManufactureEntry: available_serial_batches = self.get_transferred_serial_batches() for item_code, _dict in item_dict.items(): - _dict.from_warehouse = self.source_wh.get(item_code) or self.wip_warehouse - _dict.to_warehouse = "" + _dict.s_warehouse = self.source_wh.get(item_code) or self.wip_warehouse + _dict.t_warehouse = "" _dict.item_code = item_code if backflush_based_on != "BOM" and not frappe.db.get_value( @@ -310,8 +310,8 @@ class ManufactureEntry: item = get_item_defaults(self.production_item, self.company) args = { - "to_warehouse": self.fg_warehouse, - "from_warehouse": "", + "t_warehouse": self.fg_warehouse, + "s_warehouse": "", "qty": self.for_quantity - self.process_loss_qty, "item_name": item.item_name, "description": item.description, @@ -319,6 +319,7 @@ class ManufactureEntry: "expense_account": item.get("expense_account"), "cost_center": item.get("buying_cost_center"), "is_finished_item": 1, + "item_code": self.production_item, } self.stock_entry.append("items", args) diff --git a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py index db44245e2ce..d1cd27f4a11 100644 --- a/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py +++ b/erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.py @@ -421,7 +421,9 @@ class SubcontractingInwardOrder(SubcontractingController): } } - stock_entry.append("items", items_dict[rm_item.get("rm_item_code")]) + ste_item = items_dict[rm_item.get("rm_item_code")] + if ste_item.get("qty"): + stock_entry.append("items", ste_item) if target_doc: return stock_entry From 33dc1f5f0975837f045c6224bc11573cfa3b9348 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Wed, 20 May 2026 22:08:37 +0530 Subject: [PATCH 049/249] fix: set weight in update items (#55089) --- erpnext/controllers/accounts_controller.py | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index ee65b43d640..177118a0fd2 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -3744,7 +3744,7 @@ def set_order_defaults(parent_doctype, parent_doctype_name, child_doctype, child child_item = frappe.new_doc(child_doctype, parent_doc=p_doc, parentfield=child_docname) item = frappe.get_doc("Item", trans_item.get("item_code")) - for field in ("item_code", "item_name", "description", "item_group"): + for field in ("item_code", "item_name", "description", "item_group", "weight_per_unit", "weight_uom"): child_item.update({field: item.get(field)}) date_fieldname = "delivery_date" if child_doctype == "Sales Order Item" else "schedule_date" @@ -3987,7 +3987,7 @@ def update_child_item_uom_and_weight(child_item, new_data) -> None: flt(new_data.get("conversion_factor"), conv_fac_precision) or conversion_factor ) - if child_item.get("total_weight") and child_item.get("weight_per_unit"): + if child_item.get("weight_per_unit"): child_item.total_weight = flt( child_item.weight_per_unit * child_item.qty * child_item.conversion_factor, child_item.precision("total_weight"), @@ -4088,24 +4088,6 @@ def update_child_qty_rate( if flt(new_data.get("qty")) < qty_to_check: frappe.throw(_("Cannot reduce quantity than ordered or purchased quantity")) - def should_update_supplied_items(doc) -> bool: - """Subcontracted PO can allow following changes *after submit*: - - 1. Change rate of subcontracting - regardless of other changes. - 2. Change qty and/or add new items and/or remove items - Exception: Transfer/Consumption is already made, qty change not allowed. - """ - - supplied_items_processed = any( - item.supplied_qty or item.consumed_qty or item.returned_qty for item in doc.supplied_items - ) - - update_supplied_items = any_qty_changed or items_added_or_removed or any_conversion_factor_changed - if update_supplied_items and supplied_items_processed: - frappe.throw(_("Item qty can not be updated as raw materials are already processed.")) - - return update_supplied_items - def validate_fg_item_for_subcontracting(new_data, is_new): if is_new: if not new_data.get("fg_item"): From 4d14727b261facdb59f56c47b009d9e82d8d03ee Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 20 May 2026 23:31:09 +0530 Subject: [PATCH 050/249] fix: linter issue --- erpnext/projects/doctype/project/project.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index 490461d47f5..da05691d3fa 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -91,14 +91,14 @@ class Project(Document): def validate(self): if not self.is_new(): - self.copy_from_template() # nosemgrep + self.copy_from_template() self.send_welcome_email() self.update_costing() self.update_percent_complete() self.validate_from_to_dates("expected_start_date", "expected_end_date") self.validate_from_to_dates("actual_start_date", "actual_end_date") - def copy_from_template(self): # nosemgrep + def copy_from_template(self, trigger=None): """ Copy tasks from template """ @@ -107,11 +107,15 @@ class Project(Document): if not self.expected_start_date: # project starts today self.expected_start_date = today() + if trigger == "after_insert": + self.db_set("expected_start_date", self.expected_start_date) template = frappe.get_doc("Project Template", self.project_template) if not self.project_type: self.project_type = template.project_type + if trigger == "after_insert": + self.db_set("project_type", self.project_type) # create tasks from template project_tasks = [] @@ -235,7 +239,7 @@ class Project(Document): self.db_update() def after_insert(self): - self.copy_from_template() # nosemgrep + self.copy_from_template("after_insert") if self.sales_order: frappe.db.set_value("Sales Order", self.sales_order, "project", self.name) From 341891e3260eaef31434843cb703cb755bc37c3a Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Wed, 20 May 2026 21:50:41 +0200 Subject: [PATCH 051/249] fix: status for settled credit notes in sales invoice list (#54764) --- .../accounts/doctype/sales_invoice/sales_invoice_list.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js index ea3ae2b6fab..bd50378c9fb 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js @@ -27,6 +27,15 @@ frappe.listview_settings["Sales Invoice"] = { "Partly Paid": "yellow", "Internal Transfer": "darkgrey", }; + + if (doc.status === "Credit Note Issued" && flt(doc.outstanding_amount) === 0) { + return [ + __("Settled with Credit Note"), + "green", + `status,=,Credit Note Issued|outstanding_amount,=,0`, + ]; + } + return [__(doc.status), status_colors[doc.status], "status,=," + doc.status]; }, right_column: "grand_total", From 961cbc3625f158a556c9e8c241f1e6aa44de3c9f Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 21 May 2026 07:39:27 +0530 Subject: [PATCH 052/249] refactor: using agentic AI --- .../stock/doctype/stock_entry/stock_entry.js | 4 +- .../stock/doctype/stock_entry/stock_entry.py | 15 - .../stock_entry/stock_entry_handler/base.py | 41 ++ .../stock_entry_handler/disassemble.py | 32 +- .../stock_entry_handler/manufacturing.py | 131 +++--- .../material_receipt_issue.py | 23 +- .../stock_entry_handler/material_transfer.py | 71 +--- .../stock_entry_handler/serial_batch.py | 5 +- .../stock_entry_handler/subcontracting.py | 23 +- .../doctype/stock_entry/test_stock_entry.py | 384 ++++++++++++++++++ 10 files changed, 528 insertions(+), 201 deletions(-) create mode 100644 erpnext/stock/doctype/stock_entry/stock_entry_handler/base.py diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index a6448505065..3e5a8a10a8d 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -939,7 +939,7 @@ frappe.ui.form.on("Stock Entry", { if (frm.doc.purchase_order) { frm.set_value("subcontracting_order", ""); erpnext.utils.map_current_doc({ - method: "erpnext.stock.doctype.stock_entry.stock_entry.get_items_from_subcontract_order", + method: "erpnext.stock.doctype.stock_entry.stock_entry_handler.subcontracting.get_items_from_subcontract_order", source_name: frm.doc.purchase_order, target_doc: frm, freeze: true, @@ -951,7 +951,7 @@ frappe.ui.form.on("Stock Entry", { if (frm.doc.subcontracting_order) { frm.set_value("purchase_order", ""); erpnext.utils.map_current_doc({ - method: "erpnext.stock.doctype.stock_entry.stock_entry.get_items_from_subcontract_order", + method: "erpnext.stock.doctype.stock_entry.stock_entry_handler.subcontracting.get_items_from_subcontract_order", source_name: frm.doc.subcontracting_order, target_doc: frm, freeze: true, diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 7ec1eede5c2..1daad3b0454 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -1722,18 +1722,3 @@ def get_warehouse_details(args: str | dict): "basic_rate": get_incoming_rate(args), } return ret - - -@frappe.whitelist() -def get_items_from_subcontract_order(source_name: str, target_doc: str | Document | None = None): - from erpnext.controllers.subcontracting_controller import make_rm_stock_entry - - if isinstance(target_doc, str): - target_doc = frappe.get_doc(json.loads(target_doc)) - - order_doctype = "Purchase Order" if target_doc.purchase_order else "Subcontracting Order" - target_doc = make_rm_stock_entry( - subcontract_order=source_name, order_doctype=order_doctype, target_doc=target_doc - ) - - return target_doc diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/base.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/base.py new file mode 100644 index 00000000000..4706be97914 --- /dev/null +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/base.py @@ -0,0 +1,41 @@ +import frappe +from frappe import _ +from frappe.utils import flt + +from erpnext.manufacturing.doctype.bom.bom import get_backflush_based_on + + +class BaseStockEntry: + """Shared foundation for all stock entry purpose handlers. + + Provides common lazy-loaded work order document, backflush configuration, + and work order status validation used across multiple handler classes. + """ + + def __init__(self, se_doc): + self.doc = se_doc + + @property + def wo_doc(self): + if not getattr(self, "_wo_doc", None): + if self.doc.work_order: + self._wo_doc = frappe.get_doc("Work Order", self.doc.work_order) + return getattr(self, "_wo_doc", None) + + @property + def backflush_based_on(self): + return get_backflush_based_on(self.doc.bom_no) + + def _validate_work_order(self): + if not self.wo_doc: + return + + msg = "" + if flt(self.wo_doc.docstatus) != 1: + msg = _("Work Order {0} must be submitted").format(self.doc.work_order) + + if self.wo_doc.status == "Stopped": + msg = _("Transaction not allowed against stopped Work Order {0}").format(self.doc.work_order) + + if msg: + frappe.throw(msg) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py index ff9834917b7..7ea9fdc3280 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py @@ -9,13 +9,16 @@ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos from erpnext.stock.serial_batch_bundle import SerialBatchCreation from erpnext.stock.utils import get_combine_datetime -from .manufacturing import ceil_qty_if_uom_has_whole_number, get_bom_items, get_secondary_items +from .base import BaseStockEntry +from .manufacturing import ( + ceil_qty_if_uom_has_whole_number, + get_bom_items, + get_production_item_details, + get_secondary_items, +) -class DisassembleStockEntry: - def __init__(self, se_doc): - self.doc = se_doc - +class DisassembleStockEntry(BaseStockEntry): def validate(self): self.validate_warehouse() @@ -205,25 +208,8 @@ class DisassembleStockEntry: self.doc.append("items", item_args) - def get_production_item_details(self): - if self.doc.work_order: - production_item = frappe.get_cached_value("Work Order", self.doc.work_order, "production_item") - else: - production_item = frappe.get_cached_value("BOM", self.doc.bom_no, "item") - - item_details = frappe.get_cached_value( - "Item", - production_item, - ["item_name", "item_group", "description", "stock_uom", "name"], - as_dict=1, - ) - - return item_details - def add_finished_goods(self): - # Fininshed good will be removed from source warehouse - - item_details = self.get_production_item_details() + item_details = get_production_item_details(self.doc.work_order, self.doc.bom_no) item_details.update( { diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py index 72011725d6f..f3dcc3b67ca 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py @@ -6,7 +6,7 @@ from frappe import _, bold from frappe.query_builder.functions import Sum from frappe.utils import ceil, cint, flt, get_link_to_form -from erpnext.manufacturing.doctype.bom.bom import add_additional_cost, get_backflush_based_on +from erpnext.manufacturing.doctype.bom.bom import add_additional_cost from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos from erpnext.stock.serial_batch_bundle import ( SerialBatchCreation, @@ -15,13 +15,11 @@ from erpnext.stock.serial_batch_bundle import ( get_serial_or_batch_items, ) +from .base import BaseStockEntry from .serial_batch import create_serial_and_batch_bundle -class BaseManufactureStockEntry: - def __init__(self, se_doc): - self.doc = se_doc - +class BaseManufactureStockEntry(BaseStockEntry): def set_default_warehouse(self): for row in self.doc.items: if ( @@ -64,17 +62,6 @@ class BaseManufactureStockEntry: title=_("Raw Materials Missing"), ) - @property - def wo_doc(self): - if not getattr(self, "_wo_doc", None): - if self.doc.work_order: - self._wo_doc = frappe.get_doc("Work Order", self.doc.work_order) - return getattr(self, "_wo_doc", None) - - @property - def backflush_based_on(self): - return get_backflush_based_on(self.doc.bom_no) - def get_item_dict(self, row): item_args = {} fields = [ @@ -148,23 +135,8 @@ class BaseManufactureStockEntry: (flt(self.doc.process_loss_qty) / flt(self.doc.fg_completed_qty)) * 100 ) - def get_production_item_details(self): - if self.doc.work_order: - production_item = frappe.get_cached_value("Work Order", self.doc.work_order, "production_item") - else: - production_item = frappe.get_cached_value("BOM", self.doc.bom_no, "item") - - item_details = frappe.get_cached_value( - "Item", - production_item, - ["item_name", "item_group", "description", "stock_uom", "name"], - as_dict=1, - ) - - return item_details - def add_finished_goods(self): - item_details = self.get_production_item_details() + item_details = get_production_item_details(self.doc.work_order, self.doc.bom_no) fg_item_qty = flt(self.doc.fg_completed_qty) - flt(self.doc.process_loss_qty) item_details.update( @@ -321,38 +293,7 @@ class ManufactureStockEntry(BaseManufactureStockEntry): if not rm_items: return - precision = frappe.get_precision("Stock Entry Detail", "qty") - bom_items = get_bom_items(self.doc.bom_no, self.doc.use_multi_level_bom) - - for row in bom_items: - row.qty = row.qty * self.doc.fg_completed_qty - if matched_item := self.get_matched_items(row.item_code): - if flt(row.qty, precision) != flt(matched_item.qty, precision): - frappe.throw( - _( - "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." - ).format( - bold(row.item_code), - flt(row.qty), - get_link_to_form("BOM", self.doc.bom_no), - ), - title=_("Incorrect Component Quantity"), - ) - else: - frappe.throw( - _("According to the BOM {0}, the Item '{1}' is missing in the stock entry.").format( - get_link_to_form("BOM", self.doc.bom_no), bold(row.item_code) - ), - title=_("Missing Item"), - ) - - def get_matched_items(self, item_code): - items = [item for item in self.doc.items if item.s_warehouse] - for row in items: - if row.item_code == item_code or row.original_item == item_code: - return row - - return {} + _check_bom_component_qty(self.doc, get_bom_items(self.doc.bom_no, self.doc.use_multi_level_bom)) def validate_work_order(self): if not self.doc.work_order: @@ -746,17 +687,6 @@ class ManufactureStockEntry(BaseManufactureStockEntry): self.update_job_card_and_work_order() def update_job_card_and_work_order(self): - def _validate_work_order(pro_doc): - msg, title = "", "" - if flt(pro_doc.docstatus) != 1: - msg = _("Work Order {0} must be submitted").format(self.doc.work_order) - - if pro_doc.status == "Stopped": - msg = _("Transaction not allowed against stopped Work Order {0}").format(self.doc.work_order) - - if msg: - frappe.throw(_(msg), title=title) - if self.doc.job_card: job_doc = frappe.get_doc("Job Card", self.doc.job_card) job_doc.set_consumed_qty_in_job_card_item(self.doc) @@ -764,7 +694,7 @@ class ManufactureStockEntry(BaseManufactureStockEntry): job_doc.update_work_order() if self.doc.work_order: - _validate_work_order(self.wo_doc) + self._validate_work_order() if self.doc.fg_completed_qty: self.wo_doc.run_method("update_work_order_qty") @@ -827,6 +757,55 @@ class MaterialConsumptionForManufactureStockEntry(ManufactureStockEntry): self.add_raw_materials_based_on_transfer() +def get_production_item_details(work_order=None, bom_no=None): + production_item = ( + frappe.get_cached_value("Work Order", work_order, "production_item") + if work_order + else frappe.get_cached_value("BOM", bom_no, "item") + ) + return frappe.get_cached_value( + "Item", + production_item, + ["item_name", "item_group", "description", "stock_uom", "name"], + as_dict=1, + ) + + +def _check_bom_component_qty(doc, bom_items): + """Validate that stock entry items match BOM quantities.""" + precision = frappe.get_precision("Stock Entry Detail", "qty") + for row in bom_items: + row.qty = row.qty * doc.fg_completed_qty + matched_item = next( + ( + item + for item in doc.items + if item.s_warehouse + and (item.item_code == row.item_code or item.original_item == row.item_code) + ), + None, + ) + if matched_item: + if flt(row.qty, precision) != flt(matched_item.qty, precision): + frappe.throw( + _( + "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." + ).format( + bold(row.item_code), + flt(row.qty), + get_link_to_form("BOM", doc.bom_no), + ), + title=_("Incorrect Component Quantity"), + ) + else: + frappe.throw( + _("According to the BOM {0}, the Item '{1}' is missing in the stock entry.").format( + get_link_to_form("BOM", doc.bom_no), bold(row.item_code) + ), + title=_("Missing Item"), + ) + + def get_bom_items(bom_no, use_multi_level_bom=None, qty=None, fetch_secondary_items=False): if use_multi_level_bom is None: use_multi_level_bom = frappe.get_cached_value("BOM", bom_no, "use_multi_level_bom") diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py index 8908c0f9730..7ae15ed2ea2 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py @@ -2,13 +2,11 @@ import frappe from frappe import _ from frappe.query_builder.functions import Sum +from .base import BaseStockEntry from .manufacturing import get_bom_items -class MaterialReceiptStockEntry: - def __init__(self, se_doc): - self.doc = se_doc - +class MaterialReceiptStockEntry(BaseStockEntry): def before_validate(self): self.set_default_warehouse() @@ -27,10 +25,7 @@ class MaterialReceiptStockEntry: frappe.throw(_("Target Warehouse is required for item {0}").format(row.item_code)) -class BaseMaterialIssueStockEntry: - def __init__(self, se_doc): - self.doc = se_doc - +class BaseMaterialIssueStockEntry(BaseStockEntry): def set_default_warehouse(self): for row in self.doc.items: row.t_warehouse = None @@ -65,12 +60,12 @@ class MaterialIssueStockEntry(BaseMaterialIssueStockEntry): self.doc.append("items", row) -def get_consumed_items(self): - """Get all raw materials consumed through consumption entries""" +def get_consumed_items(work_order): + """Get all raw materials consumed through consumption entries for a work order.""" parent = frappe.qb.DocType("Stock Entry") child = frappe.qb.DocType("Stock Entry Detail") - query = ( + return ( frappe.qb.from_(parent) .join(child) .on(parent.name == child.parent) @@ -82,9 +77,7 @@ def get_consumed_items(self): .where( (parent.docstatus == 1) & (parent.purpose == "Material Consumption for Manufacture") - & (parent.work_order == self.work_order) + & (parent.work_order == work_order) ) .groupby(child.item_code, child.original_item) - ) - - return query.run(as_dict=True) + ).run(as_dict=True) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py index 1d7b26653c3..c1255ba4d5b 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py @@ -1,17 +1,13 @@ import frappe -from frappe import _, bold +from frappe import _ from frappe.query_builder.functions import Sum -from frappe.utils import cstr, flt, get_link_to_form +from frappe.utils import cstr, flt -from erpnext.manufacturing.doctype.bom.bom import get_backflush_based_on - -from .manufacturing import get_bom_items +from .base import BaseStockEntry +from .manufacturing import _check_bom_component_qty, get_bom_items -class BaseMaterialTransferStockEntry: - def __init__(self, se_doc): - self.doc = se_doc - +class BaseMaterialTransferStockEntry(BaseStockEntry): def set_default_warehouse(self): for row in self.doc.items: if not row.t_warehouse and self.doc.to_warehouse: @@ -69,17 +65,6 @@ class BaseMaterialTransferStockEntry: title=_("Invalid Source and Target Warehouse"), ) - @property - def wo_doc(self): - if not getattr(self, "_wo_doc", None): - if self.doc.work_order: - self._wo_doc = frappe.get_doc("Work Order", self.doc.work_order) - return getattr(self, "_wo_doc", None) - - @property - def backflush_based_on(self): - return get_backflush_based_on(self.doc.bom_no) - class MaterialTransferStockEntry(BaseMaterialTransferStockEntry): def before_validate(self): @@ -120,38 +105,7 @@ class MaterialTransferForManufactureStockEntry(BaseMaterialTransferStockEntry): if not self.doc.fg_completed_qty: return - precision = frappe.get_precision("Stock Entry Detail", "qty") - bom_items = get_bom_items(self.doc.bom_no, self.doc.use_multi_level_bom) - - for row in bom_items: - row.qty = row.qty * self.doc.fg_completed_qty - if matched_item := self.get_matched_items(row.item_code): - if flt(row.qty, precision) != flt(matched_item.qty, precision): - frappe.throw( - _( - "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." - ).format( - bold(row.item_code), - flt(row.qty), - get_link_to_form("BOM", self.doc.bom_no), - ), - title=_("Incorrect Component Quantity"), - ) - else: - frappe.throw( - _("According to the BOM {0}, the Item '{1}' is missing in the stock entry.").format( - get_link_to_form("BOM", self.doc.bom_no), bold(row.item_code) - ), - title=_("Missing Item"), - ) - - def get_matched_items(self, item_code): - items = [item for item in self.doc.items if item.s_warehouse] - for row in items: - if row.item_code == item_code or row.original_item == item_code: - return row - - return {} + _check_bom_component_qty(self.doc, get_bom_items(self.doc.bom_no, self.doc.use_multi_level_bom)) def add_items(self): item_dict = self.get_pending_raw_materials() @@ -305,24 +259,13 @@ class MaterialTransferForManufactureStockEntry(BaseMaterialTransferStockEntry): self.update_job_card_and_work_order() def update_job_card_and_work_order(self): - def _validate_work_order(pro_doc): - msg, title = "", "" - if flt(pro_doc.docstatus) != 1: - msg = _("Work Order {0} must be submitted").format(self.doc.work_order) - - if pro_doc.status == "Stopped": - msg = _("Transaction not allowed against stopped Work Order {0}").format(self.doc.work_order) - - if msg: - frappe.throw(_(msg), title=title) - if self.doc.job_card: job_doc = frappe.get_doc("Job Card", self.doc.job_card) job_doc.set_transferred_qty(update_status=True) job_doc.set_transferred_qty_in_job_card_item(self.doc) if self.doc.work_order: - _validate_work_order(self.wo_doc) + self._validate_work_order() if self.doc.fg_completed_qty: if self.doc.docstatus == 1: diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/serial_batch.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/serial_batch.py index 0c985f035a9..dae9f5b8eb7 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/serial_batch.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/serial_batch.py @@ -8,11 +8,10 @@ from erpnext.manufacturing.doctype.bom.bom import get_backflush_based_on from erpnext.stock.serial_batch_bundle import SerialBatchCreation, get_serial_or_batch_items from erpnext.stock.utils import get_combine_datetime +from .base import BaseStockEntry -class StockEntrySABB: - def __init__(self, se_doc): - self.doc = se_doc +class StockEntrySABB(BaseStockEntry): def make_serial_and_batch_bundle_for_outward(self): serial_or_batch_items = get_serial_or_batch_items(self.doc.items) if not serial_or_batch_items: diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py index 520d16c02f7..67cf3208fb5 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py @@ -1,15 +1,17 @@ +import json + import frappe from frappe import _, bold +from frappe.model.document import Document from frappe.query_builder.functions import Sum from frappe.utils import flt from erpnext.stock.utils import get_bin +from .base import BaseStockEntry -class SendToSubcontractorStockEntry: - def __init__(self, se_doc): - self.doc = se_doc +class SendToSubcontractorStockEntry(BaseStockEntry): def validate(self): self.validate_subcontract_order() @@ -241,3 +243,18 @@ def get_supplied_items( supplied_item.total_supplied_qty = flt(supplied_item.supplied_qty) - flt(supplied_item.returned_qty) return supplied_item_details + + +@frappe.whitelist() +def get_items_from_subcontract_order(source_name: str, target_doc: str | Document | None = None): + from erpnext.controllers.subcontracting_controller import make_rm_stock_entry + + if isinstance(target_doc, str): + target_doc = frappe.get_doc(json.loads(target_doc)) + + order_doctype = "Purchase Order" if target_doc.purchase_order else "Subcontracting Order" + target_doc = make_rm_stock_entry( + subcontract_order=source_name, order_doctype=order_doctype, target_doc=target_doc + ) + + return target_doc diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 59807e214b1..bb40f47765a 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -2495,6 +2495,390 @@ class TestStockEntry(ERPNextTestSuite): self.assertEqual(se.items[2].amount, 5) +class TestStockEntryCoverage(ERPNextTestSuite): + """Tests for functions previously lacking dedicated coverage.""" + + # ── ceil_qty_if_uom_has_whole_number ────────────────────────────────────── + + def test_ceil_qty_rounds_up_for_whole_number_uom(self): + from erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing import ( + ceil_qty_if_uom_has_whole_number, + ) + + frappe.set_value("UOM", "Nos", "must_be_whole_number", 1) + self.assertEqual(ceil_qty_if_uom_has_whole_number(2.3, "Nos"), 3) + frappe.set_value("UOM", "Nos", "must_be_whole_number", 0) + + def test_ceil_qty_no_rounding_for_decimal_uom(self): + from erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing import ( + ceil_qty_if_uom_has_whole_number, + ) + + frappe.set_value("UOM", "Nos", "must_be_whole_number", 0) + self.assertEqual(ceil_qty_if_uom_has_whole_number(2.3, "Nos"), 2.3) + + # ── get_uom_details ──────────────────────────────────────────────────────── + + def test_get_uom_details_returns_conversion_factor_and_transfer_qty(self): + from erpnext.stock.doctype.stock_entry.stock_entry import get_uom_details + + result = get_uom_details("_Test Item", "Nos", 5) + self.assertEqual(flt(result.get("conversion_factor")), 1.0) + self.assertEqual(flt(result.get("transfer_qty")), 5.0) + + # ── get_warehouse_details ────────────────────────────────────────────────── + + def test_get_warehouse_details_returns_actual_qty_and_rate(self): + import json + + from frappe.utils import nowdate, nowtime + + from erpnext.stock.doctype.stock_entry.stock_entry import get_warehouse_details + + make_stock_entry( + item_code="_Test Item", + target="_Test Warehouse - _TC", + qty=10, + basic_rate=100, + ) + + args = { + "item_code": "_Test Item", + "warehouse": "_Test Warehouse - _TC", + "posting_date": nowdate(), + "posting_time": nowtime(), + } + result = get_warehouse_details(json.dumps(args)) + self.assertGreater(result.get("actual_qty", 0), 0) + self.assertGreater(result.get("basic_rate", 0), 0) + + def test_get_warehouse_details_empty_args_returns_empty_dict(self): + from erpnext.stock.doctype.stock_entry.stock_entry import get_warehouse_details + + self.assertEqual(get_warehouse_details({}), {}) + + # ── get_work_order_details ───────────────────────────────────────────────── + + def test_get_work_order_details_returns_correct_fields(self): + from erpnext.stock.doctype.stock_entry.stock_entry import get_work_order_details + + bom_no = frappe.db.get_value("BOM", {"item": "_Test FG Item 2", "is_default": 1, "docstatus": 1}) + wo = frappe.new_doc("Work Order") + wo.update( + { + "company": "_Test Company", + "fg_warehouse": "_Test Warehouse 1 - _TC", + "production_item": "_Test FG Item 2", + "bom_no": bom_no, + "qty": 3.0, + "stock_uom": "_Test UOM", + "wip_warehouse": "_Test Warehouse - _TC", + } + ) + wo.insert() + wo.submit() + + result = get_work_order_details(wo.name, "_Test Company") + self.assertEqual(result["bom_no"], bom_no) + self.assertEqual(result["fg_completed_qty"], 3.0) + self.assertEqual(result["from_bom"], 1) + self.assertEqual(result["wip_warehouse"], wo.wip_warehouse) + + # ── get_production_item_details ──────────────────────────────────────────── + + def test_get_production_item_details_from_bom(self): + from erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing import ( + get_production_item_details, + ) + + bom_no = frappe.db.get_value("BOM", {"item": "_Test FG Item 2", "is_default": 1, "docstatus": 1}) + result = get_production_item_details(bom_no=bom_no) + self.assertEqual(result.name, "_Test FG Item 2") + self.assertIsNotNone(result.stock_uom) + + def test_get_production_item_details_from_work_order(self): + from erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing import ( + get_production_item_details, + ) + + bom_no = frappe.db.get_value("BOM", {"item": "_Test FG Item 2", "is_default": 1, "docstatus": 1}) + wo = frappe.new_doc("Work Order") + wo.update( + { + "company": "_Test Company", + "fg_warehouse": "_Test Warehouse 1 - _TC", + "production_item": "_Test FG Item 2", + "bom_no": bom_no, + "qty": 1.0, + "stock_uom": "_Test UOM", + "wip_warehouse": "_Test Warehouse - _TC", + } + ) + wo.insert() + wo.submit() + + result = get_production_item_details(work_order=wo.name) + self.assertEqual(result.name, "_Test FG Item 2") + + # ── get_bom_items ────────────────────────────────────────────────────────── + + def test_get_bom_items_returns_raw_materials_with_structure(self): + from erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing import get_bom_items + + bom_no = frappe.db.get_value("BOM", {"item": "_Test FG Item 2", "is_default": 1, "docstatus": 1}) + items = get_bom_items(bom_no) + self.assertGreater(len(items), 0) + for item in items: + self.assertIn("item_code", item) + self.assertIn("qty", item) + + def test_get_bom_items_scales_qty_proportionally(self): + from erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing import get_bom_items + + bom_no = frappe.db.get_value("BOM", {"item": "_Test FG Item 2", "is_default": 1, "docstatus": 1}) + items_1 = {i["item_code"]: i["qty"] for i in get_bom_items(bom_no, qty=1)} + items_2 = {i["item_code"]: i["qty"] for i in get_bom_items(bom_no, qty=2)} + for item_code, qty_at_1 in items_1.items(): + self.assertAlmostEqual(items_2[item_code], qty_at_1 * 2, places=4) + + # ── validate_sample_quantity ─────────────────────────────────────────────── + + @ERPNextTestSuite.change_settings( + "Stock Settings", {"sample_retention_warehouse": "_Test Warehouse 1 - _TC"} + ) + def test_validate_sample_quantity_raises_when_sample_exceeds_received_qty(self): + from erpnext.stock.doctype.stock_entry.stock_entry_handler.manufacturing import ( + validate_sample_quantity, + ) + + item = make_item( + "_Sample Qty Excess Item", + {"is_stock_item": 1, "retain_sample": 1, "sample_quantity": 2}, + ) + self.assertRaises(frappe.ValidationError, validate_sample_quantity, item.name, 10, 5) + + # ── get_expired_batches ──────────────────────────────────────────────────── + + def test_get_expired_batches_includes_expired_batch(self): + from erpnext.stock.doctype.batch.test_batch import make_new_batch + from erpnext.stock.doctype.stock_entry.stock_entry_handler.serial_batch import ( + get_expired_batches, + ) + + item = make_item("_Test Expired Batch Item", {"is_stock_item": 1, "has_batch_no": 1}) + batch = make_new_batch( + batch_id=frappe.generate_hash("", 5), + item_code=item.name, + expiry_date=add_days(today(), -1), + ) + + expired = get_expired_batches() + self.assertIn(batch.name, expired) + self.assertEqual(expired[batch.name].item, item.name) + + def test_get_expired_batches_excludes_future_batch(self): + from erpnext.stock.doctype.batch.test_batch import make_new_batch + from erpnext.stock.doctype.stock_entry.stock_entry_handler.serial_batch import ( + get_expired_batches, + ) + + item = make_item("_Test Future Batch Item", {"is_stock_item": 1, "has_batch_no": 1}) + future_batch = make_new_batch( + batch_id=frappe.generate_hash("", 5), + item_code=item.name, + expiry_date=add_days(today(), 10), + ) + + expired = get_expired_batches() + self.assertNotIn(future_batch.name, expired) + + # ── validate_source_stock_entry ──────────────────────────────────────────── + + def test_validate_source_stock_entry_skips_when_no_source(self): + se = frappe.new_doc("Stock Entry") + se.source_stock_entry = None + se.validate_source_stock_entry() # must not raise + + def test_validate_source_stock_entry_throws_on_work_order_mismatch(self): + source_se = make_stock_entry( + item_code="_Test Item", + target="_Test Warehouse - _TC", + qty=1, + basic_rate=100, + ) + frappe.db.set_value("Stock Entry", source_se.name, "work_order", "WO-FAKE-SOURCE-001") + + se = frappe.new_doc("Stock Entry") + se.source_stock_entry = source_se.name + se.work_order = "WO-FAKE-TARGET-999" + + self.assertRaises(frappe.ValidationError, se.validate_source_stock_entry) + + def test_validate_source_stock_entry_passes_with_matching_work_order(self): + source_se = make_stock_entry( + item_code="_Test Item", + target="_Test Warehouse - _TC", + qty=1, + basic_rate=100, + ) + frappe.db.set_value("Stock Entry", source_se.name, "work_order", "WO-SAME-001") + + se = frappe.new_doc("Stock Entry") + se.source_stock_entry = source_se.name + se.work_order = "WO-SAME-001" + se.validate_source_stock_entry() # must not raise + + # ── validate_job_card_fg_item ────────────────────────────────────────────── + + def test_validate_job_card_fg_item_skips_when_no_job_card(self): + se = frappe.new_doc("Stock Entry") + se.job_card = None + se.validate_job_card_fg_item() # must not raise + + def test_validate_job_card_fg_item_throws_when_fg_item_mismatches(self): + wrong_fg = make_item("_JC Wrong FG Item", {"is_stock_item": 1}).name + + jc_name = frappe.db.get_value("Job Card", {"docstatus": 1, "finished_good": ("!=", "")}) + if not jc_name: + return # skip if no suitable job card in test data + + jc = frappe.db.get_value("Job Card", jc_name, ["finished_good"], as_dict=1) + if jc.finished_good == wrong_fg: + return # skip if the wrong_fg happens to match + + se = frappe.new_doc("Stock Entry") + se.job_card = jc_name + se.append("items", {"item_code": wrong_fg, "is_finished_item": 1, "qty": 1}) + self.assertRaises(frappe.ValidationError, se.validate_job_card_fg_item) + + # ── validate_job_card_item ───────────────────────────────────────────────── + + def test_validate_job_card_item_skips_when_no_job_card(self): + se = frappe.new_doc("Stock Entry") + se.job_card = None + se.validate_job_card_item() # must not raise + + def test_validate_job_card_item_skips_for_manufacture_purpose(self): + se = frappe.new_doc("Stock Entry") + se.job_card = "SOME-JC-001" + se.purpose = "Manufacture" + se.validate_job_card_item() # must not raise even with a job card set + + @ERPNextTestSuite.change_settings("Manufacturing Settings", {"job_card_excess_transfer": 0}) + def test_validate_job_card_item_throws_when_job_card_item_ref_missing(self): + jc_name = frappe.db.get_value("Job Card", {"docstatus": 1}) + if not jc_name: + return # skip if no job cards in test data + + se = frappe.new_doc("Stock Entry") + se.job_card = jc_name + se.purpose = "Material Transfer for Manufacture" + se.append( + "items", + { + "item_code": "_Test Item", + "s_warehouse": "_Test Warehouse - _TC", + "qty": 1, + "job_card_item": None, + }, + ) + self.assertRaises(frappe.ValidationError, se.validate_job_card_item) + + # ── get_available_materials ──────────────────────────────────────────────── + + def test_get_available_materials_tracks_transferred_qty(self): + from erpnext.manufacturing.doctype.production_plan.test_production_plan import make_bom + from erpnext.manufacturing.doctype.work_order.work_order import ( + make_stock_entry as _make_stock_entry, + ) + from erpnext.stock.doctype.stock_entry.stock_entry_handler.disassemble import ( + get_available_materials, + ) + + fg = make_item("_AM FG Item", {"is_stock_item": 1}).name + rm = make_item("_AM RM Item", {"is_stock_item": 1}).name + source_wh = "_Test Warehouse - _TC" + wip_wh = "_Test Warehouse 1 - _TC" + + make_stock_entry(item_code=rm, target=source_wh, qty=20, purpose="Material Receipt") + + bom_no = make_bom(item=fg, raw_materials=[rm]).name + wo = frappe.new_doc("Work Order") + wo.update( + { + "company": "_Test Company", + "fg_warehouse": "_Test Warehouse 1 - _TC", + "production_item": fg, + "bom_no": bom_no, + "qty": 2.0, + "stock_uom": "Nos", + "wip_warehouse": wip_wh, + } + ) + wo.insert() + wo.submit() + + transfer_se = frappe.get_doc(_make_stock_entry(wo.name, "Material Transfer for Manufacture", 2)) + for d in transfer_se.items: + d.s_warehouse = source_wh + transfer_se.insert() + transfer_se.submit() + + materials = get_available_materials(wo.name) + self.assertGreater(len(materials), 0) + + key = (rm, wip_wh) + self.assertIn(key, materials) + self.assertGreater(materials[key].qty, 0) + + def test_get_available_materials_reduces_qty_after_consumption(self): + from erpnext.manufacturing.doctype.production_plan.test_production_plan import make_bom + from erpnext.manufacturing.doctype.work_order.work_order import ( + make_stock_entry as _make_stock_entry, + ) + from erpnext.stock.doctype.stock_entry.stock_entry_handler.disassemble import ( + get_available_materials, + ) + + fg = make_item("_AM2 FG Item", {"is_stock_item": 1}).name + rm = make_item("_AM2 RM Item", {"is_stock_item": 1}).name + source_wh = "_Test Warehouse - _TC" + wip_wh = "_Test Warehouse 1 - _TC" + + make_stock_entry(item_code=rm, target=source_wh, qty=20, purpose="Material Receipt") + + bom_no = make_bom(item=fg, raw_materials=[rm]).name + wo = frappe.new_doc("Work Order") + wo.update( + { + "company": "_Test Company", + "fg_warehouse": "_Test Warehouse 1 - _TC", + "production_item": fg, + "bom_no": bom_no, + "qty": 2.0, + "stock_uom": "Nos", + "wip_warehouse": wip_wh, + } + ) + wo.insert() + wo.submit() + + transfer_se = frappe.get_doc(_make_stock_entry(wo.name, "Material Transfer for Manufacture", 2)) + for d in transfer_se.items: + d.s_warehouse = source_wh + transfer_se.insert() + transfer_se.submit() + + manufacture_se = frappe.get_doc(_make_stock_entry(wo.name, "Manufacture", 2)) + manufacture_se.insert() + manufacture_se.submit() + + materials = get_available_materials(wo.name) + key = (rm, wip_wh) + if key in materials: + self.assertEqual(materials[key].qty, 0) + + def make_serialized_item(self, **args): args = frappe._dict(args) se = frappe.copy_doc(self.globalTestRecords["Stock Entry"][0]) From 06477119d12d1357d2189078161cd99c31e397f0 Mon Sep 17 00:00:00 2001 From: Jatin3128 <140256508+Jatin3128@users.noreply.github.com> Date: Thu, 21 May 2026 12:04:45 +0530 Subject: [PATCH 053/249] fix: corrected the pricing rule taking the wrong value (#54894) --- erpnext/public/js/controllers/transaction.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 6e1084e3408..15271ed66a6 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -2260,6 +2260,8 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe for (const [key, value] of Object.entries(child)) { if (!["doctype", "name"].includes(key)) { if (key === "price_list_rate") { + const doc = frappe.get_doc(child.doctype, child.name); + if (doc) doc.price_list_rate = value; // silent update so rate trigger uses correct value frappe.model.set_value(child.doctype, child.name, "rate", value); } From 21bb8fe979332a99b467dbf172f6af539f4c9922 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 21 May 2026 12:14:08 +0530 Subject: [PATCH 054/249] fix: asset scrap flow related changes --- erpnext/assets/doctype/asset/depreciation.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py index 036cb8ad669..d045030ee1f 100644 --- a/erpnext/assets/doctype/asset/depreciation.py +++ b/erpnext/assets/doctype/asset/depreciation.py @@ -361,6 +361,7 @@ def get_message_for_depr_entry_posting_error(asset_links, error_log_links): @frappe.whitelist() def scrap_asset(asset_name: str, scrap_date: DateTimeLikeObject | None = None): + frappe.has_permission("Asset", "write", asset_name, throw=True) asset = frappe.get_doc("Asset", asset_name) scrap_date = getdate(scrap_date) or getdate(today()) asset.db_set("disposal_date", scrap_date) @@ -450,6 +451,7 @@ def create_journal_entry_for_scrap(asset, scrap_date): @frappe.whitelist() def restore_asset(asset_name: str): + frappe.has_permission("Asset", "write", asset_name, throw=True) asset = frappe.get_doc("Asset", asset_name) reverse_depreciation_entry_made_on_disposal(asset) reset_depreciation_schedule(asset, get_note_for_restore(asset)) From 2f35660142d1e73ffb7d82d303a6bc6661c1f24b Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 21 May 2026 14:55:46 +0530 Subject: [PATCH 055/249] fix: consumed operation cost calculation (#54858) --- erpnext/controllers/status_updater.py | 4 +- erpnext/manufacturing/doctype/bom/bom.py | 47 +++- .../doctype/job_card/job_card.json | 6 +- .../doctype/job_card/test_job_card.py | 237 ++++++++++++++++++ .../doctype/job_card_item/job_card_item.json | 4 +- .../doctype/work_order/work_order.js | 50 ++-- .../doctype/work_order/work_order.json | 7 +- .../work_order_item/work_order_item.json | 4 +- .../landed_cost_taxes_and_charges.json | 33 ++- .../landed_cost_taxes_and_charges.py | 3 + .../stock/doctype/stock_entry/stock_entry.py | 39 +-- 11 files changed, 362 insertions(+), 72 deletions(-) diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py index 95c25c497bf..a87a1bf4e99 100644 --- a/erpnext/controllers/status_updater.py +++ b/erpnext/controllers/status_updater.py @@ -281,10 +281,10 @@ class StatusUpdater(Document): # get unique transactions to update for d in self.get_all_children(): - if hasattr(d, "qty") and d.qty < 0 and not self.get("is_return"): + if hasattr(d, "qty") and flt(d.qty) < 0 and not self.get("is_return"): frappe.throw(_("For an item {0}, quantity must be positive number").format(d.item_code)) - if hasattr(d, "qty") and d.qty > 0 and self.get("is_return"): + if hasattr(d, "qty") and flt(d.qty) > 0 and self.get("is_return"): frappe.throw(_("For an item {0}, quantity must be negative number").format(d.item_code)) if ( diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index 7c032be36e4..a0e4d248af8 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -1647,12 +1647,12 @@ def add_non_stock_items_cost(stock_entry, work_order, expense_account, job_card= ) -def add_operating_cost_component_wise( - stock_entry, work_order=None, consumed_operating_cost=None, op_expense_account=None, job_card=None -): +def add_operating_cost_component_wise(stock_entry, work_order=None, op_expense_account=None, job_card=None): if not work_order: return False + from erpnext.stock.doctype.stock_entry.stock_entry import get_consumed_operating_cost + cost_added = False for row in work_order.operations: if job_card and job_card.operation_id != row.name: @@ -1670,18 +1670,32 @@ def add_operating_cost_component_wise( }, ) + consumed_operating_cost = ( + get_consumed_operating_cost(work_order.name, stock_entry.bom_no, row.name) or [] + ) for wc in workstation_cost: expense_account = ( get_component_account(wc.operating_component, stock_entry.company) or op_expense_account ) + consumed_op_cost = next( + ( + cost + for cost in consumed_operating_cost + if cost.get("operating_component") == wc.operating_component + ), + {}, + ) actual_cp_operating_cost = flt( - flt(wc.operating_cost) * flt(flt(row.actual_operation_time) / 60.0) - consumed_operating_cost, + flt(wc.operating_cost) * flt(flt(row.actual_operation_time) / 60.0) + - flt(consumed_op_cost.get("consumed_cost")), row.precision("actual_operating_cost"), ) - per_unit_cost = flt(actual_cp_operating_cost) / flt(row.completed_qty - work_order.produced_qty) + remaining_qty = row.completed_qty - consumed_op_cost.get("consumed_qty", 0) + per_unit_cost = actual_cp_operating_cost / (remaining_qty or 1) + operating_cost = per_unit_cost * stock_entry.fg_completed_qty - if per_unit_cost: + if actual_cp_operating_cost: stock_entry.append( "additional_costs", { @@ -1689,8 +1703,14 @@ def add_operating_cost_component_wise( "description": _("{0} Operating Cost for operation {1}").format( wc.operating_component, row.operation ), - "amount": per_unit_cost * flt(stock_entry.fg_completed_qty), + "amount": flt( + min(operating_cost, actual_cp_operating_cost), + frappe.get_precision("Landed Cost Taxes and Charges", "amount"), + ), "has_operating_cost": 1, + "operation_id": row.name, + "operating_component": wc.operating_component, + "qty": min(remaining_qty, stock_entry.fg_completed_qty), }, ) @@ -1708,17 +1728,15 @@ def get_component_account(parent, company): def add_operations_cost(stock_entry, work_order=None, expense_account=None, job_card=None): from erpnext.stock.doctype.stock_entry.stock_entry import ( - get_consumed_operating_cost, - get_operating_cost_per_unit, + get_remaining_operating_cost, ) - operating_cost_per_unit = get_operating_cost_per_unit(work_order, stock_entry.bom_no) + remaining_operating_cost = get_remaining_operating_cost(work_order, stock_entry.bom_no) - if operating_cost_per_unit: + if remaining_operating_cost: cost_added = add_operating_cost_component_wise( stock_entry, work_order, - get_consumed_operating_cost(work_order.name, stock_entry.bom_no), expense_account, job_card=job_card, ) @@ -1729,7 +1747,10 @@ def add_operations_cost(stock_entry, work_order=None, expense_account=None, job_ { "expense_account": expense_account, "description": _("Operating Cost as per Work Order / BOM"), - "amount": operating_cost_per_unit * flt(stock_entry.fg_completed_qty), + "amount": flt( + remaining_operating_cost * stock_entry.fg_completed_qty, + frappe.get_precision("Landed Cost Taxes and Charges", "amount"), + ), "has_operating_cost": 1, }, ) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.json b/erpnext/manufacturing/doctype/job_card/job_card.json index 21f0adbdd74..1e4af027c30 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.json +++ b/erpnext/manufacturing/doctype/job_card/job_card.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_bulk_edit": 1, "autoname": "naming_series:", "creation": "2026-03-31 21:06:16.282931", "doctype": "DocType", @@ -155,6 +156,7 @@ "fieldname": "wip_warehouse", "fieldtype": "Link", "label": "WIP Warehouse", + "link_filters": "[[\"Warehouse\",\"disabled\",\"=\",0],[\"Warehouse\",\"is_group\",\"=\",0]]", "mandatory_depends_on": "eval:!doc.finished_good || doc.skip_material_transfer === 0 || (doc.skip_material_transfer && doc.backflush_from_wip_warehouse)", "options": "Warehouse" }, @@ -506,6 +508,7 @@ "fieldname": "target_warehouse", "fieldtype": "Link", "label": "Target Warehouse", + "link_filters": "[[\"Warehouse\",\"disabled\",\"=\",0],[\"Warehouse\",\"is_group\",\"=\",0]]", "mandatory_depends_on": "eval:doc.track_semi_finished_goods", "options": "Warehouse" }, @@ -518,6 +521,7 @@ "fieldname": "source_warehouse", "fieldtype": "Link", "label": "Source Warehouse", + "link_filters": "[[\"Warehouse\",\"disabled\",\"=\",0],[\"Warehouse\",\"is_group\",\"=\",0]]", "options": "Warehouse" }, { @@ -627,7 +631,7 @@ "grid_page_length": 50, "is_submittable": 1, "links": [], - "modified": "2026-03-31 21:06:48.987740", + "modified": "2026-05-12 12:17:17.750857", "modified_by": "Administrator", "module": "Manufacturing", "name": "Job Card", diff --git a/erpnext/manufacturing/doctype/job_card/test_job_card.py b/erpnext/manufacturing/doctype/job_card/test_job_card.py index a6ac3f0a79a..7f1f50748b8 100644 --- a/erpnext/manufacturing/doctype/job_card/test_job_card.py +++ b/erpnext/manufacturing/doctype/job_card/test_job_card.py @@ -1081,6 +1081,243 @@ class TestJobCard(ERPNextTestSuite): self.assertEqual(s.items[3].item_code, "_Test Item") self.assertEqual(s.items[3].transfer_qty, 2) + @ERPNextTestSuite.change_settings( + "Manufacturing Settings", {"overproduction_percentage_for_work_order": 100} + ) + def test_operating_cost_with_overproduction(self): + from erpnext.manufacturing.doctype.routing.test_routing import ( + create_routing, + setup_bom, + setup_operations, + ) + from erpnext.manufacturing.doctype.work_order.work_order import make_job_card + from erpnext.manufacturing.doctype.work_order.work_order import ( + make_stock_entry as make_stock_entry_for_wo, + ) + from erpnext.stock.doctype.item.test_item import make_item + from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse + + workstation = make_workstation( + workstation_name="Test Workstation for Overproduction", hour_rate_rent=10, hour_rate_labour=10 + ) + operations = [ + {"operation": "Test Operation 1", "workstation": workstation.name, "time_in_mins": 30}, + {"operation": "Test Operation 2", "workstation": workstation.name, "time_in_mins": 30}, + ] + warehouse = create_warehouse("Test Warehouse for Overproduction") + setup_operations(operations) + + fg = make_item("Test FG for Overproduction", {"stock_uom": "Nos", "is_stock_item": 1}) + rm = make_item("Test RM for Overproduction", {"stock_uom": "Nos", "is_stock_item": 1}) + + routing_doc = create_routing(routing_name="Testing Route", operations=operations) + bom_doc = setup_bom( + item_code=fg.name, + routing=routing_doc.name, + raw_materials=[rm.name], + source_warehouse=warehouse, + ) + + for row in bom_doc.items: + make_stock_entry( + item_code=row.item_code, + target=row.source_warehouse, + qty=100, + basic_rate=100, + ) + + wo_doc = make_wo_order_test_record( + production_item=fg.name, + bom_no=bom_doc.name, + qty=10, + skip_transfer=1, + source_warehouse=warehouse, + ) + + first_operation = frappe.get_all( + "Job Card", + filters={"work_order": wo_doc.name, "sequence_id": 1}, + fields=["name"], + order_by="sequence_id", + limit=1, + )[0].name + + jc = frappe.get_doc("Job Card", first_operation) + from_time = add_to_date(now(), days=1) + for _ in jc.scheduled_time_logs: + jc.append( + "time_logs", + { + "from_time": from_time, + "to_time": add_to_date(from_time, days=1), + "completed_qty": 4, + }, + ) + jc.for_quantity = 4 + jc.save() + jc.submit() + + second_operation = frappe.get_all( + "Job Card", + filters={"work_order": wo_doc.name, "sequence_id": 2}, + fields=["name"], + order_by="sequence_id", + limit=1, + )[0].name + + jc = frappe.get_doc("Job Card", second_operation) + from_time = add_to_date(now(), days=2) + for _ in jc.scheduled_time_logs: + jc.append( + "time_logs", + { + "from_time": from_time, + "to_time": add_to_date(from_time, days=2), + "completed_qty": 4, + }, + ) + jc.for_quantity = 4 + jc.save() + jc.submit() + + s = frappe.get_doc(make_stock_entry_for_wo(wo_doc.name, "Manufacture", 6)) # overproduction + s.submit() + + self.assertEqual(s.additional_costs[0].amount, 240) + self.assertEqual(s.additional_costs[1].amount, 240) + self.assertEqual(s.additional_costs[2].amount, 480) + self.assertEqual(s.additional_costs[3].amount, 480) + + make_job_card( + wo_doc.name, + [ + { + "name": wo_doc.operations[0].name, + "operation": "Test Operation 1", + "qty": 2, + "pending_qty": 2, + } + ], + ) + + job_card = frappe.get_last_doc("Job Card", {"work_order": wo_doc.name}) + from_time = add_to_date(now(), days=4) + job_card.append( + "time_logs", + { + "from_time": from_time, + "to_time": add_to_date(from_time, days=1), + "completed_qty": 2, + }, + ) + job_card.for_quantity = 2 + job_card.save() + job_card.submit() + + make_job_card( + wo_doc.name, + [ + { + "name": wo_doc.operations[1].name, + "operation": "Test Operation 2", + "qty": 2, + "pending_qty": 2, + } + ], + ) + + job_card = frappe.get_last_doc("Job Card", {"work_order": wo_doc.name}) + from_time = add_to_date(now(), days=5) + job_card.append( + "time_logs", + { + "from_time": from_time, + "to_time": add_to_date(from_time, days=2), + "completed_qty": 2, + }, + ) + job_card.for_quantity = 2 + job_card.save() + job_card.submit() + + s2 = frappe.get_doc(make_stock_entry_for_wo(wo_doc.name, "Manufacture", 1)) + s2.submit() + + self.assertEqual(s2.additional_costs[0].amount, 120) + self.assertEqual(s2.additional_costs[1].amount, 120) + self.assertEqual(s2.additional_costs[2].amount, 240) + self.assertEqual(s2.additional_costs[3].amount, 240) + + make_job_card( + wo_doc.name, + [ + { + "name": wo_doc.operations[0].name, + "operation": "Test Operation 1", + "qty": 2, + "pending_qty": 2, + } + ], + ) + + job_card = frappe.get_last_doc("Job Card", {"work_order": wo_doc.name}) + from_time = add_to_date(now(), days=7) + job_card.append( + "time_logs", + { + "from_time": from_time, + "to_time": add_to_date(from_time, days=1), + "completed_qty": 2, + }, + ) + job_card.for_quantity = 2 + job_card.save() + job_card.submit() + + make_job_card( + wo_doc.name, + [ + { + "name": wo_doc.operations[1].name, + "operation": "Test Operation 2", + "qty": 2, + "pending_qty": 2, + } + ], + ) + + job_card = frappe.get_last_doc("Job Card", {"work_order": wo_doc.name}) + from_time = add_to_date(now(), days=8) + job_card.append( + "time_logs", + { + "from_time": from_time, + "to_time": add_to_date(from_time, days=2), + "completed_qty": 2, + }, + ) + job_card.for_quantity = 2 + job_card.save() + job_card.submit() + + s = frappe.get_doc(make_stock_entry_for_wo(wo_doc.name, "Manufacture", 2)) + s.submit() + + self.assertEqual(s.additional_costs[0].amount, 240) + self.assertEqual(s.additional_costs[1].amount, 240) + self.assertEqual(s.additional_costs[2].amount, 480) + self.assertEqual(s.additional_costs[3].amount, 480) + + s2.cancel() + + s = frappe.get_doc(make_stock_entry_for_wo(wo_doc.name, "Manufacture", 3)) + s.submit() + + self.assertEqual(s.additional_costs[0].amount, 240) + self.assertEqual(s.additional_costs[1].amount, 240) + self.assertEqual(s.additional_costs[2].amount, 480) + self.assertEqual(s.additional_costs[3].amount, 480) + def create_bom_with_multiple_operations(): "Create a BOM with multiple operations and Material Transfer against Job Card" diff --git a/erpnext/manufacturing/doctype/job_card_item/job_card_item.json b/erpnext/manufacturing/doctype/job_card_item/job_card_item.json index 69a7428f218..c8dd6403321 100644 --- a/erpnext/manufacturing/doctype/job_card_item/job_card_item.json +++ b/erpnext/manufacturing/doctype/job_card_item/job_card_item.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_bulk_edit": 1, "creation": "2018-07-09 17:20:44.737289", "doctype": "DocType", "editable_grid": 1, @@ -34,6 +35,7 @@ "ignore_user_permissions": 1, "in_list_view": 1, "label": "Source Warehouse", + "link_filters": "[[\"Warehouse\",\"disabled\",\"=\",0],[\"Warehouse\",\"is_group\",\"=\",0]]", "options": "Warehouse" }, { @@ -113,7 +115,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2025-12-04 14:30:19.472294", + "modified": "2026-05-12 12:22:18.506904", "modified_by": "Administrator", "module": "Manufacturing", "name": "Job Card Item", diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js index d26f6040f4c..5131b30c889 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.js +++ b/erpnext/manufacturing/doctype/work_order/work_order.js @@ -12,21 +12,10 @@ frappe.ui.form.on("Work Order", { frm.ignore_doctypes_on_cancel_all = ["Serial and Batch Bundle"]; // Set query for warehouses - frm.set_query("wip_warehouse", function () { - return { - filters: { - company: frm.doc.company, - }, - }; - }); - - frm.set_query("source_warehouse", function () { - return { - filters: { - company: frm.doc.company, - }, - }; - }); + frm.events.set_company_filters(frm, "wip_warehouse"); + frm.events.set_company_filters(frm, "source_warehouse"); + frm.events.set_company_filters(frm, "fg_warehouse"); + frm.events.set_company_filters(frm, "scrap_warehouse"); frm.set_query("source_warehouse", "required_items", function () { return { @@ -44,24 +33,6 @@ frappe.ui.form.on("Work Order", { }; }); - frm.set_query("fg_warehouse", function () { - return { - filters: { - company: frm.doc.company, - is_group: 0, - }, - }; - }); - - frm.set_query("scrap_warehouse", function () { - return { - filters: { - company: frm.doc.company, - is_group: 0, - }, - }; - }); - // Set query for BOM frm.set_query("bom_no", function () { if (frm.doc.production_item) { @@ -118,6 +89,16 @@ frappe.ui.form.on("Work Order", { }); }, + set_company_filters(frm, fieldname) { + frm.set_query(fieldname, () => { + return { + filters: { + company: frm.doc.company, + }, + }; + }); + }, + onload: function (frm) { if (!frm.doc.status) frm.doc.status = "Draft"; @@ -348,7 +329,7 @@ frappe.ui.form.on("Work Order", { { fieldtype: "Data", fieldname: "name", - label: __("Operation Id"), + label: __("Operation ID"), }, { fieldtype: "Float", @@ -425,6 +406,7 @@ frappe.ui.form.on("Work Order", { if (pending_qty) { dialog.fields_dict.operations.df.data.push({ + __checked: 1, name: data.name, operation: data.operation, workstation: data.workstation, diff --git a/erpnext/manufacturing/doctype/work_order/work_order.json b/erpnext/manufacturing/doctype/work_order/work_order.json index 2d5145141ae..9dc57a3b99c 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.json +++ b/erpnext/manufacturing/doctype/work_order/work_order.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_bulk_edit": 1, "allow_import": 1, "autoname": "naming_series:", "creation": "2025-04-09 12:09:40.634472", @@ -266,6 +267,7 @@ "fieldname": "wip_warehouse", "fieldtype": "Link", "label": "Work-in-Progress Warehouse", + "link_filters": "[[\"Warehouse\",\"disabled\",\"=\",0],[\"Warehouse\",\"is_group\",\"=\",0]]", "mandatory_depends_on": "eval:(!doc.skip_transfer || doc.from_wip_warehouse) && !doc.track_semi_finished_goods", "options": "Warehouse" }, @@ -274,6 +276,7 @@ "fieldname": "fg_warehouse", "fieldtype": "Link", "label": "Target Warehouse", + "link_filters": "[[\"Warehouse\",\"disabled\",\"=\",0],[\"Warehouse\",\"is_group\",\"=\",0]]", "options": "Warehouse", "read_only_depends_on": "subcontracting_inward_order" }, @@ -286,6 +289,7 @@ "fieldname": "scrap_warehouse", "fieldtype": "Link", "label": "Scrap Warehouse", + "link_filters": "[[\"Warehouse\",\"disabled\",\"=\",0],[\"Warehouse\",\"is_group\",\"=\",0]]", "options": "Warehouse" }, { @@ -513,6 +517,7 @@ "fieldname": "source_warehouse", "fieldtype": "Link", "label": "Source Warehouse", + "link_filters": "[[\"Warehouse\",\"disabled\",\"=\",0],[\"Warehouse\",\"is_group\",\"=\",0]]", "options": "Warehouse", "read_only_depends_on": "eval:doc.subcontracting_inward_order" }, @@ -706,7 +711,7 @@ "image_field": "image", "is_submittable": 1, "links": [], - "modified": "2026-04-17 13:42:12.374055", + "modified": "2026-05-19 12:20:38.102403", "modified_by": "Administrator", "module": "Manufacturing", "name": "Work Order", diff --git a/erpnext/manufacturing/doctype/work_order_item/work_order_item.json b/erpnext/manufacturing/doctype/work_order_item/work_order_item.json index e5f322ca367..dec4934ea4f 100644 --- a/erpnext/manufacturing/doctype/work_order_item/work_order_item.json +++ b/erpnext/manufacturing/doctype/work_order_item/work_order_item.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_bulk_edit": 1, "creation": "2016-04-18 07:38:26.314642", "doctype": "DocType", "editable_grid": 1, @@ -53,6 +54,7 @@ "ignore_user_permissions": 1, "in_list_view": 1, "label": "Source Warehouse", + "link_filters": "[[\"Warehouse\",\"disabled\",\"=\",0],[\"Warehouse\",\"is_group\",\"=\",0]]", "options": "Warehouse", "read_only_depends_on": "eval:parent.subcontracting_inward_order && doc.is_customer_provided_item" }, @@ -207,7 +209,7 @@ "grid_page_length": 50, "istable": 1, "links": [], - "modified": "2025-12-02 11:16:05.081613", + "modified": "2026-05-12 12:05:16.687866", "modified_by": "Administrator", "module": "Manufacturing", "name": "Work Order Item", diff --git a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json index 1bbafc08446..6d638b6e59b 100644 --- a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json +++ b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_bulk_edit": 1, "creation": "2014-07-11 11:51:00.453717", "doctype": "DocType", "editable_grid": 1, @@ -13,7 +14,10 @@ "amount", "base_amount", "has_corrective_cost", - "has_operating_cost" + "has_operating_cost", + "operation_id", + "qty", + "operating_component" ], "fields": [ { @@ -78,13 +82,38 @@ "fieldtype": "Check", "label": "Has Operating Cost", "read_only": 1 + }, + { + "fieldname": "operation_id", + "fieldtype": "Data", + "hidden": 1, + "label": "Operation ID", + "no_copy": 1, + "read_only": 1 + }, + { + "fieldname": "qty", + "fieldtype": "Float", + "hidden": 1, + "label": "Qty", + "no_copy": 1, + "non_negative": 1, + "read_only": 1 + }, + { + "fieldname": "operating_component", + "fieldtype": "Data", + "hidden": 1, + "label": "Operating Component", + "no_copy": 1, + "read_only": 1 } ], "grid_page_length": 50, "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2025-07-16 15:27:59.175530", + "modified": "2026-05-19 12:21:07.953801", "modified_by": "Administrator", "module": "Stock", "name": "Landed Cost Taxes and Charges", diff --git a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.py b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.py index a4fb129a7ae..e6a9c0535cf 100644 --- a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.py +++ b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.py @@ -22,9 +22,12 @@ class LandedCostTaxesandCharges(Document): expense_account: DF.Link | None has_corrective_cost: DF.Check has_operating_cost: DF.Check + operating_component: DF.Data | None + operation_id: DF.Data | None parent: DF.Data parentfield: DF.Data parenttype: DF.Data + qty: DF.Float # end: auto-generated types pass diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 2951b7272b3..f10f7db755c 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -10,7 +10,7 @@ from frappe import _, bold from frappe.model.document import Document from frappe.model.mapper import get_mapped_doc from frappe.query_builder import DocType -from frappe.query_builder.functions import Sum +from frappe.query_builder.functions import Max, Sum from frappe.utils import ( cint, comma_or, @@ -3875,28 +3875,33 @@ def get_work_order_details(work_order: str, company: str): } -def get_consumed_operating_cost(wo_name, bom_no): +def get_consumed_operating_cost(wo_name, bom_no, operation_id): table = frappe.qb.DocType("Stock Entry") child_table = frappe.qb.DocType("Landed Cost Taxes and Charges") query = ( frappe.qb.from_(child_table) .join(table) .on(child_table.parent == table.name) - .select(Sum(child_table.amount).as_("consumed_cost")) + .select( + Sum(child_table.amount).as_("consumed_cost"), + Sum(child_table.qty).as_("consumed_qty"), + child_table.operating_component, + ) .where( (table.docstatus == 1) & (table.work_order == wo_name) & (table.purpose == "Manufacture") & (table.bom_no == bom_no) & (child_table.has_operating_cost == 1) + & (child_table.operation_id == operation_id) ) + .groupby(child_table.operation_id, child_table.operating_component) ) - cost = query.run(pluck="consumed_cost") - return cost[0] if cost and cost[0] else 0 + return query.run(as_dict=True) -def get_operating_cost_per_unit(work_order=None, bom_no=None): - operating_cost_per_unit = 0 +def get_remaining_operating_cost(work_order=None, bom_no=None): + remaining_operating_cost = 0 if work_order: if ( bom_no @@ -3911,23 +3916,23 @@ def get_operating_cost_per_unit(work_order=None, bom_no=None): bom_no = work_order.bom_no for d in work_order.get("operations"): + consumed_op_cost = get_consumed_operating_cost(work_order.name, bom_no, d.name) or [] + cost = 0 + for row in consumed_op_cost: + cost += flt(row.consumed_cost) + if flt(d.completed_qty): - if not (remaining_qty := flt(d.completed_qty - work_order.produced_qty)): - continue - operating_cost_per_unit += ( - flt(d.actual_operating_cost - get_consumed_operating_cost(work_order.name, bom_no)) - / remaining_qty - ) + remaining_operating_cost += flt(d.actual_operating_cost - cost) elif work_order.qty: - operating_cost_per_unit += flt(d.planned_operating_cost) / flt(work_order.qty) + remaining_operating_cost += flt(d.planned_operating_cost) / flt(work_order.qty) # Get operating cost from BOM if not found in work_order. - if not operating_cost_per_unit and bom_no: + if not remaining_operating_cost and bom_no: bom = frappe.db.get_value("BOM", bom_no, ["operating_cost", "quantity"], as_dict=1) if bom.quantity: - operating_cost_per_unit = flt(bom.operating_cost) / flt(bom.quantity) + remaining_operating_cost = flt(bom.operating_cost) / flt(bom.quantity) - return operating_cost_per_unit + return remaining_operating_cost def get_used_alternative_items( From 14b17cd8a6e1e2273f2688e4375b054916d5017f Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 21 May 2026 14:56:35 +0530 Subject: [PATCH 056/249] fix: removed redundant code --- erpnext/stock/stock_ledger.py | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index 83c7aecd38d..0eafe4323a2 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -874,15 +874,6 @@ class update_entries_after: if not self.args.get("sle_id"): self.get_dynamic_incoming_outgoing_rate(sle) - if ( - sle.voucher_type == "Stock Reconciliation" - and (sle.serial_and_batch_bundle) - and sle.voucher_detail_no - and not self.args.get("sle_id") - and sle.is_cancelled == 0 - ): - self.reset_actual_qty_for_stock_reco(sle) - if ( sle.voucher_type in ["Purchase Receipt", "Purchase Invoice"] and sle.voucher_detail_no @@ -1059,30 +1050,6 @@ class update_entries_after: if not allow_zero_rate: self.wh_data.valuation_rate = self.get_fallback_rate(sle) - def reset_actual_qty_for_stock_reco(self, sle): - doc = frappe.get_doc("Stock Reconciliation", sle.voucher_no) - - if sle.actual_qty < 0: - doc.reload() - - sle.actual_qty = ( - flt(frappe.db.get_value("Stock Reconciliation Item", sle.voucher_detail_no, "current_qty")) - * -1 - ) - - if abs(sle.actual_qty) == 0.0: - sle.is_cancelled = 1 - - if sle.serial_and_batch_bundle: - for row in doc.items: - if row.name == sle.voucher_detail_no: - row.db_set("current_serial_and_batch_bundle", "") - - sabb_doc = frappe.get_doc("Serial and Batch Bundle", sle.serial_and_batch_bundle) - sabb_doc.voucher_detail_no = None - sabb_doc.voucher_no = None - sabb_doc.cancel() - def calculate_valuation_for_serial_batch_bundle(self, sle): if not frappe.db.exists("Serial and Batch Bundle", sle.serial_and_batch_bundle): return From 1a81265c2ceaf6166c7ef382abf008b4cb4e11be Mon Sep 17 00:00:00 2001 From: Pandiyan P Date: Thu, 21 May 2026 15:01:55 +0530 Subject: [PATCH 057/249] =?UTF-8?q?fix(manufacturing):=20remove=20forecast?= =?UTF-8?q?=5Fqty=20and=20adjust=5Fqty=20fields=20from=20sa=E2=80=A6=20(#5?= =?UTF-8?q?5129)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doctype/sales_forecast/sales_forecast.js | 8 -------- .../sales_forecast_item.json | 20 +------------------ .../sales_forecast_item.py | 2 -- 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/erpnext/manufacturing/doctype/sales_forecast/sales_forecast.js b/erpnext/manufacturing/doctype/sales_forecast/sales_forecast.js index a7acec295a9..340b35852b1 100644 --- a/erpnext/manufacturing/doctype/sales_forecast/sales_forecast.js +++ b/erpnext/manufacturing/doctype/sales_forecast/sales_forecast.js @@ -47,11 +47,3 @@ frappe.ui.form.on("Sales Forecast", { } }, }); - -frappe.ui.form.on("Sales Forecast Item", { - adjust_qty(frm, cdt, cdn) { - let row = locals[cdt][cdn]; - row.demand_qty = row.forecast_qty + row.adjust_qty; - frappe.model.set_value(cdt, cdn, "demand_qty", row.demand_qty); - }, -}); diff --git a/erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json b/erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json index 16c5275c0b8..96cec964beb 100644 --- a/erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json +++ b/erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json @@ -10,8 +10,6 @@ "item_name", "uom", "delivery_date", - "forecast_qty", - "adjust_qty", "demand_qty", "warehouse" ], @@ -55,22 +53,6 @@ "label": "Delivery Date", "read_only": 1 }, - { - "columns": 2, - "fieldname": "forecast_qty", - "fieldtype": "Float", - "in_list_view": 1, - "label": "Forecast Qty", - "non_negative": 1, - "read_only": 1 - }, - { - "columns": 2, - "fieldname": "adjust_qty", - "fieldtype": "Float", - "in_list_view": 1, - "label": "Adjust Qty" - }, { "columns": 3, "fieldname": "demand_qty", @@ -94,7 +76,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2025-08-18 21:59:38.859082", + "modified": "2026-05-21 12:38:47.636301", "modified_by": "Administrator", "module": "Manufacturing", "name": "Sales Forecast Item", diff --git a/erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.py b/erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.py index 5fcb718fb50..cebb6004158 100644 --- a/erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.py +++ b/erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.py @@ -14,10 +14,8 @@ class SalesForecastItem(Document): if TYPE_CHECKING: from frappe.types import DF - adjust_qty: DF.Float delivery_date: DF.Date | None demand_qty: DF.Float - forecast_qty: DF.Float item_code: DF.Link item_name: DF.Data | None parent: DF.Data From 1fd99337b343ef394926d6baedffa9da3b86019a Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 21 May 2026 15:05:44 +0530 Subject: [PATCH 058/249] fix: use get_query instead of get_all for data fetching --- .../report/sales_analytics/sales_analytics.py | 74 ++++++++++++------- 1 file changed, 49 insertions(+), 25 deletions(-) diff --git a/erpnext/selling/report/sales_analytics/sales_analytics.py b/erpnext/selling/report/sales_analytics/sales_analytics.py index f20f78d741d..2aac07ce3b5 100644 --- a/erpnext/selling/report/sales_analytics/sales_analytics.py +++ b/erpnext/selling/report/sales_analytics/sales_analytics.py @@ -191,12 +191,30 @@ class Analytics: self.get_sales_transactions_based_on_project() self.get_rows() + def _get_permitted_parent_names(self): + return frappe.qb.get_query( + table=self.filters.doc_type, + fields=["name"], + filters={ + "docstatus": 1, + "company": ["in", self.filters.company], + self.date_field: ("between", [self.filters.from_date, self.filters.to_date]), + }, + ignore_permissions=False, + ).run(pluck="name") + def get_sales_transactions_based_on_order_type(self): if self.filters["value_quantity"] == "Value": value_field = "base_net_total" else: value_field = "total_qty" + permitted_names = self._get_permitted_parent_names() + if not permitted_names: + self.entries = [] + self.get_teams() + return + doctype = DocType(self.filters.doc_type) self.entries = ( @@ -206,12 +224,7 @@ class Analytics: doctype[self.date_field], doctype[value_field].as_("value_field"), ) - .where( - (doctype.docstatus == 1) - & (doctype.company.isin(self.filters.company)) - & (doctype[self.date_field].between(self.filters.from_date, self.filters.to_date)) - & (IfNull(doctype.order_type, "") != "") - ) + .where((doctype.name.isin(permitted_names)) & (IfNull(doctype.order_type, "") != "")) .orderby(doctype.order_type) ).run(as_dict=True) @@ -250,9 +263,12 @@ class Analytics: if self.filters.doc_type in ["Sales Invoice", "Purchase Invoice", "Payment Entry"]: filters.update({"is_opening": "No"}) - self.entries = frappe.get_all( - self.filters.doc_type, fields=[entity, entity_name, value_field, self.date_field], filters=filters - ) + self.entries = frappe.qb.get_query( + table=self.filters.doc_type, + fields=[entity, entity_name, value_field, self.date_field], + filters=filters, + ignore_permissions=False, + ).run(as_dict=True) self.entity_names = {} for d in self.entries: @@ -264,6 +280,12 @@ class Analytics: else: value_field = "stock_qty" + permitted_names = self._get_permitted_parent_names() + if not permitted_names: + self.entries = [] + self.entity_names = {} + return + doctype = DocType(self.filters.doc_type) doctype_item = DocType(f"{self.filters.doc_type} Item") @@ -278,11 +300,7 @@ class Analytics: doctype_item[value_field].as_("value_field"), doctype[self.date_field], ) - .where( - (doctype_item.docstatus == 1) - & (doctype.company.isin(self.filters.company)) - & (doctype[self.date_field].between(self.filters.from_date, self.filters.to_date)) - ) + .where((doctype_item.docstatus == 1) & (doctype.name.isin(permitted_names))) ).run(as_dict=True) self.entity_names = {} @@ -312,11 +330,12 @@ class Analytics: if self.filters.doc_type in ["Sales Invoice", "Purchase Invoice", "Payment Entry"]: filters.update({"is_opening": "No"}) - self.entries = frappe.get_all( - self.filters.doc_type, + self.entries = frappe.qb.get_query( + table=self.filters.doc_type, fields=[entity_field, value_field, self.date_field], filters=filters, - ) + ignore_permissions=False, + ).run(as_dict=True) self.get_groups() def get_sales_transactions_based_on_item_group(self): @@ -325,6 +344,12 @@ class Analytics: else: value_field = "qty" + permitted_names = self._get_permitted_parent_names() + if not permitted_names: + self.entries = [] + self.get_groups() + return + doctype = DocType(self.filters.doc_type) doctype_item = DocType(f"{self.filters.doc_type} Item") @@ -337,11 +362,7 @@ class Analytics: doctype_item[value_field].as_("value_field"), doctype[self.date_field], ) - .where( - (doctype_item.docstatus == 1) - & (doctype.company.isin(self.filters.company)) - & (doctype[self.date_field].between(self.filters.from_date, self.filters.to_date)) - ) + .where((doctype_item.docstatus == 1) & (doctype.name.isin(permitted_names))) ).run(as_dict=True) self.get_groups() @@ -367,9 +388,12 @@ class Analytics: if self.filters.doc_type in ["Sales Invoice", "Purchase Invoice", "Payment Entry"]: filters.update({"is_opening": "No"}) - self.entries = frappe.get_all( - self.filters.doc_type, fields=[entity, value_field, self.date_field], filters=filters - ) + self.entries = frappe.qb.get_query( + table=self.filters.doc_type, + fields=[entity, value_field, self.date_field], + filters=filters, + ignore_permissions=False, + ).run(as_dict=True) def get_rows(self): self.data = [] From 91a2a7b0a0e1015b9725df0bea4e9f4aa5a54a73 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Thu, 21 May 2026 12:15:15 +0530 Subject: [PATCH 059/249] refactor: migrate get_parent_customer_groups to query builder Co-Authored-By: Claude Sonnet 4.6 --- .../setup/doctype/customer_group/customer_group.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/erpnext/setup/doctype/customer_group/customer_group.py b/erpnext/setup/doctype/customer_group/customer_group.py index 9a05760ec29..d0af3af7ba3 100644 --- a/erpnext/setup/doctype/customer_group/customer_group.py +++ b/erpnext/setup/doctype/customer_group/customer_group.py @@ -75,13 +75,11 @@ class CustomerGroup(NestedSet): def get_parent_customer_groups(customer_group): lft, rgt = frappe.db.get_value("Customer Group", customer_group, ["lft", "rgt"]) - - return frappe.db.sql( - """select name from `tabCustomer Group` - where lft <= %s and rgt >= %s - order by lft asc""", - (lft, rgt), - as_dict=True, + return frappe.get_all( + "Customer Group", + filters=[["lft", "<=", lft], ["rgt", ">=", rgt]], + fields=["name"], + order_by="lft asc", ) From cb610b79d2156e8b9c3d78a00ce0f63e4adfbbe1 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Thu, 21 May 2026 12:15:26 +0530 Subject: [PATCH 060/249] feat: add get_parent_supplier_groups using query builder Co-Authored-By: Claude Sonnet 4.6 --- erpnext/setup/doctype/supplier_group/supplier_group.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/erpnext/setup/doctype/supplier_group/supplier_group.py b/erpnext/setup/doctype/supplier_group/supplier_group.py index 5e1cab40450..a5ff5b8b6b4 100644 --- a/erpnext/setup/doctype/supplier_group/supplier_group.py +++ b/erpnext/setup/doctype/supplier_group/supplier_group.py @@ -70,3 +70,13 @@ class SupplierGroup(NestedSet): def on_trash(self): NestedSet.validate_if_child_exists(self) frappe.utils.nestedset.update_nsm(self) + + +def get_parent_supplier_groups(supplier_group): + lft, rgt = frappe.db.get_value("Supplier Group", supplier_group, ["lft", "rgt"]) + return frappe.get_all( + "Supplier Group", + filters=[["lft", "<=", lft], ["rgt", ">=", rgt]], + fields=["name"], + order_by="lft asc", + ) From f98975f51a62d611f536368671c3dbaf81d61eb9 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Thu, 21 May 2026 12:16:01 +0530 Subject: [PATCH 061/249] refactor: rewrite get_tax_template using query builder Migrates from raw frappe.db.sql with string interpolation to frappe.qb. Adds hierarchical supplier_group matching (mirrors customer_group behaviour). Removes unused get_customer_group_condition helper. Co-Authored-By: Claude Sonnet 4.6 --- erpnext/accounts/doctype/tax_rule/tax_rule.py | 59 +++++++++---------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.py b/erpnext/accounts/doctype/tax_rule/tax_rule.py index c7eb11e071a..fb91fef654e 100644 --- a/erpnext/accounts/doctype/tax_rule/tax_rule.py +++ b/erpnext/accounts/doctype/tax_rule/tax_rule.py @@ -14,6 +14,7 @@ from frappe.utils import cstr from frappe.utils.nestedset import get_root_of from erpnext.setup.doctype.customer_group.customer_group import get_parent_customer_groups +from erpnext.setup.doctype.supplier_group.supplier_group import get_parent_supplier_groups class IncorrectCustomerGroup(frappe.ValidationError): @@ -176,38 +177,44 @@ def get_party_details(party: str | None, party_type: str, args: dict | None = No def get_tax_template(posting_date, args): """Get matching tax rule""" args = frappe._dict(args) - conditions = [] + + TaxRule = DocType("Tax Rule") + query = frappe.qb.from_(TaxRule).select("*") if posting_date: - conditions.append( - f"""(from_date is null or from_date <= '{posting_date}') - and (to_date is null or to_date >= '{posting_date}')""" + query = query.where( + (TaxRule.from_date.isnull() | (TaxRule.from_date <= posting_date)) + & (TaxRule.to_date.isnull() | (TaxRule.to_date >= posting_date)) ) else: - conditions.append("(from_date is null) and (to_date is null)") + query = query.where(TaxRule.from_date.isnull() & TaxRule.to_date.isnull()) - conditions.append( - "ifnull(tax_category, '') = {}".format(frappe.db.escape(cstr(args.get("tax_category")), False)) - ) - if "tax_category" in args.keys(): - del args["tax_category"] + def get_group_ancestors(doctype, get_parents, value): + if not value: + value = get_root_of(doctype) + return [""] + [d.name for d in get_parents(value)] + + group_fields = { + "customer_group": ("Customer Group", get_parent_customer_groups), + "supplier_group": ("Supplier Group", get_parent_supplier_groups), + } + + args.setdefault("tax_category", "") for key, value in args.items(): if key == "use_for_shopping_cart": - conditions.append(f"use_for_shopping_cart = {1 if value else 0}") - elif key == "customer_group": - if not value: - value = get_root_of("Customer Group") - customer_group_condition = get_customer_group_condition(value) - conditions.append(f"ifnull({key}, '') in ('', {customer_group_condition})") + query = query.where(TaxRule.use_for_shopping_cart == value) + elif key == "tax_category": + query = query.where(IfNull(TaxRule.tax_category, "") == (value or "")) + elif key in group_fields: + doctype, get_parents = group_fields[key] + query = query.where( + IfNull(TaxRule[key], "").isin(get_group_ancestors(doctype, get_parents, value)) + ) else: - conditions.append(f"ifnull({key}, '') in ('', {frappe.db.escape(cstr(value))})") + query = query.where(IfNull(TaxRule[key], "").isin(["", value or ""])) - tax_rule = frappe.db.sql( - """select * from `tabTax Rule` - where {}""".format(" and ".join(conditions)), - as_dict=True, - ) + tax_rule = query.run(as_dict=True) if not tax_rule: return None @@ -236,11 +243,3 @@ def get_tax_template(posting_date, args): return None return tax_template - - -def get_customer_group_condition(customer_group): - condition = "" - customer_groups = ["%s" % (frappe.db.escape(d.name)) for d in get_parent_customer_groups(customer_group)] - if customer_groups: - condition = ",".join(["%s"] * len(customer_groups)) % (tuple(customer_groups)) - return condition From 4d43c74f5f7ebf3cb23ae64f178ba74f26988581 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Thu, 21 May 2026 12:16:22 +0530 Subject: [PATCH 062/249] fix: default use_for_shopping_cart to 0 in set_taxes Ensures regular transactions only match tax rules where use_for_shopping_cart = 0, preventing webshop-specific rules from applying to standard documents. Co-Authored-By: Claude Sonnet 4.6 --- erpnext/accounts/party.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index bb603c7bb1b..fa82b3e9188 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -762,7 +762,7 @@ def set_taxes( args.update({"tax_type": "Purchase"}) if use_for_shopping_cart: - args.update({"use_for_shopping_cart": use_for_shopping_cart}) + args.update({"use_for_shopping_cart": cint(use_for_shopping_cart)}) return get_tax_template(posting_date, args) From 8c4311872569d38ee8c989eff46905825a5728fe Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Thu, 21 May 2026 12:27:39 +0530 Subject: [PATCH 063/249] test: add tests for supplier group hierarchy and use_for_shopping_cart filter Co-Authored-By: Claude Sonnet 4.6 --- .../doctype/tax_rule/test_tax_rule.py | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/erpnext/accounts/doctype/tax_rule/test_tax_rule.py b/erpnext/accounts/doctype/tax_rule/test_tax_rule.py index cd47d689c60..d36011bc5ff 100644 --- a/erpnext/accounts/doctype/tax_rule/test_tax_rule.py +++ b/erpnext/accounts/doctype/tax_rule/test_tax_rule.py @@ -61,6 +61,117 @@ class TestTaxRule(ERPNextTestSuite): "_Test Sales Taxes and Charges Template - _TC", ) + def test_for_parent_supplier_group(self): + purchase_template = "_Test Purchase Taxes and Charges Template - _TC" + if not frappe.db.exists("Purchase Taxes and Charges Template", purchase_template): + frappe.get_doc( + { + "doctype": "Purchase Taxes and Charges Template", + "title": "_Test Purchase Taxes and Charges Template", + "company": "_Test Company", + "taxes": [ + { + "account_head": "_Test Account VAT - _TC", + "charge_type": "On Net Total", + "description": "VAT", + "doctype": "Purchase Taxes and Charges", + "cost_center": "Main - _TC", + "rate": 6, + } + ], + } + ).insert() + + make_tax_rule( + supplier_group="All Supplier Groups", + tax_type="Purchase", + purchase_tax_template=purchase_template, + priority=1, + use_for_shopping_cart=0, + from_date="2015-01-01", + save=1, + ) + + # "_Test Supplier Group" has "All Supplier Groups" as its parent — should match hierarchically + self.assertEqual( + get_tax_template( + "2015-01-01", + { + "supplier_group": "_Test Supplier Group", + "tax_type": "Purchase", + "use_for_shopping_cart": 0, + }, + ), + purchase_template, + ) + + def test_use_for_shopping_cart_filter(self): + city = "Test Cart City" + # higher priority ensures this rule wins when use_for_shopping_cart is not filtered + make_tax_rule( + customer="_Test Customer", + billing_city=city, + sales_tax_template="_Test Sales Taxes and Charges Template - _TC", + use_for_shopping_cart=0, + priority=2, + save=1, + ) + make_tax_rule( + customer="_Test Customer", + billing_city=city, + sales_tax_template="_Test Sales Taxes and Charges Template 1 - _TC", + use_for_shopping_cart=1, + priority=1, + save=1, + ) + + # Cart request (use_for_shopping_cart=1) filters to cart rules only + self.assertEqual( + get_tax_template( + "2015-01-01", + {"customer": "_Test Customer", "billing_city": city, "use_for_shopping_cart": 1}, + ), + "_Test Sales Taxes and Charges Template 1 - _TC", + ) + + # Non-cart request omits use_for_shopping_cart — no filter is applied, both rules + # are candidates; non-cart rule wins by higher priority + self.assertEqual( + get_tax_template( + "2015-01-01", + {"customer": "_Test Customer", "billing_city": city}, + ), + "_Test Sales Taxes and Charges Template - _TC", + ) + + def test_use_for_shopping_cart_default(self): + city = "Test Default Cart City" + # use_for_shopping_cart not set — Check field defaults to 0 + make_tax_rule( + customer="_Test Customer", + billing_city=city, + sales_tax_template="_Test Sales Taxes and Charges Template - _TC", + use_for_shopping_cart=0, # Default is set to 1. + save=1, + ) + + # Non-cart request (no use_for_shopping_cart in args) matches the rule + self.assertEqual( + get_tax_template( + "2015-01-01", + {"customer": "_Test Customer", "billing_city": city}, + ), + "_Test Sales Taxes and Charges Template - _TC", + ) + + # Cart request (use_for_shopping_cart=1) does not match — rule has default 0 + self.assertIsNone( + get_tax_template( + "2015-01-01", + {"customer": "_Test Customer", "billing_city": city, "use_for_shopping_cart": 1}, + ) + ) + def test_conflict_with_overlapping_dates(self): tax_rule1 = make_tax_rule( customer="_Test Customer", From 98dae6e43a6b7ab24dc92155d61b6e4fa249ba22 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 21 May 2026 17:04:33 +0530 Subject: [PATCH 064/249] fix: don't reset net_purchase_amount for Composite Asset if already set --- erpnext/assets/doctype/asset/asset.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js index 1b333d51c17..1ba9b12d2b1 100644 --- a/erpnext/assets/doctype/asset/asset.js +++ b/erpnext/assets/doctype/asset/asset.js @@ -551,7 +551,9 @@ frappe.ui.form.on("Asset", { asset_type: function (frm) { if (frm.doc.docstatus == 0) { if (frm.doc.asset_type == "Composite Asset") { - frm.set_value("net_purchase_amount", 0); + if (!frm.doc.net_purchase_amount) { + frm.set_value("net_purchase_amount", 0); + } } else { frm.set_df_property("net_purchase_amount", "read_only", 0); } From 068f7b9a8d31d3b4c38b6a4aa0bc6dc94e2c8874 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 21 May 2026 10:57:38 +0530 Subject: [PATCH 065/249] refactor: split large functions into smaller functions --- .../stock/doctype/stock_entry/stock_entry.py | 505 ++++++++-------- .../stock_entry_handler/disassemble.py | 421 +++++++------ .../stock_entry_handler/manufacturing.py | 569 +++++++++--------- .../stock_entry_handler/material_transfer.py | 281 ++++----- .../stock_entry_handler/serial_batch.py | 274 ++++----- .../stock_entry_handler/subcontracting.py | 130 ++-- 6 files changed, 1093 insertions(+), 1087 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 1daad3b0454..66b74f149fb 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -177,11 +177,11 @@ class StockEntry(StockController, SubcontractingInwardController): def __setattr__(self, name, value): super().__setattr__(name, value) if name == "purpose": - self.initialize_class_object() + self._configure_purpose_class() def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - self.initialize_class_object() + self._configure_purpose_class() if self.subcontracting_inward_order: self.subcontract_data = frappe._dict( @@ -202,7 +202,7 @@ class StockEntry(StockController, SubcontractingInwardController): } ) - def initialize_class_object(self): + def _configure_purpose_class(self): purpose_map = { "Manufacture": ManufactureStockEntry, "Repack": RepackStockEntry, @@ -215,10 +215,10 @@ class StockEntry(StockController, SubcontractingInwardController): "Material Receipt": MaterialReceiptStockEntry, } - self.se_handler_class = purpose_map.get(self.purpose) + self.purpose_cls = purpose_map.get(self.purpose) if self.purpose == "Material Transfer" and self.transfer_for_material_request(): - self.se_handler_class = MaterialRequestStockEntry + self.purpose_cls = MaterialRequestStockEntry def transfer_for_material_request(self): if self.outgoing_stock_entry and frappe.get_all( @@ -252,8 +252,8 @@ class StockEntry(StockController, SubcontractingInwardController): def before_validate(self): from erpnext.stock.doctype.putaway_rule.putaway_rule import apply_putaway_rule - if self.se_handler_class and hasattr(self.se_handler_class, "before_validate"): - self.se_handler_class(self).before_validate() + if self.purpose_cls and hasattr(self.purpose_cls, "before_validate"): + self.purpose_cls(self).before_validate() self.set_default_cost_center() @@ -282,8 +282,8 @@ class StockEntry(StockController, SubcontractingInwardController): ) def validate(self): - if self.se_handler_class: - self.se_handler_class(self).validate() + if self.purpose_cls: + self.purpose_cls(self).validate() self.validate_duplicate_serial_and_batch_bundle("items") self.validate_posting_time() @@ -327,8 +327,8 @@ class StockEntry(StockController, SubcontractingInwardController): StockEntrySABB(self).make_serial_and_batch_bundle_for_outward() def on_submit(self): - if self.se_handler_class and hasattr(self.se_handler_class, "on_submit"): - self.se_handler_class(self).on_submit() + if self.purpose_cls and hasattr(self.purpose_cls, "on_submit"): + self.purpose_cls(self).on_submit() self.make_bundle_using_old_serial_batch_fields() self.adjust_stock_reservation_entries_for_return() @@ -347,8 +347,8 @@ class StockEntry(StockController, SubcontractingInwardController): super().on_submit_subcontracting_inward() def on_cancel(self): - if self.se_handler_class and hasattr(self.se_handler_class, "on_cancel"): - self.se_handler_class(self).on_cancel() + if self.purpose_cls and hasattr(self.purpose_cls, "on_cancel"): + self.purpose_cls(self).on_cancel() self.delink_asset_repair_sabb() self.validate_closed_subcontracting_order() @@ -474,36 +474,37 @@ class StockEntry(StockController, SubcontractingInwardController): def validate_fg_completed_qty(self): if self.purpose != "Manufacture" or not self.from_bom: return + fg_qty = self._aggregate_fg_qty() + if fg_qty: + self._check_process_loss_qty(fg_qty) + def _aggregate_fg_qty(self): fg_qty = defaultdict(float) for d in self.items: if d.is_finished_item: fg_qty[d.item_code] += flt(d.qty) + return fg_qty - if not fg_qty: - return - + def _check_process_loss_qty(self, fg_qty): precision = frappe.get_precision("Stock Entry Detail", "qty") fg_item = next(iter(fg_qty.keys())) fg_item_qty = flt(fg_qty[fg_item], precision) fg_completed_qty = flt(self.fg_completed_qty, precision) - for d in self.items: - if not fg_qty.get(d.item_code): - continue + if fg_qty.get(d.item_code): + self._validate_fg_qty_with_process_loss(d, fg_item_qty, fg_completed_qty, precision) - if (fg_completed_qty - fg_item_qty) > 0: - self.process_loss_qty = fg_completed_qty - fg_item_qty - - if not self.process_loss_qty: - continue - - if fg_completed_qty != (flt(fg_item_qty, precision) + flt(self.process_loss_qty, precision)): - frappe.throw( - _( - "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." - ).format(frappe.bold(self.process_loss_qty), frappe.bold(d.item_code)) - ) + def _validate_fg_qty_with_process_loss(self, d, fg_item_qty, fg_completed_qty, precision): + if (fg_completed_qty - fg_item_qty) > 0: + self.process_loss_qty = fg_completed_qty - fg_item_qty + if not self.process_loss_qty: + return + if fg_completed_qty != (flt(fg_item_qty, precision) + flt(self.process_loss_qty, precision)): + frappe.throw( + _( + "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." + ).format(frappe.bold(self.process_loss_qty), frappe.bold(d.item_code)) + ) def validate_difference_account(self): if not cint(erpnext.is_perpetual_inventory_enabled(self.company)): @@ -546,71 +547,66 @@ class StockEntry(StockController, SubcontractingInwardController): self.set_total_amount() def set_basic_rate(self, reset_outgoing_rate=True, raise_error_if_no_rate=True): - """ - Set rate for outgoing, secondary and finished items - """ - # Set rate for outgoing items + """Set rate for outgoing, secondary and finished items.""" outgoing_items_cost = self.set_rate_for_outgoing_items(reset_outgoing_rate, raise_error_if_no_rate) + raise_error_if_no_rate = raise_error_if_no_rate and not self.is_new() - items = [] - # Set basic rate for incoming items + zero_valuation_items = [] for d in self.get("items"): if d.s_warehouse or d.set_basic_rate_manually: continue + self._set_incoming_item_rate(d, outgoing_items_cost, raise_error_if_no_rate, zero_valuation_items) - if d.allow_zero_valuation_rate and d.basic_rate and self.purpose != "Receive from Customer": - d.basic_rate = 0.0 - items.append(d.item_code) - elif d.is_finished_item: - if self.purpose == "Manufacture": - d.basic_rate = self.get_basic_rate_for_manufactured_item( - d.transfer_qty, outgoing_items_cost - ) - elif self.purpose == "Repack": - d.basic_rate = self.get_basic_rate_for_repacked_items(d.transfer_qty, outgoing_items_cost) + if zero_valuation_items: + self._notify_zero_valuation_rate(zero_valuation_items) - if self.bom_no: - d.basic_rate *= frappe.get_value("BOM", self.bom_no, "cost_allocation_per") / 100 - elif d.type and d.bom_secondary_item: - cost_allocation_per = frappe.get_value( - "BOM Secondary Item", d.bom_secondary_item, "cost_allocation_per" - ) - d.basic_rate = (outgoing_items_cost * (cost_allocation_per / 100)) / d.transfer_qty + def _set_incoming_item_rate(self, d, outgoing_items_cost, raise_error_if_no_rate, zero_valuation_items): + if d.allow_zero_valuation_rate and d.basic_rate and self.purpose != "Receive from Customer": + d.basic_rate = 0.0 + zero_valuation_items.append(d.item_code) + elif d.is_finished_item: + if self.purpose == "Manufacture": + d.basic_rate = self.get_basic_rate_for_manufactured_item(d.transfer_qty, outgoing_items_cost) + elif self.purpose == "Repack": + d.basic_rate = self.get_basic_rate_for_repacked_items(d.transfer_qty, outgoing_items_cost) - if not d.basic_rate and not d.allow_zero_valuation_rate: - if self.is_new(): - raise_error_if_no_rate = False + if self.bom_no: + d.basic_rate *= frappe.get_value("BOM", self.bom_no, "cost_allocation_per") / 100 + elif d.type and d.bom_secondary_item: + cost_allocation_per = frappe.get_value( + "BOM Secondary Item", d.bom_secondary_item, "cost_allocation_per" + ) + d.basic_rate = (outgoing_items_cost * (cost_allocation_per / 100)) / d.transfer_qty - d.basic_rate = get_valuation_rate( - d.item_code, - d.t_warehouse, - self.doctype, - self.name, - d.allow_zero_valuation_rate, - currency=erpnext.get_company_currency(self.company), - company=self.company, - raise_error_if_no_rate=raise_error_if_no_rate, - batch_no=d.batch_no, - serial_and_batch_bundle=d.serial_and_batch_bundle, - ) + if not d.basic_rate and not d.allow_zero_valuation_rate: + d.basic_rate = get_valuation_rate( + d.item_code, + d.t_warehouse, + self.doctype, + self.name, + d.allow_zero_valuation_rate, + currency=erpnext.get_company_currency(self.company), + company=self.company, + raise_error_if_no_rate=raise_error_if_no_rate, + batch_no=d.batch_no, + serial_and_batch_bundle=d.serial_and_batch_bundle, + ) - # do not round off basic rate to avoid precision loss - d.basic_rate = flt(d.basic_rate) - d.basic_amount = flt(flt(d.transfer_qty) * flt(d.basic_rate), d.precision("basic_amount")) + # do not round off basic rate to avoid precision loss + d.basic_rate = flt(d.basic_rate) + d.basic_amount = flt(flt(d.transfer_qty) * flt(d.basic_rate), d.precision("basic_amount")) - if items: - message = "" + def _notify_zero_valuation_rate(self, items): + if len(items) > 1: + message = _( + "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" + ).format(", ".join(frappe.bold(item) for item in items)) + else: + message = _( + "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" + ).format(frappe.bold(items[0])) - if len(items) > 1: - message = _( - "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" - ).format(", ".join(frappe.bold(item) for item in items)) - else: - message = _( - "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" - ).format(frappe.bold(items[0])) - - frappe.msgprint(message, alert=True) + frappe.msgprint(message, alert=True) def set_rate_for_outgoing_items(self, reset_outgoing_rate=True, raise_error_if_no_rate=True): outgoing_items_cost = 0.0 @@ -662,68 +658,78 @@ class StockEntry(StockController, SubcontractingInwardController): scrap_items_cost = sum([flt(d.basic_amount) for d in self.get("items") if d.is_legacy_scrap_item]) if settings.material_consumption: - if settings.get_rm_cost_from_consumption_entry and self.work_order: - # Validate only if Material Consumption Entry exists for the Work Order. - if frappe.db.exists( - "Stock Entry", - { - "docstatus": 1, - "work_order": self.work_order, - "purpose": "Material Consumption for Manufacture", - }, - ): - for item in self.items: - if not item.is_finished_item and not item.type and not item.is_legacy_scrap_item: - label = frappe.get_meta(settings.doctype).get_label( - "get_rm_cost_from_consumption_entry" - ) - frappe.throw( - _( - "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." - ).format( - item.idx, - frappe.bold(label), - frappe.bold(_("Manufacture")), - frappe.bold(_("Material Consumption for Manufacture")), - ) - ) - - if frappe.db.exists( - "Stock Entry", - { - "docstatus": 1, - "work_order": self.work_order, - "purpose": "Manufacture", - "name": ("!=", self.name), - }, - ): - frappe.throw( - _("Only one {0} entry can be created against the Work Order {1}").format( - frappe.bold(_("Manufacture")), frappe.bold(self.work_order) - ) - ) - - SE = frappe.qb.DocType("Stock Entry") - SE_ITEM = frappe.qb.DocType("Stock Entry Detail") - - outgoing_items_cost = ( - frappe.qb.from_(SE) - .left_join(SE_ITEM) - .on(SE.name == SE_ITEM.parent) - .select(Sum(SE_ITEM.valuation_rate * SE_ITEM.transfer_qty)) - .where( - (SE.docstatus == 1) - & (SE.work_order == self.work_order) - & (SE.purpose == "Material Consumption for Manufacture") - ) - ).run()[0][0] or 0 - - elif not outgoing_items_cost: - bom_items = self.get_bom_raw_materials(finished_item_qty) - outgoing_items_cost = sum([flt(row.qty) * flt(row.rate) for row in bom_items.values()]) + outgoing_items_cost = self._get_rm_cost_for_manufacture( + settings, finished_item_qty, outgoing_items_cost + ) return flt((outgoing_items_cost - scrap_items_cost) / finished_item_qty) + def _get_rm_cost_for_manufacture(self, settings, finished_item_qty, outgoing_items_cost): + if settings.get_rm_cost_from_consumption_entry and self.work_order: + if frappe.db.exists( + "Stock Entry", + { + "docstatus": 1, + "work_order": self.work_order, + "purpose": "Material Consumption for Manufacture", + }, + ): + self._validate_no_raw_materials_in_manufacture_entry(settings) + self._validate_single_manufacture_entry() + return self._fetch_consumption_entry_cost() + elif not outgoing_items_cost: + bom_items = self.get_bom_raw_materials(finished_item_qty) + outgoing_items_cost = sum([flt(row.qty) * flt(row.rate) for row in bom_items.values()]) + + return outgoing_items_cost + + def _validate_no_raw_materials_in_manufacture_entry(self, settings): + for item in self.items: + if not item.is_finished_item and not item.type and not item.is_legacy_scrap_item: + label = frappe.get_meta(settings.doctype).get_label("get_rm_cost_from_consumption_entry") + frappe.throw( + _( + "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." + ).format( + item.idx, + frappe.bold(label), + frappe.bold(_("Manufacture")), + frappe.bold(_("Material Consumption for Manufacture")), + ) + ) + + def _validate_single_manufacture_entry(self): + if frappe.db.exists( + "Stock Entry", + { + "docstatus": 1, + "work_order": self.work_order, + "purpose": "Manufacture", + "name": ("!=", self.name), + }, + ): + frappe.throw( + _("Only one {0} entry can be created against the Work Order {1}").format( + frappe.bold(_("Manufacture")), frappe.bold(self.work_order) + ) + ) + + def _fetch_consumption_entry_cost(self): + SE = frappe.qb.DocType("Stock Entry") + SE_ITEM = frappe.qb.DocType("Stock Entry Detail") + + return ( + frappe.qb.from_(SE) + .left_join(SE_ITEM) + .on(SE.name == SE_ITEM.parent) + .select(Sum(SE_ITEM.valuation_rate * SE_ITEM.transfer_qty)) + .where( + (SE.docstatus == 1) + & (SE.work_order == self.work_order) + & (SE.purpose == "Material Consumption for Manufacture") + ) + ).run()[0][0] or 0 + def distribute_additional_costs(self): # If no incoming items, set additional costs blank if not any(d.item_code for d in self.items if d.t_warehouse): @@ -1044,11 +1050,20 @@ class StockEntry(StockController, SubcontractingInwardController): total_basic_amount = sum(flt(t.basic_amount) for t in self.get("items") if t.t_warehouse) divide_based_on = total_basic_amount - if self.get("additional_costs") and not total_basic_amount: - # if total_basic_amount is 0, distribute additional charges based on qty - divide_based_on = sum(item.qty for item in list(self.get("items"))) + divide_based_on = sum(item.qty for item in self.get("items")) + item_account_wise_additional_cost = self._build_additional_cost_per_item_account( + total_basic_amount, divide_based_on + ) + + if item_account_wise_additional_cost: + self._append_additional_cost_gl_entries(gl_entries, item_account_wise_additional_cost) + + self.set_gl_entries_for_landed_cost_voucher(gl_entries, inventory_account_map) + return process_gl_map(gl_entries, from_repost=frappe.flags.through_repost_item_valuation) + + def _build_additional_cost_per_item_account(self, total_basic_amount, divide_based_on): item_account_wise_additional_cost = {} for t in self.get("additional_costs"): @@ -1064,56 +1079,44 @@ class StockEntry(StockController, SubcontractingInwardController): ) multiply_based_on = d.basic_amount if total_basic_amount else d.qty + entry = item_account_wise_additional_cost[(d.item_code, d.name)][t.expense_account] + entry["amount"] += flt(t.amount * multiply_based_on) / divide_based_on + entry["base_amount"] += flt(t.base_amount * multiply_based_on) / divide_based_on - item_account_wise_additional_cost[(d.item_code, d.name)][t.expense_account]["amount"] += ( - flt(t.amount * multiply_based_on) / divide_based_on + return item_account_wise_additional_cost + + def _append_additional_cost_gl_entries(self, gl_entries, item_account_wise_additional_cost): + for d in self.get("items"): + for account, amount in item_account_wise_additional_cost.get((d.item_code, d.name), {}).items(): + if not amount: + continue + + gl_entries.append( + self.get_gl_dict( + { + "account": account, + "against": d.expense_account, + "cost_center": d.cost_center, + "remarks": self.get("remarks") or _("Accounting Entry for Stock"), + "credit_in_account_currency": flt(amount["amount"]), + "credit": flt(amount["base_amount"]), + }, + item=d, + ) ) - item_account_wise_additional_cost[(d.item_code, d.name)][t.expense_account][ - "base_amount" - ] += flt(t.base_amount * multiply_based_on) / divide_based_on - - if item_account_wise_additional_cost: - for d in self.get("items"): - for account, amount in item_account_wise_additional_cost.get( - (d.item_code, d.name), {} - ).items(): - if not amount: - continue - - gl_entries.append( - self.get_gl_dict( - { - "account": account, - "against": d.expense_account, - "cost_center": d.cost_center, - "remarks": self.get("remarks") or _("Accounting Entry for Stock"), - "credit_in_account_currency": flt(amount["amount"]), - "credit": flt(amount["base_amount"]), - }, - item=d, - ) + gl_entries.append( + self.get_gl_dict( + { + "account": d.expense_account, + "against": account, + "cost_center": d.cost_center, + "remarks": self.get("remarks") or _("Accounting Entry for Stock"), + "credit": -1 * amount["base_amount"], # negative credit instead of debit + }, + item=d, ) - - gl_entries.append( - self.get_gl_dict( - { - "account": d.expense_account, - "against": account, - "cost_center": d.cost_center, - "remarks": self.get("remarks") or _("Accounting Entry for Stock"), - "credit": -1 - * amount[ - "base_amount" - ], # put it as negative credit instead of debit purposefully - }, - item=d, - ) - ) - - self.set_gl_entries_for_landed_cost_voucher(gl_entries, inventory_account_map) - - return process_gl_map(gl_entries, from_repost=frappe.flags.through_repost_item_valuation) + ) def set_gl_entries_for_landed_cost_voucher(self, gl_entries, inventory_account_map): landed_cost_entries = self.get_item_account_wise_lcv_entries() @@ -1240,49 +1243,68 @@ class StockEntry(StockController, SubcontractingInwardController): @frappe.whitelist() def get_item_details(self, args: ItemDetailsCtx | None = None, for_update: bool = False): - item = frappe.qb.DocType("Item") + item = self._fetch_item_data(args) + item_group_defaults = get_item_group_defaults(item.name, self.company) + brand_defaults = get_brand_defaults(item.name, self.company) + + ret = self._build_item_ret(args, item, item_group_defaults, brand_defaults, for_update) + self._apply_account_defaults(ret) + + args["posting_date"] = self.posting_date + args["posting_time"] = self.posting_time + ret.update(get_warehouse_details(args) if args.get("warehouse") else {}) + + if self.purpose == "Send to Subcontractor": + self._resolve_subcontract_item(args, ret) + + barcode_data = get_barcode_data(item_code=item.name) + if barcode_data and len(barcode_data.get(item.name)) == 1: + ret["barcode"] = barcode_data.get(item.name)[0] + + return ret + + def _fetch_item_data(self, args): + item_dt = frappe.qb.DocType("Item") item_default = frappe.qb.DocType("Item Default") - query = ( - frappe.qb.from_(item) + result = ( + frappe.qb.from_(item_dt) .left_join(item_default) - .on((item.name == item_default.parent) & (item_default.company == self.company)) + .on((item_dt.name == item_default.parent) & (item_default.company == self.company)) .select( - item.name, - item.stock_uom, - item.description, - item.image, - item.is_stock_item, - item.item_name, - item.item_group, - item.has_batch_no, - item.sample_quantity, - item.has_serial_no, - item.allow_alternative_item, + item_dt.name, + item_dt.stock_uom, + item_dt.description, + item_dt.image, + item_dt.is_stock_item, + item_dt.item_name, + item_dt.item_group, + item_dt.has_batch_no, + item_dt.sample_quantity, + item_dt.has_serial_no, + item_dt.allow_alternative_item, item_default.expense_account, item_default.buying_cost_center, ) .where( - (item.name == args.get("item_code")) - & (item.disabled == 0) + (item_dt.name == args.get("item_code")) + & (item_dt.disabled == 0) & ( - (item.end_of_life.isnull()) - | (item.end_of_life < "1900-01-01") - | (item.end_of_life > nowdate()) + (item_dt.end_of_life.isnull()) + | (item_dt.end_of_life < "1900-01-01") + | (item_dt.end_of_life > nowdate()) ) ) - ) - item = query.run(as_dict=True) + ).run(as_dict=True) - if not item: + if not result: frappe.throw( _("Item {0} is not active or end of life has been reached").format(args.get("item_code")) ) - item = item[0] - item_group_defaults = get_item_group_defaults(item.name, self.company) - brand_defaults = get_brand_defaults(item.name, self.company) + return result[0] + def _build_item_ret(self, args, item, item_group_defaults, brand_defaults, for_update): ret = frappe._dict( { "uom": item.stock_uom, @@ -1309,13 +1331,15 @@ class StockEntry(StockController, SubcontractingInwardController): if self.purpose == "Send to Subcontractor": ret["allow_alternative_item"] = item.allow_alternative_item - # update uom if args.get("uom") and for_update: ret.update(get_uom_details(args.get("item_code"), args.get("uom"), args.get("qty"))) if self.purpose == "Material Issue": ret["expense_account"] = item.get("expense_account") or item_group_defaults.get("expense_account") + return ret + + def _apply_account_defaults(self, ret): if not ret.get("expense_account"): ret["expense_account"] = frappe.get_cached_value( "Company", self.company, "stock_adjustment_account" @@ -1328,34 +1352,21 @@ class StockEntry(StockController, SubcontractingInwardController): if not ret.get(field): ret[field] = frappe.get_cached_value("Company", self.company, company_field) - args["posting_date"] = self.posting_date - args["posting_time"] = self.posting_time + def _resolve_subcontract_item(self, args, ret): + if not (self.get(self.subcontract_data.order_field) and args.get("item_code")): + return - stock_and_rate = get_warehouse_details(args) if args.get("warehouse") else {} - ret.update(stock_and_rate) + subcontract_items = frappe.get_all( + self.subcontract_data.order_supplied_items_field, + { + "parent": self.get(self.subcontract_data.order_field), + "rm_item_code": args.get("item_code"), + }, + "main_item_code", + ) - if ( - self.purpose == "Send to Subcontractor" - and self.get(self.subcontract_data.order_field) - and args.get("item_code") - ): - subcontract_items = frappe.get_all( - self.subcontract_data.order_supplied_items_field, - { - "parent": self.get(self.subcontract_data.order_field), - "rm_item_code": args.get("item_code"), - }, - "main_item_code", - ) - - if subcontract_items and len(subcontract_items) == 1: - ret["subcontracted_item"] = subcontract_items[0].main_item_code - - barcode_data = get_barcode_data(item_code=item.name) - if barcode_data and len(barcode_data.get(item.name)) == 1: - ret["barcode"] = barcode_data.get(item.name)[0] - - return ret + if subcontract_items and len(subcontract_items) == 1: + ret["subcontracted_item"] = subcontract_items[0].main_item_code @frappe.whitelist() def set_items_for_stock_in(self): @@ -1385,8 +1396,8 @@ class StockEntry(StockController, SubcontractingInwardController): @frappe.whitelist() def get_items(self): self.set("items", []) - if self.se_handler_class and hasattr(self.se_handler_class, "add_items"): - self.se_handler_class(self).add_items() + if self.purpose_cls and hasattr(self.purpose_cls, "add_items"): + self.purpose_cls(self).add_items() self.set_serial_batch_from_reserved_entry() self.set_actual_qty() diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py index 7ea9fdc3280..a4b2671d484 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py @@ -112,50 +112,44 @@ class DisassembleStockEntry(BaseStockEntry): def _append_disassembly_row_from_source(self, disassemble_qty, scale_factor): for source_row in self.get_items_from_manufacture_stock_entry(): - if source_row.is_finished_item: - qty = disassemble_qty - s_warehouse = self.doc.from_warehouse or source_row.t_warehouse - t_warehouse = "" - elif source_row.s_warehouse: - # RM: was consumed FROM s_warehouse -> return TO s_warehouse - qty = flt(source_row.qty * scale_factor) - s_warehouse = "" - t_warehouse = self.doc.to_warehouse or source_row.s_warehouse - else: - # Scrap/secondary: was produced TO t_warehouse -> take FROM t_warehouse - qty = flt(source_row.qty * scale_factor) - s_warehouse = source_row.t_warehouse - t_warehouse = "" + self._append_disassembly_item(source_row, disassemble_qty, scale_factor) - item = { - "item_code": source_row.item_code, - "item_name": source_row.item_name, - "description": source_row.description, - "stock_uom": source_row.stock_uom, - "uom": source_row.uom, - "conversion_factor": source_row.conversion_factor, - "basic_rate": source_row.basic_rate, - "qty": qty, - "s_warehouse": s_warehouse, - "t_warehouse": t_warehouse, - "is_finished_item": source_row.is_finished_item, - "type": source_row.type, - "is_legacy_scrap_item": source_row.is_legacy_scrap_item, - "bom_secondary_item": source_row.bom_secondary_item, - "bom_no": source_row.bom_no, - # batch and serial bundles built on submit - "use_serial_batch_fields": 1 if (source_row.batch_no or source_row.serial_no) else 0, - } + def _get_disassembly_warehouses(self, source_row, disassemble_qty, scale_factor): + if source_row.is_finished_item: + return disassemble_qty, self.doc.from_warehouse or source_row.t_warehouse, "" + elif source_row.s_warehouse: + return flt(source_row.qty * scale_factor), "", self.doc.to_warehouse or source_row.s_warehouse + else: + return flt(source_row.qty * scale_factor), source_row.t_warehouse, "" - if self.doc.source_stock_entry: - item.update( - { - "against_stock_entry": self.doc.source_stock_entry, - "ste_detail": source_row.name, - } - ) + def _build_disassembly_item_dict(self, source_row, qty, s_warehouse, t_warehouse): + return { + "item_code": source_row.item_code, + "item_name": source_row.item_name, + "description": source_row.description, + "stock_uom": source_row.stock_uom, + "uom": source_row.uom, + "conversion_factor": source_row.conversion_factor, + "basic_rate": source_row.basic_rate, + "qty": qty, + "s_warehouse": s_warehouse, + "t_warehouse": t_warehouse, + "is_finished_item": source_row.is_finished_item, + "type": source_row.type, + "is_legacy_scrap_item": source_row.is_legacy_scrap_item, + "bom_secondary_item": source_row.bom_secondary_item, + "bom_no": source_row.bom_no, + "use_serial_batch_fields": 1 if (source_row.batch_no or source_row.serial_no) else 0, + } - self.doc.append("items", item) + def _append_disassembly_item(self, source_row, disassemble_qty, scale_factor): + qty, s_warehouse, t_warehouse = self._get_disassembly_warehouses( + source_row, disassemble_qty, scale_factor + ) + item = self._build_disassembly_item_dict(source_row, qty, s_warehouse, t_warehouse) + if self.doc.source_stock_entry: + item.update({"against_stock_entry": self.doc.source_stock_entry, "ste_detail": source_row.name}) + self.doc.append("items", item) def _add_items_for_disassembly_from_bom(self): if not self.doc.bom_no or not self.doc.fg_completed_qty: @@ -291,70 +285,71 @@ class DisassembleStockEntry(BaseStockEntry): frappe.db.get_value("Stock Entry", self.doc.source_stock_entry, "fg_completed_qty") ) scale_factor = flt(self.doc.fg_completed_qty) / source_fg_qty if source_fg_qty else 0 - bundle_data = get_voucher_wise_serial_batch_from_bundle(voucher_no=[self.doc.source_stock_entry]) source_rows_by_name = {r.name: r for r in self.get_items_from_manufacture_stock_entry()} - for row in self.doc.items: if not row.ste_detail: continue - source_row = source_rows_by_name.get(row.ste_detail) - if not source_row: - continue + if source_row: + self._apply_bundle_to_disassembly_row(row, source_row, bundle_data, scale_factor) - source_warehouse = source_row.s_warehouse or source_row.t_warehouse - key = (source_row.item_code, source_warehouse, self.doc.source_stock_entry) - source_bundle = bundle_data.get(key, {}) + def _apply_bundle_to_disassembly_row(self, row, source_row, bundle_data, scale_factor): + source_warehouse = source_row.s_warehouse or source_row.t_warehouse + key = (source_row.item_code, source_warehouse, self.doc.source_stock_entry) + source_bundle = bundle_data.get(key, {}) + batches = self._extract_batches(source_row, source_bundle, row, scale_factor) + serial_nos = self._extract_serial_nos(source_row, source_bundle, row) + self._set_serial_batch_bundle_for_disassembly_row(row, serial_nos, batches) - batches = defaultdict(float) - serial_nos = [] + def _extract_batches(self, source_row, source_bundle, row, scale_factor): + batches = defaultdict(float) + if source_bundle.get("batch_nos"): + self._allocate_batches(batches, source_bundle["batch_nos"], row.transfer_qty, scale_factor) + elif source_row.batch_no: + batches[source_row.batch_no] = row.transfer_qty + return batches - if source_bundle.get("batch_nos"): - qty_remaining = row.transfer_qty - for batch_no, batch_qty in source_bundle["batch_nos"].items(): - if qty_remaining <= 0: - break - alloc = min(abs(flt(batch_qty)) * scale_factor, qty_remaining) - batches[batch_no] = alloc - qty_remaining -= alloc - elif source_row.batch_no: - batches[source_row.batch_no] = row.transfer_qty + def _allocate_batches(self, batches, batch_nos, transfer_qty, scale_factor): + qty_remaining = transfer_qty + for batch_no, batch_qty in batch_nos.items(): + if qty_remaining <= 0: + break + alloc = min(abs(flt(batch_qty)) * scale_factor, qty_remaining) + batches[batch_no] = alloc + qty_remaining -= alloc - if source_bundle.get("serial_nos"): - serial_nos = get_serial_nos(source_bundle["serial_nos"])[: int(row.transfer_qty)] - elif source_row.serial_no: - serial_nos = get_serial_nos(source_row.serial_no)[: int(row.transfer_qty)] - - self._set_serial_batch_bundle_for_disassembly_row(row, serial_nos, batches) + def _extract_serial_nos(self, source_row, source_bundle, row): + if source_bundle.get("serial_nos"): + return get_serial_nos(source_bundle["serial_nos"])[: int(row.transfer_qty)] + elif source_row.serial_no: + return get_serial_nos(source_row.serial_no)[: int(row.transfer_qty)] + return [] def _set_serial_batch_for_disassembly_from_available_materials(self): available_materials = get_available_materials(self.doc.work_order, self.doc) for row in self.doc.items: warehouse = row.s_warehouse or row.t_warehouse materials = available_materials.get((row.item_code, warehouse)) - if not materials: - continue + if materials: + self._apply_available_material_bundle(row, materials) - batches = defaultdict(float) - serial_nos = [] - qty = row.transfer_qty - for batch_no, batch_qty in materials.batch_details.items(): - if qty <= 0: - break + def _apply_available_material_bundle(self, row, materials): + batches = self._collect_available_batches(materials.batch_details, row.transfer_qty) + serial_nos = materials.serial_nos[: int(row.transfer_qty)] if materials.serial_nos else [] + self._set_serial_batch_bundle_for_disassembly_row(row, serial_nos, batches) - batch_qty = abs(batch_qty) - if batch_qty <= qty: - batches[batch_no] = batch_qty - qty -= batch_qty - else: - batches[batch_no] = qty - qty = 0 - - if materials.serial_nos: - serial_nos = materials.serial_nos[: int(row.transfer_qty)] - - self._set_serial_batch_bundle_for_disassembly_row(row, serial_nos, batches) + def _collect_available_batches(self, batch_details, transfer_qty): + batches, qty = defaultdict(float), transfer_qty + for batch_no, batch_qty in batch_details.items(): + if qty <= 0: + break + batch_qty = abs(batch_qty) + if batch_qty <= qty: + batches[batch_no], qty = batch_qty, qty - batch_qty + else: + batches[batch_no], qty = qty, 0 + return batches def _set_serial_batch_bundle_for_disassembly_row(self, row, serial_nos, batches): if not serial_nos and not batches: @@ -392,145 +387,143 @@ class DisassembleStockEntry(BaseStockEntry): def get_available_materials(work_order, stock_entry_doc=None) -> dict: data = get_stock_entry_data(work_order, stock_entry_doc=stock_entry_doc) - available_materials = {} for row in data: - key = (row.item_code, row.warehouse) - if row.purpose != "Material Transfer for Manufacture": - key = (row.item_code, row.s_warehouse) - - if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": - key = (row.item_code, row.s_warehouse or row.warehouse) - + key = _get_material_key(row, stock_entry_doc) if key not in available_materials: - available_materials.setdefault( - key, - frappe._dict( - {"item_details": row, "batch_details": defaultdict(float), "qty": 0, "serial_nos": []} - ), + available_materials[key] = frappe._dict( + {"item_details": row, "batch_details": defaultdict(float), "qty": 0, "serial_nos": []} ) - - item_data = available_materials[key] - - if row.purpose == "Material Transfer for Manufacture" or ( - stock_entry_doc and stock_entry_doc.purpose == "Disassemble" and row.purpose == "Manufacture" - ): - item_data.qty += row.qty - if row.batch_no: - item_data.batch_details[row.batch_no] += row.qty - - elif row.batch_nos: - for batch_no, qty in row.batch_nos.items(): - item_data.batch_details[batch_no] += qty - - if row.serial_no: - item_data.serial_nos.extend(get_serial_nos(row.serial_no)) - item_data.serial_nos.sort() - - elif row.serial_nos: - item_data.serial_nos.extend(get_serial_nos(row.serial_nos)) - item_data.serial_nos.sort() - else: - # Consume raw material qty in case of 'Manufacture' or 'Material Consumption for Manufacture' - - item_data.qty -= row.qty - if row.batch_no: - item_data.batch_details[row.batch_no] -= row.qty - - elif row.batch_nos: - for batch_no, qty in row.batch_nos.items(): - item_data.batch_details[batch_no] += qty - - if row.serial_no: - for serial_no in get_serial_nos(row.serial_no): - if serial_no in item_data.serial_nos: - item_data.serial_nos.remove(serial_no) - - elif row.serial_nos: - for serial_no in get_serial_nos(row.serial_nos): - if serial_no in item_data.serial_nos: - item_data.serial_nos.remove(serial_no) - + _update_material_qty(available_materials[key], row, stock_entry_doc) return available_materials +def _get_material_key(row, stock_entry_doc): + if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": + return (row.item_code, row.s_warehouse or row.warehouse) + if row.purpose != "Material Transfer for Manufacture": + return (row.item_code, row.s_warehouse) + return (row.item_code, row.warehouse) + + +def _update_material_qty(item_data, row, stock_entry_doc): + is_inward = row.purpose == "Material Transfer for Manufacture" or ( + stock_entry_doc and stock_entry_doc.purpose == "Disassemble" and row.purpose == "Manufacture" + ) + if is_inward: + _add_inward_material_qty(item_data, row) + else: + _deduct_consumed_material_qty(item_data, row) + + +def _add_inward_material_qty(item_data, row): + item_data.qty += row.qty + if row.batch_no: + item_data.batch_details[row.batch_no] += row.qty + elif row.batch_nos: + for batch_no, qty in row.batch_nos.items(): + item_data.batch_details[batch_no] += qty + _extend_serial_nos_from_row(item_data, row) + + +def _extend_serial_nos_from_row(item_data, row): + sn = row.serial_no or row.serial_nos + if sn: + item_data.serial_nos.extend(get_serial_nos(sn)) + item_data.serial_nos.sort() + + +def _deduct_consumed_material_qty(item_data, row): + item_data.qty -= row.qty + if row.batch_no: + item_data.batch_details[row.batch_no] -= row.qty + elif row.batch_nos: + for batch_no, qty in row.batch_nos.items(): + item_data.batch_details[batch_no] += qty + _remove_serial_nos_from_available(item_data, row) + + +def _remove_serial_nos_from_available(item_data, row): + sn = row.serial_no or row.serial_nos + if not sn: + return + for serial_no in get_serial_nos(sn): + if serial_no in item_data.serial_nos: + item_data.serial_nos.remove(serial_no) + + def get_stock_entry_data(work_order, stock_entry_doc=None): + data = _run_stock_entry_query(work_order, stock_entry_doc) + if not data: + return [] + _enrich_with_bundle_data(data, stock_entry_doc) + return data + + +def _run_stock_entry_query(work_order, stock_entry_doc): + se = frappe.qb.DocType("Stock Entry") + sed = frappe.qb.DocType("Stock Entry Detail") + query = _build_stock_entry_base_query(se, sed, work_order) + query = _apply_stock_entry_purpose_filter(query, se, sed, stock_entry_doc) + return query.run(as_dict=1) + + +def _build_stock_entry_base_query(se, sed, work_order): + return ( + frappe.qb.from_(se) + .from_(sed) + .select( + sed.item_name, + sed.original_item, + sed.item_code, + sed.qty, + sed.t_warehouse.as_("warehouse"), + sed.s_warehouse.as_("s_warehouse"), + sed.description, + sed.stock_uom, + sed.expense_account, + sed.cost_center, + sed.serial_and_batch_bundle, + sed.batch_no, + sed.serial_no, + se.purpose, + se.name, + ) + .where((se.name == sed.parent) & (se.work_order == work_order) & (se.docstatus == 1)) + .orderby(se.creation, sed.item_code, sed.idx) + ) + + +def _apply_stock_entry_purpose_filter(query, se, sed, stock_entry_doc): + if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": + query = query.where(se.purpose.isin(["Disassemble", "Manufacture"])) + return query.where(se.name != stock_entry_doc.name) + query = query.where( + se.purpose.isin( + ["Manufacture", "Material Consumption for Manufacture", "Material Transfer for Manufacture"] + ) + ) + return query.where(sed.s_warehouse.isnotnull()) + + +def _enrich_with_bundle_data(data, stock_entry_doc): from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import ( get_voucher_wise_serial_batch_from_bundle, ) - stock_entry = frappe.qb.DocType("Stock Entry") - stock_entry_detail = frappe.qb.DocType("Stock Entry Detail") - - data = ( - frappe.qb.from_(stock_entry) - .from_(stock_entry_detail) - .select( - stock_entry_detail.item_name, - stock_entry_detail.original_item, - stock_entry_detail.item_code, - stock_entry_detail.qty, - (stock_entry_detail.t_warehouse).as_("warehouse"), - (stock_entry_detail.s_warehouse).as_("s_warehouse"), - stock_entry_detail.description, - stock_entry_detail.stock_uom, - stock_entry_detail.expense_account, - stock_entry_detail.cost_center, - stock_entry_detail.serial_and_batch_bundle, - stock_entry_detail.batch_no, - stock_entry_detail.serial_no, - stock_entry.purpose, - stock_entry.name, - ) - .where( - (stock_entry.name == stock_entry_detail.parent) - & (stock_entry.work_order == work_order) - & (stock_entry.docstatus == 1) - ) - .orderby(stock_entry.creation, stock_entry_detail.item_code, stock_entry_detail.idx) - ) - - if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": - data = data.where( - stock_entry.purpose.isin( - [ - "Disassemble", - "Manufacture", - ] - ) - ) - - data = data.where(stock_entry.name != stock_entry_doc.name) - else: - data = data.where( - stock_entry.purpose.isin( - [ - "Manufacture", - "Material Consumption for Manufacture", - "Material Transfer for Manufacture", - ] - ) - ) - - data = data.where(stock_entry_detail.s_warehouse.isnotnull()) - - data = data.run(as_dict=1) - - if not data: - return [] - voucher_nos = [row.get("name") for row in data if row.get("name")] - if voucher_nos: - bundle_data = get_voucher_wise_serial_batch_from_bundle(voucher_no=voucher_nos) - for row in data: - key = (row.item_code, row.warehouse, row.name) - if row.purpose != "Material Transfer for Manufacture": - key = (row.item_code, row.s_warehouse, row.name) + if not voucher_nos: + return + bundle_data = get_voucher_wise_serial_batch_from_bundle(voucher_no=voucher_nos) + for row in data: + key = _get_bundle_key(row, stock_entry_doc) + if bundle_data.get(key): + row.update(bundle_data.get(key)) - if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": - key = (row.item_code, row.s_warehouse or row.warehouse, row.name) - if bundle_data.get(key): - row.update(bundle_data.get(key)) - - return data +def _get_bundle_key(row, stock_entry_doc): + if stock_entry_doc and stock_entry_doc.purpose == "Disassemble": + return (row.item_code, row.s_warehouse or row.warehouse, row.name) + if row.purpose != "Material Transfer for Manufacture": + return (row.item_code, row.s_warehouse, row.name) + return (row.item_code, row.warehouse, row.name) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py index f3dcc3b67ca..231664f954d 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py @@ -7,12 +7,10 @@ from frappe.query_builder.functions import Sum from frappe.utils import ceil, cint, flt, get_link_to_form from erpnext.manufacturing.doctype.bom.bom import add_additional_cost -from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos from erpnext.stock.serial_batch_bundle import ( SerialBatchCreation, get_batch_nos, get_empty_batches_based_work_order, - get_serial_or_batch_items, ) from .base import BaseStockEntry @@ -212,52 +210,39 @@ class BaseManufactureStockEntry(BaseStockEntry): def add_batchwise_finished_good(self, batches, item_details): qty = flt(self.doc.fg_completed_qty) row = frappe._dict({"batches_to_be_consume": defaultdict(float)}) - self.update_batches_to_be_consume(batches, row, qty) + if row.batches_to_be_consume: + self._link_fg_bundle_and_append(item_details, row) - if not row.batches_to_be_consume: - return - + def _link_fg_bundle_and_append(self, item_details, row): _id = create_serial_and_batch_bundle( self.doc, row, frappe._dict( - { - "item_code": self.wo_doc.production_item, - "warehouse": item_details.get("t_warehouse"), - } + {"item_code": self.wo_doc.production_item, "warehouse": item_details.get("t_warehouse")} ), ) - item_details["serial_and_batch_bundle"] = _id self.doc.append("items", item_details) def update_batches_to_be_consume(self, batches, row, qty): qty_to_be_consumed = qty - batches = sorted(batches.items(), key=lambda x: x[0]) - - for batch_no, batch_qty in batches: + for batch_no, batch_qty in sorted(batches.items(), key=lambda x: x[0]): if qty_to_be_consumed <= 0 or batch_qty <= 0: continue - - if batch_qty > qty_to_be_consumed: - batch_qty = qty_to_be_consumed - - row.batches_to_be_consume[batch_no] += batch_qty - - if batch_no and row.serial_nos: - serial_nos = self.get_serial_nos_based_on_transferred_batch(batch_no, row.serial_nos) - serial_nos = serial_nos[0 : cint(batch_qty)] - - # remove consumed serial nos from list - for sn in serial_nos: - row.serial_nos.remove(sn) - - if "batch_details" in row: - row.batch_details[batch_no] -= batch_qty - + batch_qty = min(batch_qty, qty_to_be_consumed) + self._consume_batch(row, batch_no, batch_qty) qty_to_be_consumed -= batch_qty + def _consume_batch(self, row, batch_no, batch_qty): + row.batches_to_be_consume[batch_no] += batch_qty + if batch_no and row.serial_nos: + serial_nos = self.get_serial_nos_based_on_transferred_batch(batch_no, row.serial_nos) + for sn in serial_nos[: cint(batch_qty)]: + row.serial_nos.remove(sn) + if "batch_details" in row: + row.batch_details[batch_no] -= batch_qty + class ManufactureStockEntry(BaseManufactureStockEntry): def before_validate(self): @@ -322,33 +307,30 @@ class ManufactureStockEntry(BaseManufactureStockEntry): wo = self.wo_doc if not wo: return - work_order_qty = flt(wo.material_transferred_for_manufacturing) or flt(wo.qty) wo_qty_to_produce = work_order_qty - flt(wo.produced_qty) - for item in wo.get("required_items"): - wo_item_qty = flt(item.transferred_qty) or flt(item.required_qty) - wo_qty_unconsumed = wo_item_qty - flt(item.consumed_qty) - bom_qty_per_unit = flt(item.required_qty) / flt(wo.qty) + self._append_unconsumed_item(item, wo, wo_qty_to_produce) - req_qty_each = wo_qty_unconsumed / (wo_qty_to_produce or 1) - req_qty_each = min(req_qty_each, bom_qty_per_unit) - - qty = req_qty_each * flt(self.doc.fg_completed_qty) - if qty <= 0: - continue - - item_args = self.get_item_dict(item) - item_args.update( - { - "conversion_factor": 1, - "s_warehouse": wo.wip_warehouse or item.source_warehouse, - "uom": item.stock_uom, - "qty": ceil_qty_if_uom_has_whole_number(qty, item.stock_uom), - } - ) - item_args["transfer_qty"] = item_args["qty"] - self.doc.append("items", item_args) + def _append_unconsumed_item(self, item, wo, wo_qty_to_produce): + wo_item_qty = flt(item.transferred_qty) or flt(item.required_qty) + wo_qty_unconsumed = wo_item_qty - flt(item.consumed_qty) + bom_qty_per_unit = flt(item.required_qty) / flt(wo.qty) + req_qty_each = min(wo_qty_unconsumed / (wo_qty_to_produce or 1), bom_qty_per_unit) + qty = req_qty_each * flt(self.doc.fg_completed_qty) + if qty <= 0: + return + item_args = self.get_item_dict(item) + item_args.update( + { + "conversion_factor": 1, + "s_warehouse": wo.wip_warehouse or item.source_warehouse, + "uom": item.stock_uom, + "qty": ceil_qty_if_uom_has_whole_number(qty, item.stock_uom), + } + ) + item_args["transfer_qty"] = item_args["qty"] + self.doc.append("items", item_args) def add_raw_materials_based_on_work_order(self): bom_items = ( @@ -357,42 +339,47 @@ class ManufactureStockEntry(BaseManufactureStockEntry): else get_bom_items(self.doc.bom_no, self.doc.use_multi_level_bom) ) alternative_items = self.get_alternative_items(bom_items) - for row in bom_items: - item_args = self.get_item_dict(row) - warehouse = self.doc.from_warehouse - if not warehouse: - if self.wo_doc.from_wip_warehouse: - warehouse = self.wo_doc.wip_warehouse - else: - warehouse = row.get("source_warehouse") + self._append_wo_raw_material(row, alternative_items) - item_args.update( - { - "conversion_factor": 1, - "item_group": row.get("item_group"), - "s_warehouse": warehouse, - "uom": row.stock_uom, - } - ) + def _append_wo_raw_material(self, row, alternative_items): + item_args = self.get_item_dict(row) + item_args.update( + { + "conversion_factor": 1, + "item_group": row.get("item_group"), + "s_warehouse": self._resolve_rm_warehouse(row), + "uom": row.stock_uom, + } + ) + qty = ( + (row.required_qty / self.wo_doc.qty) * self.doc.fg_completed_qty + if self.wo_doc + else flt(row.qty) * self.doc.fg_completed_qty + ) + item_args["qty"] = ceil_qty_if_uom_has_whole_number(qty, row.stock_uom) + item_args["transfer_qty"] = item_args["qty"] + if alt := alternative_items.get(row.item_code): + self.set_alternative_item_details(item_args, alt) + self.doc.append("items", item_args) - if self.wo_doc: - qty = (row.required_qty / self.wo_doc.qty) * self.doc.fg_completed_qty - else: - qty = flt(row.qty) * self.doc.fg_completed_qty - - item_args["qty"] = ceil_qty_if_uom_has_whole_number(qty, row.stock_uom) - item_args["transfer_qty"] = item_args["qty"] - - if alternative_item_details := alternative_items.get(row.item_code): - self.set_alternative_item_details(item_args, alternative_item_details) - - self.doc.append("items", item_args) + def _resolve_rm_warehouse(self, row): + if self.doc.from_warehouse: + return self.doc.from_warehouse + if self.wo_doc.from_wip_warehouse: + return self.wo_doc.wip_warehouse + return row.get("source_warehouse") def get_alternative_items(self, bom_items): + item_codes_in_bom = [row.item_code for row in bom_items] + data = self._query_alternative_items(item_codes_in_bom) + if not data: + return frappe._dict() + return self._index_alternative_items(data) + + def _query_alternative_items(self, item_codes_in_bom): doctype = frappe.qb.DocType("Stock Entry") child_doc = frappe.qb.DocType("Stock Entry Detail") - query = ( frappe.qb.from_(child_doc) .inner_join(doctype) @@ -413,20 +400,15 @@ class ManufactureStockEntry(BaseManufactureStockEntry): & (doctype.docstatus == 1) ) ) - - item_codes_in_bom = [row.item_code for row in bom_items] if item_codes_in_bom: query = query.where(child_doc.original_item.isin(item_codes_in_bom)) + return query.run(as_dict=1) - data = query.run(as_dict=1) - if not data: - return frappe._dict() - + def _index_alternative_items(self, data): alternative_items = frappe._dict() for row in data: alternative_items[row.original_item] = row alternative_items[row.original_item].original_item = None - return alternative_items def set_alternative_item_details(self, row, alternative_item_details): @@ -440,79 +422,72 @@ class ManufactureStockEntry(BaseManufactureStockEntry): def add_raw_materials_based_on_transfer(self): self.prepare_available_materials_based_on_transfer() - pending_qty_to_mfg = flt(self.wo_doc.material_transferred_for_manufacturing) - flt( self.wo_doc.produced_qty ) - if pending_qty_to_mfg <= 0 and not self.doc.get("is_return"): return + for key in self.available_materials: + self._append_transfer_based_rm(self.available_materials[key], pending_qty_to_mfg) - for row in self.available_materials: - row = self.available_materials[row] - item_args = self.get_item_dict(row) - if not self.doc.get("is_return"): - qty = (flt(row.qty) * flt(self.doc.fg_completed_qty)) / pending_qty_to_mfg - else: - qty = row.qty - - item_args["qty"] = ceil_qty_if_uom_has_whole_number(qty, row.uom) - item_args["transfer_qty"] = item_args["qty"] - - if not self.doc.get("is_return"): - item_args["t_warehouse"] = None - item_args["s_warehouse"] = row.warehouse - else: - # In case of return, source and target warehouse will be swapped - item_args["s_warehouse"] = row.s_warehouse - item_args["t_warehouse"] = row.t_warehouse - - if row.serial_nos or row.batches: - self.assign_serial_batches_to_materials(item_args, row, qty) - else: - self.doc.append("items", item_args) + def _append_transfer_based_rm(self, row, pending_qty_to_mfg): + item_args = self.get_item_dict(row) + is_return = self.doc.get("is_return") + qty = row.qty if is_return else (flt(row.qty) * flt(self.doc.fg_completed_qty)) / pending_qty_to_mfg + item_args["qty"] = ceil_qty_if_uom_has_whole_number(qty, row.uom) + item_args["transfer_qty"] = item_args["qty"] + if is_return: + item_args["s_warehouse"], item_args["t_warehouse"] = row.s_warehouse, row.t_warehouse + else: + item_args["t_warehouse"], item_args["s_warehouse"] = None, row.warehouse + if row.serial_nos or row.batches: + self.assign_serial_batches_to_materials(item_args, row, qty) + else: + self.doc.append("items", item_args) def assign_serial_batches_to_materials(self, item_args, row, qty): if row.serial_nos: - if serial_nos := row.serial_nos[0 : cint(qty)]: - item_args["serial_no"] = "\n".join(serial_nos) - - if not item_args["uom"]: - item_args["uom"] = row.stock_uom - - item_args["use_serial_batch_fields"] = 1 - self.doc.append("items", item_args) - elif row.batches and len(row.batches) == 1: - item_args["batch_no"] = next(iter(row.batches.keys())) - if not item_args["uom"]: - item_args["uom"] = row.stock_uom - - item_args["use_serial_batch_fields"] = 1 - self.doc.append("items", item_args) + self._append_with_serial_nos(item_args, row, qty) + elif len(row.batches) == 1: + self._append_with_single_batch(item_args, row) elif row.batches: self.split_items_based_on_batches(qty, item_args, row) + def _append_with_serial_nos(self, item_args, row, qty): + if serial_nos := row.serial_nos[: cint(qty)]: + item_args["serial_no"] = "\n".join(serial_nos) + if not item_args.get("uom"): + item_args["uom"] = row.stock_uom + item_args["use_serial_batch_fields"] = 1 + self.doc.append("items", item_args) + + def _append_with_single_batch(self, item_args, row): + item_args["batch_no"] = next(iter(row.batches.keys())) + if not item_args.get("uom"): + item_args["uom"] = row.stock_uom + item_args["use_serial_batch_fields"] = 1 + self.doc.append("items", item_args) + def split_items_based_on_batches(self, qty, item_args, row): for batch_no, batch_qty in row.batches.items(): if qty <= 0: return + qty = self._append_batch_split_item(item_args, row, batch_no, batch_qty, qty) - if batch_qty >= qty: - item_args["qty"] = qty - qty = 0 - else: - item_args["qty"] = batch_qty - qty -= batch_qty - - row.batches[batch_no] -= batch_qty - if not item_args["uom"]: - item_args["uom"] = row.stock_uom - - item_args["batch_no"] = batch_no - item_args["transfer_qty"] = item_args["qty"] - item_args["use_serial_batch_fields"] = 1 - - self.doc.append("items", item_args) + def _append_batch_split_item(self, item_args, row, batch_no, batch_qty, qty): + if batch_qty >= qty: + item_args["qty"], qty = qty, 0 + else: + item_args["qty"] = batch_qty + qty -= batch_qty + row.batches[batch_no] -= batch_qty + if not item_args.get("uom"): + item_args["uom"] = row.stock_uom + item_args["batch_no"] = batch_no + item_args["transfer_qty"] = item_args["qty"] + item_args["use_serial_batch_fields"] = 1 + self.doc.append("items", item_args) + return qty def prepare_available_materials_based_on_transfer(self): self.available_materials = frappe._dict() @@ -584,14 +559,17 @@ class ManufactureStockEntry(BaseManufactureStockEntry): key = (row.item_code, row.warehouse) self.available_materials[key].qty -= row.qty if row.serial_and_batch_bundle: - _details = self.get_sabb_details(row.serial_and_batch_bundle) - if _details.serial_nos: - for sn in _details.serial_nos: - self.available_materials[key].serial_nos.remove(sn) - elif _details.batches: - # Qty is in negative therefore added insted of subtraction - for batch_no, qty in _details.batches.items(): - self.available_materials[key].batches[batch_no] += qty + self._deduct_consumed_serial_batch(key, row.serial_and_batch_bundle) + + def _deduct_consumed_serial_batch(self, key, sabb_name): + _details = self.get_sabb_details(sabb_name) + if _details.serial_nos: + for sn in _details.serial_nos: + self.available_materials[key].serial_nos.remove(sn) + elif _details.batches: + for batch_no, qty in _details.batches.items(): + # qty is negative, so add instead of subtract + self.available_materials[key].batches[batch_no] += qty def add_additional_cost(self): if not self.wo_doc: @@ -618,46 +596,47 @@ class ManufactureStockEntry(BaseManufactureStockEntry): def get_secondary_items_from_job_card(self): if not self.wo_doc.operations: return [] - secondary_items = get_secondary_items_from_job_card(self.doc.work_order, self.doc.job_card) - if self.doc.job_card: - pending_qty = flt(self.doc.fg_completed_qty) - else: - pending_qty = flt(self.get_completed_job_card_qty()) - flt(self.wo_doc.produced_qty) - + pending_qty = self._get_pending_secondary_qty() used_secondary_items = self.get_used_secondary_items() + self._adjust_secondary_item_qtys(secondary_items, used_secondary_items, pending_qty) + return secondary_items + + def _get_pending_secondary_qty(self): + if self.doc.job_card: + return flt(self.doc.fg_completed_qty) + return flt(self.get_completed_job_card_qty()) - flt(self.wo_doc.produced_qty) + + def _adjust_secondary_item_qtys(self, secondary_items, used_secondary_items, pending_qty): for row in secondary_items: row.stock_qty -= flt(used_secondary_items.get(row.item_code)) - row.stock_qty = (row.stock_qty) * flt(self.doc.fg_completed_qty) / flt(pending_qty) - + row.stock_qty = row.stock_qty * flt(self.doc.fg_completed_qty) / flt(pending_qty) if used_secondary_items.get(row.item_code): used_secondary_items[row.item_code] -= row.stock_qty - return secondary_items - def get_used_secondary_items(self): + data = self._query_used_secondary_items() used_secondary_items = defaultdict(float) - - StockEntry = frappe.qb.DocType("Stock Entry") - StockEntryDetail = frappe.qb.DocType("Stock Entry Detail") - data = ( - frappe.qb.from_(StockEntry) - .inner_join(StockEntryDetail) - .on(StockEntryDetail.parent == StockEntry.name) - .select(StockEntryDetail.item_code, StockEntryDetail.qty) - .where( - (StockEntry.work_order == self.doc.work_order) - & ((StockEntryDetail.type.isnotnull()) | (StockEntryDetail.is_legacy_scrap_item == 1)) - & (StockEntry.docstatus == 1) - & (StockEntry.purpose.isin(["Repack", "Manufacture"])) - ) - ).run(as_dict=1) - for row in data: used_secondary_items[row.item_code] += row.qty - return used_secondary_items + def _query_used_secondary_items(self): + se = frappe.qb.DocType("Stock Entry") + sed = frappe.qb.DocType("Stock Entry Detail") + return ( + frappe.qb.from_(se) + .inner_join(sed) + .on(sed.parent == se.name) + .select(sed.item_code, sed.qty) + .where( + (se.work_order == self.doc.work_order) + & ((sed.type.isnotnull()) | (sed.is_legacy_scrap_item == 1)) + & (se.docstatus == 1) + & (se.purpose.isin(["Repack", "Manufacture"])) + ) + ).run(as_dict=1) + def get_completed_job_card_qty(self): return flt(min([d.completed_qty for d in self.wo_doc.operations])) @@ -688,21 +667,24 @@ class ManufactureStockEntry(BaseManufactureStockEntry): def update_job_card_and_work_order(self): if self.doc.job_card: - job_doc = frappe.get_doc("Job Card", self.doc.job_card) - job_doc.set_consumed_qty_in_job_card_item(self.doc) - job_doc.set_manufactured_qty() - job_doc.update_work_order() - + self._update_job_card_on_manufacture() if self.doc.work_order: - self._validate_work_order() + self._update_work_order_on_manufacture() - if self.doc.fg_completed_qty: - self.wo_doc.run_method("update_work_order_qty") - self.wo_doc.run_method("update_planned_qty") + def _update_job_card_on_manufacture(self): + job_doc = frappe.get_doc("Job Card", self.doc.job_card) + job_doc.set_consumed_qty_in_job_card_item(self.doc) + job_doc.set_manufactured_qty() + job_doc.update_work_order() - self.wo_doc.run_method("update_status") - if not self.wo_doc.operations: - self.wo_doc.set_actual_dates() + def _update_work_order_on_manufacture(self): + self._validate_work_order() + if self.doc.fg_completed_qty: + self.wo_doc.run_method("update_work_order_qty") + self.wo_doc.run_method("update_planned_qty") + self.wo_doc.run_method("update_status") + if not self.wo_doc.operations: + self.wo_doc.set_actual_dates() class RepackStockEntry(BaseManufactureStockEntry): @@ -809,20 +791,20 @@ def _check_bom_component_qty(doc, bom_items): def get_bom_items(bom_no, use_multi_level_bom=None, qty=None, fetch_secondary_items=False): if use_multi_level_bom is None: use_multi_level_bom = frappe.get_cached_value("BOM", bom_no, "use_multi_level_bom") - - if qty is None: - qty = 1 - - table_name = "BOM Item" - if use_multi_level_bom: - table_name = "BOM Explosion Item" + qty = qty or 1 if fetch_secondary_items: table_name = "BOM Secondary Item" + else: + table_name = "BOM Explosion Item" if use_multi_level_bom else "BOM Item" + items = _run_bom_items_query(bom_no, table_name, qty) + return _deduplicate_bom_items(items) + + +def _run_bom_items_query(bom_no, table_name, qty): bom_doc = frappe.qb.DocType("BOM") doctype = frappe.qb.DocType(table_name) - query = ( frappe.qb.from_(doctype) .inner_join(bom_doc) @@ -838,9 +820,12 @@ def get_bom_items(bom_no, use_multi_level_bom=None, qty=None, fetch_secondary_it .where((bom_doc.name == bom_no) & (bom_doc.docstatus == 1)) .orderby(doctype.idx) ) + return _add_bom_table_specific_fields(query, doctype, table_name).run(as_dict=1) + +def _add_bom_table_specific_fields(query, doctype, table_name): if table_name == "BOM Secondary Item": - query = query.select( + return query.select( doctype.name, doctype.cost_allocation_per, doctype.uom, @@ -849,19 +834,20 @@ def get_bom_items(bom_no, use_multi_level_bom=None, qty=None, fetch_secondary_it doctype.is_legacy, doctype.conversion_factor, ) - elif table_name == "BOM Item": - query = query.select( + if table_name == "BOM Item": + return query.select( doctype.allow_alternative_item, doctype.uom, doctype.conversion_factor, doctype.bom_no ) + return query - items = query.run(as_dict=1) + +def _deduplicate_bom_items(items): item_dict = {} for item in items: if item.item_code in item_dict: item_dict[item.item_code].qty += item.qty else: item_dict[item.item_code] = item - return list(item_dict.values()) @@ -940,72 +926,92 @@ def move_sample_to_retention_warehouse(company: str, items: str | list): stock_entry.company = company stock_entry.purpose = "Material Transfer" stock_entry.set_stock_entry_type() + for item in items: if item.get("sample_quantity") and item.get("serial_and_batch_bundle"): - warehouse = item.get("t_warehouse") or item.get("warehouse") - total_qty = 0 - cls_obj = SerialBatchCreation( - { - "type_of_transaction": "Outward", - "serial_and_batch_bundle": item.get("serial_and_batch_bundle"), - "item_code": item.get("item_code"), - "warehouse": warehouse, - "do_not_save": True, - } - ) - sabb = cls_obj.duplicate_package() - batches = get_batch_nos(item.get("serial_and_batch_bundle")) - sabe_list = [] - for batch_no in batches.keys(): - sample_quantity = validate_sample_quantity( - item.get("item_code"), - item.get("sample_quantity"), - item.get("transfer_qty") or item.get("qty"), - batch_no, - ) + _process_sample_item(stock_entry, item, retention_warehouse) - sabe = next(item for item in sabb.entries if item.batch_no == batch_no) - if sample_quantity: - if sabb.has_serial_no: - new_sabe = [ - entry - for entry in sabb.entries - if entry.batch_no == batch_no - and frappe.db.exists( - "Serial No", {"name": entry.serial_no, "warehouse": warehouse} - ) - ][: int(sample_quantity)] - sabe_list.extend(new_sabe) - total_qty += len(new_sabe) - else: - total_qty += sample_quantity - sabe.qty = sample_quantity - else: - sabb.entries.remove(sabe) - - if total_qty: - if sabe_list: - sabb.entries = sabe_list - sabb.save() - - stock_entry.append( - "items", - { - "item_code": item.get("item_code"), - "s_warehouse": warehouse, - "t_warehouse": retention_warehouse, - "qty": total_qty, - "basic_rate": item.get("valuation_rate"), - "uom": item.get("uom"), - "stock_uom": item.get("stock_uom"), - "conversion_factor": item.get("conversion_factor") or 1.0, - "serial_and_batch_bundle": sabb.name, - }, - ) if stock_entry.get("items"): return stock_entry.as_dict() +def _process_sample_item(stock_entry, item, retention_warehouse): + warehouse = item.get("t_warehouse") or item.get("warehouse") + sabb = _duplicate_sample_bundle(item, warehouse) + total_qty, sabe_list = _collect_sample_batches(sabb, item, warehouse) + if total_qty: + _append_sample_entry(stock_entry, sabb, item, warehouse, retention_warehouse, total_qty, sabe_list) + + +def _duplicate_sample_bundle(item, warehouse): + return SerialBatchCreation( + { + "type_of_transaction": "Outward", + "serial_and_batch_bundle": item.get("serial_and_batch_bundle"), + "item_code": item.get("item_code"), + "warehouse": warehouse, + "do_not_save": True, + } + ).duplicate_package() + + +def _collect_sample_batches(sabb, item, warehouse): + batches = get_batch_nos(item.get("serial_and_batch_bundle")) + sabe_list, total_qty = [], 0 + for batch_no in batches.keys(): + qty, entries = _process_sample_batch(sabb, item, warehouse, batch_no) + total_qty += qty + sabe_list.extend(entries) + return total_qty, sabe_list + + +def _process_sample_batch(sabb, item, warehouse, batch_no): + sample_quantity = validate_sample_quantity( + item.get("item_code"), + item.get("sample_quantity"), + item.get("transfer_qty") or item.get("qty"), + batch_no, + ) + sabe = next(entry for entry in sabb.entries if entry.batch_no == batch_no) + if not sample_quantity: + sabb.entries.remove(sabe) + return 0, [] + return _apply_sample_quantity(sabb, sabe, warehouse, batch_no, sample_quantity) + + +def _apply_sample_quantity(sabb, sabe, warehouse, batch_no, sample_quantity): + if sabb.has_serial_no: + entries = [ + e + for e in sabb.entries + if e.batch_no == batch_no + and frappe.db.exists("Serial No", {"name": e.serial_no, "warehouse": warehouse}) + ][: int(sample_quantity)] + return len(entries), entries + sabe.qty = sample_quantity + return sample_quantity, [] + + +def _append_sample_entry(stock_entry, sabb, item, warehouse, retention_warehouse, total_qty, sabe_list): + if sabe_list: + sabb.entries = sabe_list + sabb.save() + stock_entry.append( + "items", + { + "item_code": item.get("item_code"), + "s_warehouse": warehouse, + "t_warehouse": retention_warehouse, + "qty": total_qty, + "basic_rate": item.get("valuation_rate"), + "uom": item.get("uom"), + "stock_uom": item.get("stock_uom"), + "conversion_factor": item.get("conversion_factor") or 1.0, + "serial_and_batch_bundle": sabb.name, + }, + ) + + @frappe.whitelist() def validate_sample_quantity(item_code: str, sample_quantity: int, qty: float, batch_no: str | None = None): from erpnext.stock.doctype.batch.batch import get_batch_qty @@ -1014,19 +1020,29 @@ def validate_sample_quantity(item_code: str, sample_quantity: int, qty: float, b frappe.throw( _("Sample quantity {0} cannot be more than received quantity {1}").format(sample_quantity, qty) ) + return _adjust_sample_quantity(item_code, sample_quantity, batch_no, get_batch_qty) + + +def _adjust_sample_quantity(item_code, sample_quantity, batch_no, get_batch_qty): retention_warehouse = frappe.get_single_value("Stock Settings", "sample_retention_warehouse") - retainted_qty = 0 - if batch_no: - retainted_qty = get_batch_qty(batch_no, retention_warehouse, item_code) + retainted_qty = get_batch_qty(batch_no, retention_warehouse, item_code) if batch_no else 0 max_retain_qty = frappe.get_value("Item", item_code, "sample_quantity") if retainted_qty >= max_retain_qty: - frappe.msgprint( - _( - "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." - ).format(retainted_qty, batch_no, item_code, batch_no), - alert=True, - ) - sample_quantity = 0 + _warn_max_retained(retainted_qty, batch_no, item_code) + return 0 + return _cap_sample_quantity(sample_quantity, max_retain_qty, retainted_qty, batch_no, item_code) + + +def _warn_max_retained(retainted_qty, batch_no, item_code): + frappe.msgprint( + _("Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.").format( + retainted_qty, batch_no, item_code, batch_no + ), + alert=True, + ) + + +def _cap_sample_quantity(sample_quantity, max_retain_qty, retainted_qty, batch_no, item_code): qty_diff = max_retain_qty - retainted_qty if cint(sample_quantity) > cint(qty_diff): frappe.msgprint( @@ -1035,6 +1051,5 @@ def validate_sample_quantity(item_code: str, sample_quantity: int, qty: float, b ), alert=True, ) - sample_quantity = qty_diff - + return qty_diff return sample_quantity diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py index c1255ba4d5b..880226e51cc 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py @@ -119,131 +119,105 @@ class MaterialTransferForManufactureStockEntry(BaseMaterialTransferStockEntry): self.doc.append("items", item_dict[item_code]) def get_pending_raw_materials(self): - """ - issue (item quantity) that is pending to issue or desire to transfer, - whichever is less - """ + """Return pending raw material qty to transfer, capped at what's still needed.""" item_dict = self.get_work_order_required_items() - max_qty = flt(self.wo_doc.qty) - - allow_overproduction = False - overproduction_percentage = flt( - frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order") - ) - - transfer_extra_materials_percentage = flt( - frappe.db.get_single_value("Manufacturing Settings", "transfer_extra_materials_percentage") - ) - - to_transfer_qty = flt(self.wo_doc.material_transferred_for_manufacturing) + flt( - self.doc.fg_completed_qty - ) - transfer_limit_qty = max_qty + ((max_qty * overproduction_percentage) / 100) - if transfer_extra_materials_percentage: - transfer_limit_qty = max_qty + ((max_qty * transfer_extra_materials_percentage) / 100) - - if transfer_limit_qty >= to_transfer_qty: - allow_overproduction = True + allow_overproduction = self._is_overproduction_allowed(max_qty) for item, item_details in item_dict.items(): - pending_to_issue = flt(item_details.required_qty) - flt(item_details.transferred_qty) - desire_to_transfer = flt(self.doc.fg_completed_qty) * flt(item_details.required_qty) / max_qty - - if ( - desire_to_transfer <= pending_to_issue - or ( - desire_to_transfer > 0 - and self.backflush_based_on == "Material Transferred for Manufacture" - ) - or allow_overproduction - ): - # "No need for transfer but qty still pending to transfer" case can occur - # when transferring multiple RM in different Stock Entries - item_dict[item]["qty"] = desire_to_transfer if (desire_to_transfer > 0) else pending_to_issue - elif pending_to_issue > 0: - item_dict[item]["qty"] = pending_to_issue - else: - item_dict[item]["qty"] = 0 - + item_dict[item]["qty"] = self._calculate_item_transfer_qty( + item_details, allow_overproduction, max_qty + ) item_dict[item]["transfer_qty"] = flt(item_dict[item]["qty"]) * flt( item_dict[item].get("conversion_factor") or 1 ) - # delete items with 0 qty - list_of_items = list(item_dict.keys()) - for item in list_of_items: - if not item_dict[item]["qty"]: - del item_dict[item] + item_dict = {k: v for k, v in item_dict.items() if v["qty"]} - # show some message - if not len(item_dict): - frappe.msgprint(_("""All items have already been transferred for this Work Order.""")) + if not item_dict: + frappe.msgprint(_("All items have already been transferred for this Work Order.")) return item_dict - def get_work_order_required_items(self): - """ - Gets Work Order Required Items only if Stock Entry purpose is **Material Transferred for Manufacture**. - """ - item_dict, job_card_items = frappe._dict(), [] - work_order = self.wo_doc - - consider_job_card = work_order.transfer_material_against == "Job Card" and self.doc.get("job_card") - if consider_job_card: - job_card_items = self.get_job_card_item_codes() - - if not frappe.db.get_value("Warehouse", work_order.wip_warehouse, "is_group"): - wip_warehouse = work_order.wip_warehouse - else: - wip_warehouse = None - - transfer_extra_materials_percentage = flt( + def _is_overproduction_allowed(self, max_qty): + overproduction_pct = flt( + frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order") + ) + extra_materials_pct = flt( frappe.db.get_single_value("Manufacturing Settings", "transfer_extra_materials_percentage") ) + to_transfer_qty = flt(self.wo_doc.material_transferred_for_manufacturing) + flt( + self.doc.fg_completed_qty + ) + limit_pct = extra_materials_pct or overproduction_pct + transfer_limit_qty = max_qty + (max_qty * limit_pct / 100) + return transfer_limit_qty >= to_transfer_qty + def _calculate_item_transfer_qty(self, item_details, allow_overproduction, max_qty): + pending_to_issue = flt(item_details.required_qty) - flt(item_details.transferred_qty) + desire_to_transfer = flt(self.doc.fg_completed_qty) * flt(item_details.required_qty) / max_qty + can_transfer = ( + desire_to_transfer <= pending_to_issue + or (desire_to_transfer > 0 and self.backflush_based_on == "Material Transferred for Manufacture") + or allow_overproduction + ) + return _resolve_transfer_qty(desire_to_transfer, pending_to_issue, can_transfer) + + def get_work_order_required_items(self): + """Gets Work Order Required Items for Material Transfer for Manufacture.""" + work_order = self.wo_doc + consider_job_card = work_order.transfer_material_against == "Job Card" and self.doc.get("job_card") + job_card_items = self.get_job_card_item_codes() if consider_job_card else [] + wip_warehouse = self._resolve_wip_warehouse(work_order) + extra_pct = flt( + frappe.db.get_single_value("Manufacturing Settings", "transfer_extra_materials_percentage") + ) + item_dict = frappe._dict() for d in work_order.get("required_items"): - if consider_job_card and (d.item_code not in job_card_items): - continue - - additional_qty = 0.0 - if transfer_extra_materials_percentage: - additional_qty = transfer_extra_materials_percentage * flt(d.required_qty) / 100 - - transfer_pending = flt(d.required_qty) > flt(d.transferred_qty) - if additional_qty: - transfer_pending = (flt(d.required_qty) + additional_qty) > flt(d.transferred_qty) - - can_transfer = transfer_pending or ( - self.backflush_based_on == "Material Transferred for Manufacture" + self._add_required_item( + item_dict, d, consider_job_card, job_card_items, wip_warehouse, extra_pct, work_order ) - - if not can_transfer: - continue - - if d.include_item_in_manufacturing: - item_row = d.as_dict() - item_row["idx"] = len(item_dict) + 1 - - if consider_job_card: - job_card_item = frappe.db.get_value( - "Job Card Item", {"item_code": d.item_code, "parent": self.doc.get("job_card")} - ) - item_row["job_card_item"] = job_card_item or None - - if d.source_warehouse and not frappe.db.get_value( - "Warehouse", d.source_warehouse, "is_group" - ): - item_row["from_warehouse"] = d.source_warehouse - - item_row["to_warehouse"] = wip_warehouse - if item_row["allow_alternative_item"]: - item_row["allow_alternative_item"] = work_order.allow_alternative_item - - item_dict.setdefault(d.item_code, item_row) - return item_dict + def _resolve_wip_warehouse(self, work_order): + if not frappe.db.get_value("Warehouse", work_order.wip_warehouse, "is_group"): + return work_order.wip_warehouse + return None + + def _add_required_item( + self, item_dict, d, consider_job_card, job_card_items, wip_warehouse, extra_pct, work_order + ): + if consider_job_card and d.item_code not in job_card_items: + return + additional_qty = extra_pct * flt(d.required_qty) / 100 if extra_pct else 0.0 + transfer_pending = ( + (flt(d.required_qty) + additional_qty) > flt(d.transferred_qty) + if additional_qty + else flt(d.required_qty) > flt(d.transferred_qty) + ) + can_transfer = transfer_pending or self.backflush_based_on == "Material Transferred for Manufacture" + if not can_transfer or not d.include_item_in_manufacturing: + return + self._build_required_item_row(item_dict, d, consider_job_card, wip_warehouse, work_order) + + def _build_required_item_row(self, item_dict, d, consider_job_card, wip_warehouse, work_order): + item_row = d.as_dict() + item_row["idx"] = len(item_dict) + 1 + if consider_job_card: + item_row["job_card_item"] = self._get_job_card_item(d.item_code) + if d.source_warehouse and not frappe.db.get_value("Warehouse", d.source_warehouse, "is_group"): + item_row["from_warehouse"] = d.source_warehouse + item_row["to_warehouse"] = wip_warehouse + if item_row["allow_alternative_item"]: + item_row["allow_alternative_item"] = work_order.allow_alternative_item + item_dict.setdefault(d.item_code, item_row) + + def _get_job_card_item(self, item_code): + return ( + frappe.db.get_value("Job Card Item", {"item_code": item_code, "parent": self.doc.get("job_card")}) + or None + ) + def get_job_card_item_codes(self): if not self.doc.get("job_card"): return [] @@ -389,68 +363,73 @@ class MaterialRequestStockEntry(BaseMaterialTransferStockEntry): return stock_entries, child_list def _bulk_update_transferred_qty(self, stock_entries, child_list): - from pypika import Case - sed = frappe.qb.DocType("Stock Entry Detail") - case_expr = Case() - for (parent, name), qty in stock_entries.items(): - case_expr = case_expr.when((sed.parent == parent) & (sed.name == name), qty) + case_expr = self._build_case_expr(sed, stock_entries) ( frappe.qb.update(sed) .set(sed.transferred_qty, case_expr.else_(sed.transferred_qty)) .where(sed.name.isin(child_list)) ).run() + def _build_case_expr(self, sed, stock_entries): + from pypika import Case + + case_expr = Case() + for (parent, name), qty in stock_entries.items(): + case_expr = case_expr.when((sed.parent == parent) & (sed.name == name), qty) + return case_expr + def _update_per_transferred_field(self): - self.doc._update_percent_field_in_targets( - { - "source_dt": "Stock Entry Detail", - "target_field": "transferred_qty", - "target_ref_field": "qty", - "target_dt": "Stock Entry Detail", - "join_field": "ste_detail", - "target_parent_dt": "Stock Entry", - "target_parent_field": "per_transferred", - "source_field": "qty", - "percent_join_field": "against_stock_entry", - }, - update_modified=True, - ) + self.doc._update_percent_field_in_targets(self._get_per_transferred_config(), update_modified=True) + + def _get_per_transferred_config(self): + return { + "source_dt": "Stock Entry Detail", + "target_field": "transferred_qty", + "target_ref_field": "qty", + "target_dt": "Stock Entry Detail", + "join_field": "ste_detail", + "target_parent_dt": "Stock Entry", + "target_parent_field": "per_transferred", + "source_field": "qty", + "percent_join_field": "against_stock_entry", + } def set_material_request_transfer_status(self, status): material_requests = [] - parent_se = None - if self.doc.outgoing_stock_entry: - parent_se = frappe.get_value("Stock Entry", self.doc.outgoing_stock_entry, "add_to_transit") - + parent_se = ( + frappe.get_value("Stock Entry", self.doc.outgoing_stock_entry, "add_to_transit") + if self.doc.outgoing_stock_entry + else None + ) for item in self.doc.items: - material_request = item.get("material_request") - if material_request not in material_requests: - if self.doc.outgoing_stock_entry and parent_se: - material_request = frappe.get_value( - "Stock Entry Detail", item.ste_detail, "material_request" - ) + mr = item.get("material_request") + if mr not in material_requests and self.doc.outgoing_stock_entry and parent_se: + mr = frappe.get_value("Stock Entry Detail", item.ste_detail, "material_request") + if mr and mr not in material_requests: + status = self._update_mr_transfer_status(mr, status, material_requests) - if material_request and material_request not in material_requests: - material_requests.append(material_request) - if status == "Completed": - qty = get_transferred_qty(material_request) - if qty.get("transfer_qty") > qty.get("transferred_qty"): - status = "In Transit" + def _update_mr_transfer_status(self, material_request, status, material_requests): + material_requests.append(material_request) + if status == "Completed": + qty = get_transferred_qty(material_request) + if qty.get("transfer_qty") > qty.get("transferred_qty"): + status = "In Transit" + frappe.db.set_value("Material Request", material_request, "transfer_status", status) + return status - frappe.db.set_value("Material Request", material_request, "transfer_status", status) + +def _resolve_transfer_qty(desire_to_transfer, pending_to_issue, can_transfer): + # "No need for transfer but qty still pending" can occur when transferring multiple RM in different Stock Entries + if can_transfer: + return desire_to_transfer if desire_to_transfer > 0 else pending_to_issue + return pending_to_issue if pending_to_issue > 0 else 0 def get_transferred_qty(material_request): sed = frappe.qb.DocType("Stock Entry Detail") - - query = ( + return ( frappe.qb.from_(sed) - .select( - Sum(sed.transfer_qty).as_("transfer_qty"), - Sum(sed.transferred_qty).as_("transferred_qty"), - ) + .select(Sum(sed.transfer_qty).as_("transfer_qty"), Sum(sed.transferred_qty).as_("transferred_qty")) .where((sed.material_request == material_request) & (sed.docstatus == 1)) - ).run(as_dict=True) - - return query[0] + ).run(as_dict=True)[0] diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/serial_batch.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/serial_batch.py index dae9f5b8eb7..517affad752 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/serial_batch.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/serial_batch.py @@ -21,64 +21,62 @@ class StockEntrySABB(BaseStockEntry): already_picked_serial_nos = [] for row in self.doc.items: - if row.use_serial_batch_fields: + if row.use_serial_batch_fields or not row.s_warehouse: continue - - if not row.s_warehouse: - continue - if row.item_code not in serial_or_batch_items: continue - bundle_doc = None - if row.serial_and_batch_bundle and abs(row.transfer_qty) != abs( - frappe.get_cached_value("Serial and Batch Bundle", row.serial_and_batch_bundle, "total_qty") - ): - bundle_doc = SerialBatchCreation( - { - "item_code": row.item_code, - "warehouse": row.s_warehouse, - "serial_and_batch_bundle": row.serial_and_batch_bundle, - "type_of_transaction": "Outward", - "ignore_serial_nos": already_picked_serial_nos, - "qty": row.transfer_qty * -1, - } - ).update_serial_and_batch_entries( - serial_nos=serial_nos.get(row.name), batch_nos=batch_nos.get(row.name) - ) - elif not row.serial_and_batch_bundle and frappe.get_single_value( - "Stock Settings", "auto_create_serial_and_batch_bundle_for_outward" - ): - bundle_doc = SerialBatchCreation( - { - "item_code": row.item_code, - "warehouse": row.s_warehouse, - "posting_datetime": get_combine_datetime( - self.doc.posting_date, self.doc.posting_time - ), - "voucher_type": self.doc.doctype, - "voucher_detail_no": row.name, - "qty": row.transfer_qty * -1, - "ignore_serial_nos": already_picked_serial_nos, - "type_of_transaction": "Outward", - "company": self.doc.company, - "do_not_submit": True, - } - ).make_serial_and_batch_bundle( - serial_nos=serial_nos.get(row.name), batch_nos=batch_nos.get(row.name) - ) - + bundle_doc = self._create_or_update_bundle_for_row( + row, serial_nos, batch_nos, already_picked_serial_nos + ) if not bundle_doc: continue for entry in bundle_doc.entries: - if not entry.serial_no: - continue - - already_picked_serial_nos.append(entry.serial_no) + if entry.serial_no: + already_picked_serial_nos.append(entry.serial_no) row.serial_and_batch_bundle = bundle_doc.name + def _create_or_update_bundle_for_row(self, row, serial_nos, batch_nos, already_picked_serial_nos): + if row.serial_and_batch_bundle and abs(row.transfer_qty) != abs( + frappe.get_cached_value("Serial and Batch Bundle", row.serial_and_batch_bundle, "total_qty") + ): + return SerialBatchCreation( + { + "item_code": row.item_code, + "warehouse": row.s_warehouse, + "serial_and_batch_bundle": row.serial_and_batch_bundle, + "type_of_transaction": "Outward", + "ignore_serial_nos": already_picked_serial_nos, + "qty": row.transfer_qty * -1, + } + ).update_serial_and_batch_entries( + serial_nos=serial_nos.get(row.name), batch_nos=batch_nos.get(row.name) + ) + + if not row.serial_and_batch_bundle and frappe.get_single_value( + "Stock Settings", "auto_create_serial_and_batch_bundle_for_outward" + ): + return SerialBatchCreation( + { + "item_code": row.item_code, + "warehouse": row.s_warehouse, + "posting_datetime": get_combine_datetime(self.doc.posting_date, self.doc.posting_time), + "voucher_type": self.doc.doctype, + "voucher_detail_no": row.name, + "qty": row.transfer_qty * -1, + "ignore_serial_nos": already_picked_serial_nos, + "type_of_transaction": "Outward", + "company": self.doc.company, + "do_not_submit": True, + } + ).make_serial_and_batch_bundle( + serial_nos=serial_nos.get(row.name), batch_nos=batch_nos.get(row.name) + ) + + return None + def get_serial_nos_and_batches_from_sres(self, scio_detail, only_pending=True): serial_nos, batch_nos = [], frappe._dict() @@ -189,64 +187,67 @@ class StockEntrySABB(BaseStockEntry): key = (d.item_code, d.s_warehouse) if details := reservation_entries.get(key): - original_qty = d.qty - if batches := details.get("batch_no"): - for batch_no, qty in batches.items(): - if original_qty <= 0: - break - - if qty <= 0: - continue - - if d.batch_no and original_qty > 0: - new_row = frappe.copy_doc(d) - new_row.name = None - new_row.batch_no = batch_no - new_row.qty = qty - new_row.idx = d.idx + 1 - if new_row.batch_no and details.get("batchwise_sn"): - new_row.serial_no = "\n".join( - details.get("batchwise_sn")[new_row.batch_no][: cint(new_row.qty)] - ) - - new_items_to_add.append(new_row) - original_qty -= qty - batches[batch_no] -= qty - - if qty >= d.qty and not d.batch_no: - d.batch_no = batch_no - batches[batch_no] -= d.qty - if d.batch_no and details.get("batchwise_sn"): - d.serial_no = "\n".join( - details.get("batchwise_sn")[d.batch_no][: cint(d.qty)] - ) - elif not d.batch_no: - d.batch_no = batch_no - d.qty = qty - original_qty -= qty - batches[batch_no] = 0 - - if d.batch_no and details.get("batchwise_sn"): - d.serial_no = "\n".join( - details.get("batchwise_sn")[d.batch_no][: cint(d.qty)] - ) - - if details.get("serial_no"): - d.serial_no = "\n".join(details.get("serial_no")[: cint(d.qty)]) - + self._apply_batch_reservation_to_item(d, details, new_items_to_add) d.use_serial_batch_fields = 1 for new_row in new_items_to_add: self.doc.append("items", new_row) + self._sort_and_reindex_items() + + def _apply_batch_reservation_to_item(self, d, details, new_items_to_add): + original_qty = d.qty + if batches := details.get("batch_no"): + original_qty = self._distribute_batches_to_item( + d, batches, details, new_items_to_add, original_qty + ) + if details.get("serial_no"): + d.serial_no = "\n".join(details.get("serial_no")[: cint(d.qty)]) + + def _distribute_batches_to_item(self, d, batches, details, new_items_to_add, original_qty): + for batch_no, qty in batches.items(): + if original_qty <= 0: + break + if qty <= 0: + continue + if d.batch_no: + original_qty, _ = self._make_overflow_batch_row( + d, batches, details, new_items_to_add, batch_no, qty, original_qty + ) + else: + self._assign_batch_to_item(d, batches, details, batch_no, qty) + return original_qty + + def _make_overflow_batch_row(self, d, batches, details, new_items_to_add, batch_no, qty, original_qty): + new_row = frappe.copy_doc(d) + new_row.name = None + new_row.batch_no = batch_no + new_row.qty = qty + new_row.idx = d.idx + 1 + if new_row.batch_no and details.get("batchwise_sn"): + new_row.serial_no = "\n".join(details.get("batchwise_sn")[new_row.batch_no][: cint(new_row.qty)]) + new_items_to_add.append(new_row) + batches[batch_no] -= qty + return original_qty - qty, new_row + + def _assign_batch_to_item(self, d, batches, details, batch_no, qty): + if qty >= d.qty: + d.batch_no = batch_no + batches[batch_no] -= d.qty + else: + d.batch_no = batch_no + d.qty = qty + batches[batch_no] = 0 + if d.batch_no and details.get("batchwise_sn"): + d.serial_no = "\n".join(details.get("batchwise_sn")[d.batch_no][: cint(d.qty)]) + + def _sort_and_reindex_items(self): sorted_items = sorted(self.doc.items, key=lambda x: x.item_code) if self.doc.purpose == "Manufacture": # ensure finished item at last sorted_items = sorted(sorted_items, key=lambda x: cstr(x.t_warehouse)) - idx = 0 - for row in sorted_items: - idx += 1 + for idx, row in enumerate(sorted_items, start=1): row.idx = idx self.doc.set("items", sorted_items) @@ -256,14 +257,17 @@ def create_serial_and_batch_bundle(parent_doc, row, child, type_of_transaction=N item_details = frappe.get_cached_value( "Item", child.item_code, ["has_serial_no", "has_batch_no"], as_dict=1 ) - if not (item_details.has_serial_no or item_details.has_batch_no): return + doc = _make_bundle_doc(parent_doc, child, type_of_transaction or "Inward") + _populate_bundle_entries(doc, row, child) + if not doc.entries: + return None + return doc.insert(ignore_permissions=True).name - if not type_of_transaction: - type_of_transaction = "Inward" - doc = frappe.get_doc( +def _make_bundle_doc(parent_doc, child, type_of_transaction): + return frappe.get_doc( { "doctype": "Serial and Batch Bundle", "voucher_type": "Stock Entry", @@ -275,41 +279,45 @@ def create_serial_and_batch_bundle(parent_doc, row, child, type_of_transaction=N } ) + +def _populate_bundle_entries(doc, row, child): precision = frappe.get_precision("Stock Entry Detail", "qty") if row.serial_nos and row.batches_to_be_consume: - doc.has_serial_no = 1 - doc.has_batch_no = 1 - batchwise_serial_nos = get_batchwise_serial_nos(child.item_code, row) - for batch_no, qty in row.batches_to_be_consume.items(): - while flt(qty, precision) > 0: - qty -= 1 - doc.append( - "entries", - { - "batch_no": batch_no, - "serial_no": batchwise_serial_nos.get(batch_no).pop(0), - "warehouse": row.warehouse, - "qty": -1, - }, - ) - + _append_serial_batch_entries(doc, row, child, precision) elif row.serial_nos: doc.has_serial_no = 1 for serial_no in row.serial_nos: doc.append("entries", {"serial_no": serial_no, "warehouse": row.warehouse, "qty": -1}) - elif row.batches_to_be_consume: - precision = frappe.get_precision("Serial and Batch Entry", "qty") - doc.has_batch_no = 1 - for batch_no, qty in row.batches_to_be_consume.items(): - if flt(qty, precision) > 0: - qty = flt(qty, precision) - doc.append("entries", {"batch_no": batch_no, "warehouse": row.warehouse, "qty": qty * -1}) + _append_batch_entries(doc, row) - if not doc.entries: - return None - return doc.insert(ignore_permissions=True).name +def _append_serial_batch_entries(doc, row, child, precision): + doc.has_serial_no = 1 + doc.has_batch_no = 1 + batchwise_serial_nos = get_batchwise_serial_nos(child.item_code, row) + for batch_no, qty in row.batches_to_be_consume.items(): + while flt(qty, precision) > 0: + qty -= 1 + doc.append( + "entries", + { + "batch_no": batch_no, + "serial_no": batchwise_serial_nos.get(batch_no).pop(0), + "warehouse": row.warehouse, + "qty": -1, + }, + ) + + +def _append_batch_entries(doc, row): + precision = frappe.get_precision("Serial and Batch Entry", "qty") + doc.has_batch_no = 1 + for batch_no, qty in row.batches_to_be_consume.items(): + if flt(qty, precision) > 0: + doc.append( + "entries", {"batch_no": batch_no, "warehouse": row.warehouse, "qty": flt(qty, precision) * -1} + ) def get_batchwise_serial_nos(item_code, row): @@ -329,24 +337,20 @@ def get_batchwise_serial_nos(item_code, row): @frappe.whitelist() def get_expired_batch_items(): - from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import get_auto_batch_nos - expired_batches = get_expired_batches() if not expired_batches: return [] + return _enrich_expired_batches_with_stock(expired_batches) + + +def _enrich_expired_batches_with_stock(expired_batches): + from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import get_auto_batch_nos expired_batches_stock = get_auto_batch_nos( - frappe._dict( - { - "batch_no": list(expired_batches.keys()), - "for_stock_levels": True, - } - ) + frappe._dict({"batch_no": list(expired_batches.keys()), "for_stock_levels": True}) ) - for row in expired_batches_stock: row.update(expired_batches.get(row.batch_no)) - return expired_batches_stock diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py index 67cf3208fb5..ef60504b083 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py @@ -34,21 +34,26 @@ class SendToSubcontractorStockEntry(BaseStockEntry): self.validate_subcontracting_order_for_transfer(row) def validate_subcontracting_order_for_bom(self, child_row, subcontract_order): - def get_required_qty(item_code): - return sum( - flt(d.required_qty) for d in subcontract_order.supplied_items if d.rm_item_code == item_code - ) - - qty_allowance = flt(frappe.db.get_single_value("Buying Settings", "over_transfer_allowance")) item_code = child_row.original_item or child_row.item_code - required_qty = get_required_qty(item_code) + required_qty = self._get_required_qty_for_bom(item_code, child_row, subcontract_order) + qty_allowance = flt(frappe.db.get_single_value("Buying Settings", "over_transfer_allowance")) + total_allowed = required_qty + (required_qty * qty_allowance / 100) + self._validate_transfer_qty(child_row, item_code, total_allowed) + self._link_rm_detail_if_missing(child_row, item_code) + def _get_required_qty_for_bom(self, item_code, child_row, subcontract_order): + required_qty = sum( + flt(d.required_qty) for d in subcontract_order.supplied_items if d.rm_item_code == item_code + ) if not required_qty and child_row.allow_alternative_item: original_item_code = frappe.get_value( "Item Alternative", {"alternative_item_code": item_code}, "item_code" ) - required_qty = get_required_qty(original_item_code) - + required_qty = sum( + flt(d.required_qty) + for d in subcontract_order.supplied_items + if d.rm_item_code == original_item_code + ) if not required_qty: frappe.throw( _("Item {0} not found in 'Raw Materials Supplied' table in {1} {2}").format( @@ -57,14 +62,15 @@ class SendToSubcontractorStockEntry(BaseStockEntry): self.doc.get(self.doc.subcontract_data.order_field), ) ) + return required_qty - total_allowed = required_qty + (required_qty * (qty_allowance / 100)) + def _validate_transfer_qty(self, child_row, item_code, total_allowed): total_supplied = self.get_total_supplied_qty(child_row) - - total_returned = 0 - if self.doc.subcontract_data.order_doctype == "Subcontracting Order": - total_returned = self.get_total_returned_qty(child_row) - + total_returned = ( + self.get_total_returned_qty(child_row) + if self.doc.subcontract_data.order_doctype == "Subcontracting Order" + else 0 + ) if flt( total_supplied + child_row.transfer_qty - total_returned, child_row.precision("transfer_qty") ) > flt(total_allowed, child_row.precision("transfer_qty")): @@ -77,20 +83,21 @@ class SendToSubcontractorStockEntry(BaseStockEntry): self.doc.get(self.doc.subcontract_data.order_field), ) ) - elif not child_row.get(self.doc.subcontract_data.rm_detail_field): + + def _link_rm_detail_if_missing(self, child_row, item_code): + if not child_row.get(self.doc.subcontract_data.rm_detail_field): order_rm_detail = self.get_order_rm_detail(child_row) if order_rm_detail: child_row.db_set(self.doc.subcontract_data.rm_detail_field, order_rm_detail) - else: - if not child_row.allow_alternative_item: - frappe.throw( - _("Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}").format( - child_row.idx, - item_code, - self.doc.subcontract_data.order_doctype, - self.doc.get(self.doc.subcontract_data.order_field), - ) + elif not child_row.allow_alternative_item: + frappe.throw( + _("Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}").format( + child_row.idx, + item_code, + self.doc.subcontract_data.order_doctype, + self.doc.get(self.doc.subcontract_data.order_field), ) + ) def validate_subcontracting_order_for_transfer(self, child_row): if not child_row.subcontracted_item: @@ -106,46 +113,42 @@ class SendToSubcontractorStockEntry(BaseStockEntry): def get_total_supplied_qty(self, child_row): se = frappe.qb.DocType("Stock Entry") - se_detail = frappe.qb.DocType("Stock Entry Detail") - + sed = frappe.qb.DocType("Stock Entry Detail") + order_filter = self._get_supplied_qty_order_filter(se, sed, child_row) return ( frappe.qb.from_(se) - .inner_join(se_detail) - .on(se.name == se_detail.parent) - .select(Sum(se_detail.transfer_qty)) + .inner_join(sed) + .on(se.name == sed.parent) + .select(Sum(sed.transfer_qty)) .where( (se.purpose == "Send to Subcontractor") & (se.docstatus == 1) - & (se_detail.item_code == child_row.item_code) - & ( - ( - (se.purchase_order == self.doc.purchase_order) - & (se_detail.po_detail == self.doc.po_detail) - ) - if self.doc.subcontract_data.order_doctype == "Purchase Order" - else ( - (se.subcontracting_order == self.doc.subcontracting_order) - & (se_detail.sco_rm_detail == child_row.sco_rm_detail) - ) - ) + & (sed.item_code == child_row.item_code) + & order_filter ) ).run()[0][0] or 0 + def _get_supplied_qty_order_filter(self, se, sed, child_row): + if self.doc.subcontract_data.order_doctype == "Purchase Order": + return (se.purchase_order == self.doc.purchase_order) & (sed.po_detail == self.doc.po_detail) + return (se.subcontracting_order == self.doc.subcontracting_order) & ( + sed.sco_rm_detail == child_row.sco_rm_detail + ) + def get_total_returned_qty(self, child_row): se = frappe.qb.DocType("Stock Entry") - se_detail = frappe.qb.DocType("Stock Entry Detail") - + sed = frappe.qb.DocType("Stock Entry Detail") return ( frappe.qb.from_(se) - .inner_join(se_detail) - .on(se.name == se_detail.parent) - .select(Sum(se_detail.transfer_qty)) + .inner_join(sed) + .on(se.name == sed.parent) + .select(Sum(sed.transfer_qty)) .where( (se.purpose == "Material Transfer") & (se.docstatus == 1) & (se.is_return == 1) - & (se_detail.item_code == child_row.item_code) - & (se_detail.sco_rm_detail == child_row.sco_rm_detail) + & (sed.item_code == child_row.item_code) + & (sed.sco_rm_detail == child_row.sco_rm_detail) & (se.subcontracting_order == self.doc.subcontracting_order) ) ).run()[0][0] or 0 @@ -169,36 +172,37 @@ class SendToSubcontractorStockEntry(BaseStockEntry): def update_subcontract_order_supplied_items(self): if not self.doc.get(self.doc.subcontract_data.order_field): return + order_supplied_items = self._get_order_supplied_items() + supplied_items = self._get_supplied_items_details() + self._update_supplied_items_in_order(order_supplied_items, supplied_items) + self._update_reserved_qty_for_subcontracting(order_supplied_items) - # Get Subcontract Order Supplied Items Details - order_supplied_items = frappe.db.get_all( + def _get_order_supplied_items(self): + return frappe.db.get_all( self.doc.subcontract_data.order_supplied_items_field, filters={"parent": self.doc.get(self.doc.subcontract_data.order_field)}, fields=["name", "rm_item_code", "reserve_warehouse"], ) - # Get Items Supplied in Stock Entries against Subcontract Order - supplied_items = get_supplied_items( + def _get_supplied_items_details(self): + return get_supplied_items( self.doc.get(self.doc.subcontract_data.order_field), self.doc.subcontract_data.rm_detail_field, self.doc.subcontract_data.order_field, ) + def _update_supplied_items_in_order(self, order_supplied_items, supplied_items): for row in order_supplied_items: - key, item = row.name, {} - if not supplied_items.get(key): - # no stock transferred against Subcontract Order Supplied Items row - item = {"supplied_qty": 0, "returned_qty": 0, "total_supplied_qty": 0} - else: - item = supplied_items.get(key) - + item = supplied_items.get(row.name) or { + "supplied_qty": 0, + "returned_qty": 0, + "total_supplied_qty": 0, + } frappe.db.set_value(self.doc.subcontract_data.order_supplied_items_field, row.name, item) - # RM Item-Reserve Warehouse Dict + def _update_reserved_qty_for_subcontracting(self, order_supplied_items): item_wh = {x.get("rm_item_code"): x.get("reserve_warehouse") for x in order_supplied_items} - for d in self.doc.get("items"): - # Update reserved sub contracted quantity in bin based on Supplied Item Details and item_code = d.get("original_item") or d.get("item_code") reserve_warehouse = item_wh.get(item_code) if not (reserve_warehouse and item_code): From c6cde700b55a7c776fec64356cf37c13891f2392 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 21 May 2026 17:25:55 +0530 Subject: [PATCH 066/249] fix: correct remarks for foreign currency payment entries --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 9cda2422a4e..357df56c5e9 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -1238,9 +1238,9 @@ class PaymentEntry(AccountsController): else: remarks = [ _("Amount {0} {1} {2} {3}").format( - _(self.paid_to_account_currency) + _(self.paid_from_account_currency) if self.payment_type == "Receive" - else _(self.paid_from_account_currency), + else _(self.paid_to_account_currency), self.paid_amount if self.payment_type == "Receive" else self.received_amount, _("received from") if self.payment_type == "Receive" else _("paid to"), self.party, @@ -1256,7 +1256,7 @@ class PaymentEntry(AccountsController): for d in self.get("references"): if d.allocated_amount: remarks.append( - _("Amount {0} {1} against {2} {3}").format( + _("Amount {0} {1} adjusted against {2} {3}").format( _(self.party_account_currency), d.allocated_amount, d.reference_doctype, @@ -1267,7 +1267,7 @@ class PaymentEntry(AccountsController): for d in self.get("deductions"): if d.amount: remarks.append( - _("Amount {0} {1} deducted against {2}").format( + _("Amount {0} {1} as adjustment to {2}").format( _(self.company_currency), d.amount, d.account ) ) From 92c969478ea8b078dcb2a1e31ad344ff87cd1f8f Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 21 May 2026 17:33:59 +0530 Subject: [PATCH 067/249] fix: correct description for Is Rate Adjustment Entry (Debit Note) checkbox --- erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 14e97b1c5db..6c4d98a215f 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -1919,7 +1919,7 @@ { "default": "0", "depends_on": "eval: !doc.is_return", - "description": "Issue a debit note with 0 qty against an existing Sales Invoice", + "description": "Issue a debit note against an existing Sales Invoice to adjust the rate. The quantity will be retained from the original invoice.", "fieldname": "is_debit_note", "fieldtype": "Check", "label": "Is Rate Adjustment Entry (Debit Note)" @@ -2357,7 +2357,7 @@ "link_fieldname": "consolidated_invoice" } ], - "modified": "2026-05-01 02:37:29.742764", + "modified": "2026-05-21 17:31:11.190958", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", From db64f451c17e3afa050b5eb9c25e11985af4ac82 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 20 May 2026 14:12:44 +0530 Subject: [PATCH 068/249] feat: pending qty in job card --- .../doctype/job_card/job_card.js | 75 +++++++++++++++++-- .../doctype/job_card/job_card.json | 46 +++++++++--- .../doctype/job_card/job_card.py | 32 +++++--- .../doctype/job_card/test_job_card.py | 1 + .../doctype/work_order/work_order.py | 19 ++--- .../work_order_operation.json | 11 ++- .../work_order_operation.py | 1 + 7 files changed, 146 insertions(+), 39 deletions(-) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.js b/erpnext/manufacturing/doctype/job_card/job_card.js index fdb0b1ef2c4..dc183bc5fa0 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.js +++ b/erpnext/manufacturing/doctype/job_card/job_card.js @@ -77,6 +77,30 @@ frappe.ui.form.on("Job Card", { }); }, + pending_qty(frm) { + if (frm.doc.total_completed_qty <= 0.0) { + frm.doc.pending_qty = 0.0; + refresh_field("pending_qty"); + frappe.throw(__("Please complete the job first before entering Pending Quantity")); + } + + if (frm.doc.pending_qty < 0) { + frappe.throw(__("Pending Quantity cannot be less than 0")); + } + + let remaining_qty = flt(frm.doc.for_quantity) - flt(frm.doc.total_completed_qty); + + if (remaining_qty < frm.doc.pending_qty) { + frm.doc.pending_qty = 0.0; + refresh_field("pending_qty"); + frappe.throw(__("Pending Quantity cannot be greater than {0}", [remaining_qty])); + } + + let process_loss_qty = flt(remaining_qty) - flt(frm.doc.pending_qty); + frm.doc.process_loss_qty = process_loss_qty >= 0 ? process_loss_qty : 0; + refresh_field("process_loss_qty"); + }, + set_company_filters(frm, fieldname) { frm.set_query(fieldname, () => { return { @@ -148,6 +172,10 @@ frappe.ui.form.on("Job Card", { return; } + if (frm.doc.docstatus > 0) { + frm.set_df_property("pending_qty", "read_only", 1); + } + let has_stock_entry = frm.doc.__onload && frm.doc.__onload.has_stock_entry ? true : false; frm.toggle_enable("for_quantity", !has_stock_entry); @@ -212,12 +240,14 @@ frappe.ui.form.on("Job Card", { !has_items?.length) ) { let last_row = {}; - if (frm.doc.sub_operations?.length && frm.doc.time_logs?.length) { + if ((frm.doc.sub_operations?.length || frm.doc.pending_qty > 0) && frm.doc.time_logs?.length) { last_row = get_last_row(frm.doc.time_logs); } if ( - (!frm.doc.time_logs?.length || (frm.doc.sub_operations?.length && last_row?.to_time)) && + (!frm.doc.time_logs?.length || + (flt(frm.doc.pending_qty) > 0.0 && last_row?.to_time) || + (frm.doc.sub_operations?.length && last_row?.to_time)) && !frm.doc.is_paused ) { frm.add_custom_button(__("Start Job"), () => { @@ -312,13 +342,18 @@ frappe.ui.form.on("Job Card", { }, complete_job_card(frm) { + let pending_qty = frm.doc.for_quantity - frm.doc.total_completed_qty; + if (frm.doc.pending_qty > 0) { + pending_qty = frm.doc.pending_qty; + } + let fields = [ { fieldtype: "Float", label: __("Qty to Manufacture"), fieldname: "for_quantity", reqd: 1, - default: frm.doc.for_quantity, + default: pending_qty, change() { let doc = frm.job_completion_dialog; @@ -331,12 +366,29 @@ frappe.ui.form.on("Job Card", { label: __("Completed Quantity"), fieldname: "completed_qty", reqd: 1, - default: frm.doc.for_quantity - frm.doc.total_completed_qty, + default: pending_qty, change() { let doc = frm.job_completion_dialog; - let process_loss_qty = doc.get_value("for_quantity") - doc.get_value("completed_qty"); - if (process_loss_qty > 0 && process_loss_qty != doc.get_value("process_loss_qty")) { + let pending_qty = doc.get_value("for_quantity") - doc.get_value("completed_qty"); + if (pending_qty > 0 && pending_qty != doc.get_value("pending_qty")) { + doc.set_value("pending_qty", pending_qty); + } + }, + }, + { + fieldtype: "Float", + label: __("Pending Quantity"), + fieldname: "pending_qty", + default: 0.0, + change() { + let doc = frm.job_completion_dialog; + + let process_loss_qty = + doc.get_value("for_quantity") - + doc.get_value("completed_qty") - + doc.get_value("pending_qty"); + if (process_loss_qty >= 0 && process_loss_qty != doc.get_value("process_loss_qty")) { doc.set_value("process_loss_qty", process_loss_qty); } }, @@ -348,8 +400,13 @@ frappe.ui.form.on("Job Card", { onchange() { let doc = frm.job_completion_dialog; - let completed_qty = doc.get_value("for_quantity") - doc.get_value("process_loss_qty"); - doc.set_value("completed_qty", completed_qty); + let pending_qty = + doc.get_value("for_quantity") - + doc.get_value("completed_qty") - + doc.get_value("process_loss_qty"); + if (pending_qty >= 0 && pending_qty != doc.get_value("pending_qty")) { + doc.set_value("pending_qty", pending_qty); + } }, }, { @@ -405,6 +462,8 @@ frappe.ui.form.on("Job Card", { args: { qty: data.completed_qty, for_quantity: data.for_quantity, + pending_qty: data.pending_qty, + process_loss_qty: data.process_loss_qty, end_time: data.end_time, sub_operation: data.sub_operation, }, diff --git a/erpnext/manufacturing/doctype/job_card/job_card.json b/erpnext/manufacturing/doctype/job_card/job_card.json index 1e4af027c30..b9236d2ba00 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.json +++ b/erpnext/manufacturing/doctype/job_card/job_card.json @@ -9,23 +9,26 @@ "field_order": [ "company", "naming_series", - "work_order", + "production_item", "employee", "column_break_4", "posting_date", - "project", + "work_order", "bom_no", - "is_subcontracted", "semi_finished_good__finished_good_section", "finished_good", - "production_item", - "semi_fg_bom", - "total_completed_qty", "column_break_mcnb", + "semi_fg_bom", + "section_break_folk", "for_quantity", - "transferred_qty", - "manufactured_qty", + "pending_qty", + "column_break_cyjw", "process_loss_qty", + "total_completed_qty", + "section_break_wpjf", + "transferred_qty", + "column_break_lgte", + "manufactured_qty", "production_section", "operation", "source_warehouse", @@ -72,8 +75,10 @@ "item_name", "requested_qty", "is_paused", + "is_subcontracted", "track_semi_finished_goods", "column_break_20", + "project", "remarks", "section_break_dfoc", "status", @@ -626,12 +631,35 @@ "fieldname": "secondary_items_section", "fieldtype": "Tab Break", "label": "Secondary Items" + }, + { + "fieldname": "section_break_folk", + "fieldtype": "Section Break", + "hide_border": 1 + }, + { + "fieldname": "column_break_cyjw", + "fieldtype": "Column Break" + }, + { + "allow_on_submit": 1, + "fieldname": "pending_qty", + "fieldtype": "Float", + "label": "Pending Qty" + }, + { + "fieldname": "section_break_wpjf", + "fieldtype": "Section Break" + }, + { + "fieldname": "column_break_lgte", + "fieldtype": "Column Break" } ], "grid_page_length": 50, "is_submittable": 1, "links": [], - "modified": "2026-05-12 12:17:17.750857", + "modified": "2026-05-20 14:05:46.205365", "modified_by": "Administrator", "module": "Manufacturing", "name": "Job Card", diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py index b3d4301addf..3de801a5f86 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.py +++ b/erpnext/manufacturing/doctype/job_card/job_card.py @@ -104,6 +104,7 @@ class JobCard(Document): operation_id: DF.Data | None operation_row_id: DF.Int operation_row_number: DF.Literal[None] + pending_qty: DF.Float posting_date: DF.Date | None process_loss_qty: DF.Float production_item: DF.Link | None @@ -882,7 +883,9 @@ class JobCard(Document): precision = self.precision("total_completed_qty") total_completed_qty = flt( - flt(self.total_completed_qty, precision) + flt(self.process_loss_qty, precision) + flt(self.total_completed_qty, precision) + + flt(self.process_loss_qty, precision) + + flt(self.pending_qty, precision) ) if self.for_quantity and flt(total_completed_qty, precision) != flt(self.for_quantity, precision): @@ -929,8 +932,10 @@ class JobCard(Document): self.process_loss_qty = 0.0 if self.total_completed_qty and self.for_quantity > self.total_completed_qty: - self.process_loss_qty = flt(self.for_quantity, precision) - flt( - self.total_completed_qty, precision + self.process_loss_qty = ( + flt(self.for_quantity, precision) + - flt(self.total_completed_qty, precision) + - flt(self.pending_qty, precision) ) def update_work_order(self): @@ -944,13 +949,14 @@ class JobCard(Document): ): return - for_quantity, time_in_mins, process_loss_qty = 0, 0, 0 + for_quantity, time_in_mins, process_loss_qty, pending_qty = 0, 0, 0, 0 data = self.get_current_operation_data() if data and len(data) > 0: for_quantity = flt(data[0].completed_qty) time_in_mins = flt(data[0].time_in_mins) process_loss_qty = flt(data[0].process_loss_qty) + pending_qty = flt(data[0].pending_qty) wo = frappe.get_doc("Work Order", self.work_order) @@ -958,8 +964,8 @@ class JobCard(Document): self.update_corrective_in_work_order(wo) elif self.operation_id: - self.validate_produced_quantity(for_quantity, process_loss_qty, wo) - self.update_work_order_data(for_quantity, process_loss_qty, time_in_mins, wo) + self.validate_produced_quantity(for_quantity, process_loss_qty, pending_qty, wo) + self.update_work_order_data(for_quantity, process_loss_qty, pending_qty, time_in_mins, wo) def update_semi_finished_good_details(self): if self.operation_id: @@ -988,11 +994,11 @@ class JobCard(Document): wo.flags.ignore_validate_update_after_submit = True wo.save() - def validate_produced_quantity(self, for_quantity, process_loss_qty, wo): + def validate_produced_quantity(self, for_quantity, process_loss_qty, pending_qty, wo): if self.docstatus < 2: return - if wo.produced_qty > for_quantity + process_loss_qty: + if wo.produced_qty > for_quantity + process_loss_qty + pending_qty: first_part_msg = _( "The {0} {1} is used to calculate the valuation cost for the finished good {2}." ).format(frappe.bold(_("Job Card")), frappe.bold(self.name), frappe.bold(self.production_item)) @@ -1005,7 +1011,7 @@ class JobCard(Document): _("{0} {1}").format(first_part_msg, second_part_msg), JobCardCancelError, title=_("Error") ) - def update_work_order_data(self, for_quantity, process_loss_qty, time_in_mins, wo): + def update_work_order_data(self, for_quantity, process_loss_qty, pending_qty, time_in_mins, wo): workstation_hour_rate = frappe.get_value("Workstation", self.workstation, "hour_rate") jc = frappe.qb.DocType("Job Card") jctl = frappe.qb.DocType("Job Card Time Log") @@ -1027,6 +1033,7 @@ class JobCard(Document): if data.get("name") == self.operation_id: data.completed_qty = for_quantity data.process_loss_qty = process_loss_qty + data.pending_qty = pending_qty data.actual_operation_time = time_in_mins data.actual_start_time = time_data[0].start_time if time_data else None data.actual_end_time = time_data[0].end_time if time_data else None @@ -1052,6 +1059,7 @@ class JobCard(Document): {"SUM": "total_time_in_mins", "as": "time_in_mins"}, {"SUM": "total_completed_qty", "as": "completed_qty"}, {"SUM": "process_loss_qty", "as": "process_loss_qty"}, + {"SUM": "pending_qty", "as": "pending_qty"}, ], filters={ "docstatus": 1, @@ -1446,10 +1454,10 @@ class JobCard(Document): if isinstance(kwargs, dict): kwargs = frappe._dict(kwargs) - if kwargs.end_time: - if kwargs.for_quantity: - self.for_quantity = kwargs.for_quantity + self.pending_qty = flt(kwargs.pending_qty) + self.process_loss_qty = flt(kwargs.process_loss_qty) + if kwargs.end_time: self.add_time_logs( to_time=kwargs.end_time, completed_qty=kwargs.qty, diff --git a/erpnext/manufacturing/doctype/job_card/test_job_card.py b/erpnext/manufacturing/doctype/job_card/test_job_card.py index 7f1f50748b8..feeb758c8e7 100644 --- a/erpnext/manufacturing/doctype/job_card/test_job_card.py +++ b/erpnext/manufacturing/doctype/job_card/test_job_card.py @@ -721,6 +721,7 @@ class TestJobCard(ERPNextTestSuite): ) jc.time_logs[0].completed_qty = 8 + jc.pending_qty = 0.0 jc.save() jc.submit() diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py index 70d9863b876..4921ff26bcc 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.py +++ b/erpnext/manufacturing/doctype/work_order/work_order.py @@ -167,18 +167,19 @@ class WorkOrder(Document): self.set_onload("backflush_raw_materials_based_on", based_on) def show_create_job_card_button(self): - operation_details = frappe._dict( - frappe.get_all( - "Job Card", - fields=["operation", {"SUM": "for_quantity"}], - filters={"docstatus": ("<", 2), "work_order": self.name}, - as_list=1, - group_by="operation_id", - ) + jc_doctype = frappe.qb.DocType("Job Card") + query = ( + frappe.qb.from_(jc_doctype) + .select(jc_doctype.operation_id, Sum(jc_doctype.for_quantity - IfNull(jc_doctype.pending_qty, 0))) + .where((jc_doctype.docstatus < 2) & (jc_doctype.work_order == self.name)) + .groupby(jc_doctype.operation_id) ) + operation_details = query.run(as_list=1) + operation_details = frappe._dict(operation_details) + for d in self.operations: - job_card_qty = self.qty - flt(operation_details.get(d.operation)) + job_card_qty = self.qty - flt(operation_details.get(d.name)) if job_card_qty > 0: return True diff --git a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json index 89ed830116b..918f2b21847 100644 --- a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json +++ b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_bulk_edit": 1, "creation": "2025-04-09 12:12:19.824560", "doctype": "DocType", "editable_grid": 1, @@ -10,6 +11,7 @@ "status", "completed_qty", "process_loss_qty", + "pending_qty", "column_break_4", "bom", "workstation_type", @@ -301,13 +303,20 @@ "fieldname": "quality_inspection_required", "fieldtype": "Check", "label": "Quality Inspection Required" + }, + { + "fieldname": "pending_qty", + "fieldtype": "Float", + "label": "Pending Qty", + "no_copy": 1, + "read_only": 1 } ], "grid_page_length": 50, "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2026-03-30 17:20:08.874381", + "modified": "2026-05-20 13:01:21.827200", "modified_by": "Administrator", "module": "Manufacturing", "name": "Work Order Operation", diff --git a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.py b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.py index 2e45434f94b..8950fd6b320 100644 --- a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.py +++ b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.py @@ -32,6 +32,7 @@ class WorkOrderOperation(Document): parent: DF.Data parentfield: DF.Data parenttype: DF.Data + pending_qty: DF.Float planned_end_time: DF.Datetime | None planned_operating_cost: DF.Currency planned_start_time: DF.Datetime | None From 0a215b071774a5c2b9202a204ee9e3063381ec18 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 20 May 2026 22:59:00 +0530 Subject: [PATCH 069/249] refactor: job_card.js code for better readability --- .../doctype/job_card/job_card.js | 716 ++++++++---------- 1 file changed, 329 insertions(+), 387 deletions(-) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.js b/erpnext/manufacturing/doctype/job_card/job_card.js index dc183bc5fa0..0dc483f9ea6 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.js +++ b/erpnext/manufacturing/doctype/job_card/job_card.js @@ -2,79 +2,53 @@ // For license information, please see license.txt frappe.ui.form.on("Job Card", { - setup: function (frm) { - frm.set_query("operation", function () { - return { - query: "erpnext.manufacturing.doctype.job_card.job_card.get_operations", - filters: { - work_order: frm.doc.work_order, - }, - }; - }); + setup(frm) { + frm.set_query("operation", () => ({ + query: "erpnext.manufacturing.doctype.job_card.job_card.get_operations", + filters: { work_order: frm.doc.work_order }, + })); - frm.set_query("serial_and_batch_bundle", () => { - return { - filters: { - item_code: frm.doc.production_item, - voucher_type: frm.doc.doctype, - voucher_no: ["in", [frm.doc.name, ""]], - is_cancelled: 0, - }, - }; - }); + frm.set_query("serial_and_batch_bundle", () => ({ + filters: { + item_code: frm.doc.production_item, + voucher_type: frm.doc.doctype, + voucher_no: ["in", [frm.doc.name, ""]], + is_cancelled: 0, + }, + })); - frm.set_query("item_code", "secondary_items", () => { - return { - filters: { - disabled: 0, - }, - }; - }); + frm.set_query("item_code", "secondary_items", () => ({ + filters: { disabled: 0 }, + })); frm.set_query("operation", "time_logs", () => { - let operations = (frm.doc.sub_operations || []).map((d) => d.sub_operation); - return { - filters: { - name: ["in", operations], - }, - }; + const operations = (frm.doc.sub_operations || []).map((d) => d.sub_operation); + return { filters: { name: ["in", operations] } }; }); - frm.set_query("work_order", function () { - return { - filters: { - status: ["not in", ["Cancelled", "Closed", "Stopped"]], - }, - }; - }); + frm.set_query("work_order", () => ({ + filters: { status: ["not in", ["Cancelled", "Closed", "Stopped"]] }, + })); frm.events.set_company_filters(frm, "target_warehouse"); frm.events.set_company_filters(frm, "source_warehouse"); frm.events.set_company_filters(frm, "wip_warehouse"); - frm.set_query("source_warehouse", "items", () => { - return { - filters: { - company: frm.doc.company, - }, - }; + + frm.set_query("source_warehouse", "items", () => ({ + filters: { company: frm.doc.company }, + })); + + frm.set_indicator_formatter("sub_operation", (doc) => { + if (doc.status === "Pending") return "red"; + return doc.status === "Complete" ? "green" : "orange"; }); - frm.set_indicator_formatter("sub_operation", function (doc) { - if (doc.status == "Pending") { - return "red"; - } else { - return doc.status === "Complete" ? "green" : "orange"; - } - }); - - frm.set_query("employee", () => { - return { - filters: { - company: frm.doc.company, - status: "Active", - }, - }; - }); + frm.set_query("employee", () => ({ + filters: { + company: frm.doc.company, + status: "Active", + }, + })); }, pending_qty(frm) { @@ -88,7 +62,7 @@ frappe.ui.form.on("Job Card", { frappe.throw(__("Pending Quantity cannot be less than 0")); } - let remaining_qty = flt(frm.doc.for_quantity) - flt(frm.doc.total_completed_qty); + const remaining_qty = flt(frm.doc.for_quantity) - flt(frm.doc.total_completed_qty); if (remaining_qty < frm.doc.pending_qty) { frm.doc.pending_qty = 0.0; @@ -96,19 +70,15 @@ frappe.ui.form.on("Job Card", { frappe.throw(__("Pending Quantity cannot be greater than {0}", [remaining_qty])); } - let process_loss_qty = flt(remaining_qty) - flt(frm.doc.pending_qty); + const process_loss_qty = flt(remaining_qty) - flt(frm.doc.pending_qty); frm.doc.process_loss_qty = process_loss_qty >= 0 ? process_loss_qty : 0; refresh_field("process_loss_qty"); }, set_company_filters(frm, fieldname) { - frm.set_query(fieldname, () => { - return { - filters: { - company: frm.doc.company, - }, - }; - }); + frm.set_query(fieldname, () => ({ + filters: { company: frm.doc.company }, + })); }, make_fields_read_only(frm) { @@ -123,33 +93,29 @@ frappe.ui.form.on("Job Card", { }, setup_stock_entry(frm) { - if ( - frm.doc.track_semi_finished_goods && - frm.doc.docstatus === 1 && - !frm.doc.is_subcontracted && - (frm.doc.skip_material_transfer || frm.doc.transferred_qty > 0) && - flt(frm.doc.manufactured_qty) + flt(frm.doc.process_loss_qty) < flt(frm.doc.for_quantity) - ) { - frm.add_custom_button(__("Make Stock Entry"), () => { - frappe.confirm( - __("Do you want to submit the stock entry?"), - () => { - frm.events.make_manufacture_stock_entry(frm, 1); - }, - () => { - frm.events.make_manufacture_stock_entry(frm, 0); - } - ); - }).addClass("btn-primary"); - } + const { doc } = frm; + const can_make_stock_entry = + doc.track_semi_finished_goods && + doc.docstatus === 1 && + !doc.is_subcontracted && + (doc.skip_material_transfer || doc.transferred_qty > 0) && + flt(doc.manufactured_qty) + flt(doc.process_loss_qty) < flt(doc.for_quantity); + + if (!can_make_stock_entry) return; + + frm.add_custom_button(__("Make Stock Entry"), () => { + frappe.confirm( + __("Do you want to submit the stock entry?"), + () => frm.events.make_manufacture_stock_entry(frm, 1), + () => frm.events.make_manufacture_stock_entry(frm, 0) + ); + }).addClass("btn-primary"); }, make_manufacture_stock_entry(frm, submit_entry) { frm.call({ method: "make_stock_entry_for_semi_fg_item", - args: { - auto_submit: submit_entry, - }, + args: { auto_submit: submit_entry }, doc: frm.doc, freeze: true, callback() { @@ -158,162 +124,51 @@ frappe.ui.form.on("Job Card", { }); }, - refresh: function (frm) { - let has_items = frm.doc.items && frm.doc.items.length; + refresh(frm) { + const { doc } = frm; + const has_items = doc.items && doc.items.length; + frm.trigger("make_fields_read_only"); - if (!frm.is_new() && frm.doc.__onload?.work_order_closed) { + if (!frm.is_new() && doc.__onload?.work_order_closed) { frm.disable_save(); return; } - if (frm.doc.is_subcontracted) { + if (doc.is_subcontracted) { frm.trigger("make_subcontracting_po"); return; } - if (frm.doc.docstatus > 0) { + if (doc.docstatus > 0) { frm.set_df_property("pending_qty", "read_only", 1); } - let has_stock_entry = frm.doc.__onload && frm.doc.__onload.has_stock_entry ? true : false; - + const has_stock_entry = !!doc.__onload?.has_stock_entry; frm.toggle_enable("for_quantity", !has_stock_entry); - if (frm.doc.docstatus != 0) { + if (doc.docstatus != 0) { frm.fields_dict["time_logs"].grid.update_docfield_property("completed_qty", "read_only", 1); frm.fields_dict["time_logs"].grid.update_docfield_property("time_in_mins", "read_only", 1); } - if (!frm.is_new() && !frm.doc.skip_material_transfer && frm.doc.docstatus < 2) { - let to_request = frm.doc.for_quantity > frm.doc.transferred_qty; - let excess_transfer_allowed = frm.doc.__onload.job_card_excess_transfer; + frm.events.setup_material_transfer_buttons(frm, has_items); - if (has_items && (to_request || excess_transfer_allowed)) { - frm.add_custom_button( - __("Material Request"), - () => { - frm.trigger("make_material_request"); - }, - __("Create") - ); - } - - // check if any row has untransferred materials - // in case of multiple items in JC - let to_transfer = frm.doc.items.some((row) => row.transferred_qty < row.required_qty); - - if (has_items && (to_transfer || excess_transfer_allowed)) { - frm.add_custom_button( - __("Material Transfer"), - () => { - frm.trigger("make_stock_entry"); - }, - __("Create") - ); - } - } - - if (frm.doc.docstatus == 1 && !frm.doc.is_corrective_job_card && !frm.doc.finished_good) { + if (doc.docstatus == 1 && !doc.is_corrective_job_card && !doc.finished_good) { frm.trigger("setup_corrective_job_card"); } - frm.set_query("quality_inspection", function () { - return { - query: "erpnext.stock.doctype.quality_inspection.quality_inspection.quality_inspection_query", - filters: { - item_code: frm.doc.production_item, - reference_name: frm.doc.name, - }, - }; - }); + frm.set_query("quality_inspection", () => ({ + query: "erpnext.stock.doctype.quality_inspection.quality_inspection.quality_inspection_query", + filters: { + item_code: doc.production_item, + reference_name: doc.name, + }, + })); frm.trigger("toggle_operation_number"); - let is_timer_running = false; - - if ( - frm.doc.for_quantity + frm.doc.process_loss_qty > frm.doc.total_completed_qty && - (frm.doc.skip_material_transfer || - frm.doc.transferred_qty >= frm.doc.for_quantity + frm.doc.process_loss_qty || - !frm.doc.finished_good || - !has_items?.length) - ) { - let last_row = {}; - if ((frm.doc.sub_operations?.length || frm.doc.pending_qty > 0) && frm.doc.time_logs?.length) { - last_row = get_last_row(frm.doc.time_logs); - } - - if ( - (!frm.doc.time_logs?.length || - (flt(frm.doc.pending_qty) > 0.0 && last_row?.to_time) || - (frm.doc.sub_operations?.length && last_row?.to_time)) && - !frm.doc.is_paused - ) { - frm.add_custom_button(__("Start Job"), () => { - let from_time = frappe.datetime.now_datetime(); - if ((frm.doc.employee && !frm.doc.employee.length) || !frm.doc.employee) { - frappe.prompt( - { - fieldtype: "Table MultiSelect", - label: __("Select Employees"), - options: "Job Card Time Log", - fieldname: "employees", - reqd: 1, - filters: { - status: "Active", - }, - }, - (d) => { - frm.events.start_timer(frm, from_time, d.employees); - }, - __("Assign Job to Employee") - ); - } else { - frm.events.start_timer(frm, from_time, frm.doc.employee); - } - }); - } else if (frm.doc.is_paused) { - frm.add_custom_button(__("Resume Job"), () => { - frm.call({ - method: "resume_job", - doc: frm.doc, - args: { - start_time: frappe.datetime.now_datetime(), - }, - callback() { - frm.reload_doc(); - }, - }); - }); - } else { - let manufactured_qty = frm.doc.manufactured_qty || frm.doc.total_completed_qty; - if (frm.doc.for_quantity - (manufactured_qty + frm.doc.process_loss_qty) > 0) { - if (!frm.doc.is_paused) { - frm.add_custom_button(__("Pause Job"), () => { - frm.call({ - method: "pause_job", - doc: frm.doc, - args: { - end_time: frappe.datetime.now_datetime(), - }, - callback() { - frm.reload_doc(); - }, - }); - }); - } - - frm.add_custom_button(__("Complete Job"), () => { - frm.trigger("complete_job_card"); - }); - - is_timer_running = true; - } - - frm.trigger("make_dashboard"); - } - } + const is_timer_running = frm.events.setup_job_action_buttons(frm, has_items); if (!is_timer_running) { frm.trigger("setup_stock_entry"); @@ -321,33 +176,159 @@ frappe.ui.form.on("Job Card", { frm.trigger("setup_quality_inspection"); - if (frm.doc.work_order) { - frappe.db.get_value("Work Order", frm.doc.work_order, "transfer_material_against").then((r) => { - if (r.message.transfer_material_against == "Work Order" && !frm.doc.operation_row_id) { + if (doc.work_order) { + frappe.db.get_value("Work Order", doc.work_order, "transfer_material_against").then((r) => { + if (r.message.transfer_material_against == "Work Order" && !doc.operation_row_id) { frm.set_df_property("items", "hidden", 1); } }); } - let sbb_field = frm.get_docfield("serial_and_batch_bundle"); + const sbb_field = frm.get_docfield("serial_and_batch_bundle"); if (sbb_field) { - sbb_field.get_route_options_for_new_doc = () => { - return { - item_code: frm.doc.production_item, - warehouse: frm.doc.wip_warehouse, - voucher_type: frm.doc.doctype, - }; - }; + sbb_field.get_route_options_for_new_doc = () => ({ + item_code: doc.production_item, + warehouse: doc.wip_warehouse, + voucher_type: doc.doctype, + }); } }, + // Adds Material Request and Material Transfer buttons when items need to be transferred. + setup_material_transfer_buttons(frm, has_items) { + const { doc } = frm; + + if (frm.is_new() || doc.skip_material_transfer || doc.docstatus >= 2) return; + + const excess_transfer_allowed = doc.__onload.job_card_excess_transfer; + const to_request = doc.for_quantity > doc.transferred_qty; + + if (has_items && (to_request || excess_transfer_allowed)) { + frm.add_custom_button( + __("Material Request"), + () => frm.trigger("make_material_request"), + __("Create") + ); + } + + // check if any row has untransferred materials in case of multiple items in JC + const to_transfer = doc.items.some((row) => row.transferred_qty < row.required_qty); + + if (has_items && (to_transfer || excess_transfer_allowed)) { + frm.add_custom_button( + __("Material Transfer"), + () => frm.trigger("make_stock_entry"), + __("Create") + ); + } + }, + + // Renders the correct action button (Start / Resume / Pause + Complete) based on job state. + // Returns true if the job timer is actively running, so the caller can skip the stock entry button. + setup_job_action_buttons(frm, has_items) { + const { doc } = frm; + + const has_remaining_qty = doc.for_quantity + doc.process_loss_qty > doc.total_completed_qty; + const materials_ready = + doc.skip_material_transfer || + doc.transferred_qty >= doc.for_quantity + doc.process_loss_qty || + !doc.finished_good || + !has_items?.length; + + if (!has_remaining_qty || !materials_ready) return false; + + let last_row = {}; + const has_sub_ops_or_pending_qty = doc.sub_operations?.length || doc.pending_qty > 0; + if (has_sub_ops_or_pending_qty && doc.time_logs?.length) { + last_row = get_last_row(doc.time_logs); + } + + const no_time_logs_yet = !doc.time_logs?.length; + const pending_qty_cycle_done = flt(doc.pending_qty) > 0.0 && last_row?.to_time; + const sub_operation_cycle_done = doc.sub_operations?.length && last_row?.to_time; + const should_show_start = + (no_time_logs_yet || pending_qty_cycle_done || sub_operation_cycle_done) && !doc.is_paused; + + if (should_show_start) { + frm.events.add_start_job_button(frm); + return false; + } + + if (doc.is_paused) { + frm.add_custom_button(__("Resume Job"), () => { + frm.call({ + method: "resume_job", + doc: frm.doc, + args: { start_time: frappe.datetime.now_datetime() }, + callback() { + frm.reload_doc(); + }, + }); + }); + return false; + } + + // Job is actively running — show Pause and Complete buttons. + const manufactured_qty = doc.manufactured_qty || doc.total_completed_qty; + const qty_yet_to_manufacture = doc.for_quantity - (manufactured_qty + doc.process_loss_qty); + + if (qty_yet_to_manufacture > 0) { + if (!doc.is_paused) { + frm.add_custom_button(__("Pause Job"), () => { + frm.call({ + method: "pause_job", + doc: frm.doc, + args: { end_time: frappe.datetime.now_datetime() }, + callback() { + frm.reload_doc(); + }, + }); + }); + } + + frm.add_custom_button(__("Complete Job"), () => { + frm.trigger("complete_job_card"); + }); + + frm.trigger("make_dashboard"); + return true; + } + + frm.trigger("make_dashboard"); + return false; + }, + + add_start_job_button(frm) { + frm.add_custom_button(__("Start Job"), () => { + const from_time = frappe.datetime.now_datetime(); + const has_no_employee = (frm.doc.employee && !frm.doc.employee.length) || !frm.doc.employee; + + if (has_no_employee) { + frappe.prompt( + { + fieldtype: "Table MultiSelect", + label: __("Select Employees"), + options: "Job Card Time Log", + fieldname: "employees", + reqd: 1, + filters: { status: "Active" }, + }, + (d) => frm.events.start_timer(frm, from_time, d.employees), + __("Assign Job to Employee") + ); + } else { + frm.events.start_timer(frm, from_time, frm.doc.employee); + } + }); + }, + complete_job_card(frm) { let pending_qty = frm.doc.for_quantity - frm.doc.total_completed_qty; if (frm.doc.pending_qty > 0) { pending_qty = frm.doc.pending_qty; } - let fields = [ + const fields = [ { fieldtype: "Float", label: __("Qty to Manufacture"), @@ -355,10 +336,9 @@ frappe.ui.form.on("Job Card", { reqd: 1, default: pending_qty, change() { - let doc = frm.job_completion_dialog; - - doc.set_value("completed_qty", doc.get_value("for_quantity")); - doc.set_value("process_loss_qty", 0); + const dialog = frm.job_completion_dialog; + dialog.set_value("completed_qty", dialog.get_value("for_quantity")); + dialog.set_value("process_loss_qty", 0); }, }, { @@ -368,11 +348,10 @@ frappe.ui.form.on("Job Card", { reqd: 1, default: pending_qty, change() { - let doc = frm.job_completion_dialog; - - let pending_qty = doc.get_value("for_quantity") - doc.get_value("completed_qty"); - if (pending_qty > 0 && pending_qty != doc.get_value("pending_qty")) { - doc.set_value("pending_qty", pending_qty); + const dialog = frm.job_completion_dialog; + const remaining = dialog.get_value("for_quantity") - dialog.get_value("completed_qty"); + if (remaining > 0 && remaining != dialog.get_value("pending_qty")) { + dialog.set_value("pending_qty", remaining); } }, }, @@ -382,14 +361,13 @@ frappe.ui.form.on("Job Card", { fieldname: "pending_qty", default: 0.0, change() { - let doc = frm.job_completion_dialog; - - let process_loss_qty = - doc.get_value("for_quantity") - - doc.get_value("completed_qty") - - doc.get_value("pending_qty"); - if (process_loss_qty >= 0 && process_loss_qty != doc.get_value("process_loss_qty")) { - doc.set_value("process_loss_qty", process_loss_qty); + const dialog = frm.job_completion_dialog; + const process_loss_qty = + dialog.get_value("for_quantity") - + dialog.get_value("completed_qty") - + dialog.get_value("pending_qty"); + if (process_loss_qty >= 0 && process_loss_qty != dialog.get_value("process_loss_qty")) { + dialog.set_value("process_loss_qty", process_loss_qty); } }, }, @@ -398,14 +376,13 @@ frappe.ui.form.on("Job Card", { label: __("Process Loss Quantity"), fieldname: "process_loss_qty", onchange() { - let doc = frm.job_completion_dialog; - - let pending_qty = - doc.get_value("for_quantity") - - doc.get_value("completed_qty") - - doc.get_value("process_loss_qty"); - if (pending_qty >= 0 && pending_qty != doc.get_value("pending_qty")) { - doc.set_value("pending_qty", pending_qty); + const dialog = frm.job_completion_dialog; + const remaining = + dialog.get_value("for_quantity") - + dialog.get_value("completed_qty") - + dialog.get_value("process_loss_qty"); + if (remaining >= 0 && remaining != dialog.get_value("pending_qty")) { + dialog.set_value("pending_qty", remaining); } }, }, @@ -421,20 +398,16 @@ frappe.ui.form.on("Job Card", { fieldname: "sub_operation", options: "Operation", get_query() { - let non_completed_operations = frm.doc.sub_operations.filter( - (d) => d.status === "Pending" - ); + const non_completed = frm.doc.sub_operations.filter((d) => d.status === "Pending"); return { - filters: { - name: ["in", non_completed_operations.map((d) => d.sub_operation)], - }, + filters: { name: ["in", non_completed.map((d) => d.sub_operation)] }, }; }, reqd: 1, }); } - let last_completed_row = get_last_completed_row(frm.doc.time_logs); + const last_completed_row = get_last_completed_row(frm.doc.time_logs); let last_row = {}; if (frm.doc.sub_operations?.length && frm.doc.time_logs?.length) { last_row = get_last_row(frm.doc.time_logs); @@ -467,7 +440,7 @@ frappe.ui.form.on("Job Card", { end_time: data.end_time, sub_operation: data.sub_operation, }, - callback: function (r) { + callback() { frm.reload_doc(); }, }); @@ -493,11 +466,8 @@ frappe.ui.form.on("Job Card", { frm.call({ method: "start_timer", doc: frm.doc, - args: { - start_time: start_time, - employees: employees, - }, - callback: function (r) { + args: { start_time, employees }, + callback() { frm.reload_doc(); frm.trigger("make_dashboard"); }, @@ -505,7 +475,7 @@ frappe.ui.form.on("Job Card", { }, make_finished_good(frm) { - let fields = [ + const fields = [ { fieldtype: "Float", label: __("Completed Quantity"), @@ -531,12 +501,9 @@ frappe.ui.form.on("Job Card", { frm.call({ method: "make_finished_good", doc: frm.doc, - args: { - qty: data.qty, - end_time: data.end_time, - }, - callback: function (r) { - var doc = frappe.model.sync(r.message); + args: { qty: data.qty, end_time: data.end_time }, + callback(r) { + const doc = frappe.model.sync(r.message); frappe.set_route("Form", doc[0].doctype, doc[0].name); }, }); @@ -547,8 +514,8 @@ frappe.ui.form.on("Job Card", { ); }, - setup_quality_inspection: function (frm) { - let quality_inspection_field = frm.get_docfield("quality_inspection"); + setup_quality_inspection(frm) { + const quality_inspection_field = frm.get_docfield("quality_inspection"); quality_inspection_field.get_route_options_for_new_doc = function (frm) { return { inspection_type: "In Process", @@ -563,24 +530,22 @@ frappe.ui.form.on("Job Card", { }; }, - setup_corrective_job_card: function (frm) { + setup_corrective_job_card(frm) { frm.add_custom_button( __("Corrective Job Card"), () => { - let operations = frm.doc.sub_operations.map((d) => d.sub_operation).concat(frm.doc.operation); + const operations = frm.doc.sub_operations + .map((d) => d.sub_operation) + .concat(frm.doc.operation); - let fields = [ + const fields = [ { fieldtype: "Link", label: __("Corrective Operation"), options: "Operation", fieldname: "operation", get_query() { - return { - filters: { - is_corrective_operation: 1, - }, - }; + return { filters: { is_corrective_operation: 1 } }; }, }, { @@ -589,20 +554,14 @@ frappe.ui.form.on("Job Card", { options: "Operation", fieldname: "for_operation", get_query() { - return { - filters: { - name: ["in", operations], - }, - }; + return { filters: { name: ["in", operations] } }; }, }, ]; frappe.prompt( fields, - (d) => { - frm.events.make_corrective_job_card(frm, d.operation, d.for_operation); - }, + (d) => frm.events.make_corrective_job_card(frm, d.operation, d.for_operation), __("Select Corrective Operation") ); }, @@ -610,7 +569,7 @@ frappe.ui.form.on("Job Card", { ); }, - make_corrective_job_card: function (frm, operation, for_operation) { + make_corrective_job_card(frm, operation, for_operation) { frappe.call({ method: "erpnext.manufacturing.doctype.job_card.job_card.make_corrective_job_card", args: { @@ -618,7 +577,7 @@ frappe.ui.form.on("Job Card", { operation: operation, for_operation: for_operation, }, - callback: function (r) { + callback(r) { if (r.message) { frappe.model.sync(r.message); frappe.set_route("Form", r.message.doctype, r.message.name); @@ -627,7 +586,7 @@ frappe.ui.form.on("Job Card", { }); }, - operation: function (frm) { + operation(frm) { frm.trigger("toggle_operation_number"); if (frm.doc.operation && frm.doc.work_order) { @@ -637,28 +596,22 @@ frappe.ui.form.on("Job Card", { work_order: frm.doc.work_order, operation: frm.doc.operation, }, - callback: function (r) { - if (r.message) { - if (r.message.length == 1) { - frm.set_value("operation_id", r.message[0].name); - } else { - let args = []; + callback(r) { + if (!r.message) return; - r.message.forEach((row) => { - args.push({ label: row.idx, value: row.name }); - }); - - let description = __("Operation {0} added multiple times in the work order {1}", [ - frm.doc.operation, - frm.doc.work_order, - ]); - - frm.set_df_property("operation_row_number", "options", args); - frm.set_df_property("operation_row_number", "description", description); - } - - frm.trigger("toggle_operation_number"); + if (r.message.length == 1) { + frm.set_value("operation_id", r.message[0].name); + } else { + const args = r.message.map((row) => ({ label: row.idx, value: row.name })); + const description = __("Operation {0} added multiple times in the work order {1}", [ + frm.doc.operation, + frm.doc.work_order, + ]); + frm.set_df_property("operation_row_number", "options", args); + frm.set_df_property("operation_row_number", "description", description); } + + frm.trigger("toggle_operation_number"); }, }); } @@ -675,65 +628,35 @@ frappe.ui.form.on("Job Card", { frm.toggle_reqd("operation_row_number", !frm.doc.operation_id && frm.doc.operation); }, - make_time_log: function (frm, args) { + make_time_log(frm, args) { frm.events.update_sub_operation(frm, args); frappe.call({ method: "erpnext.manufacturing.doctype.job_card.job_card.make_time_log", - args: { - args: args, - }, + args: { args }, freeze: true, - callback: function () { + callback() { frm.reload_doc(); frm.trigger("make_dashboard"); }, }); }, - update_sub_operation: function (frm, args) { - if (frm.doc.sub_operations && frm.doc.sub_operations.length) { - let sub_operations = frm.doc.sub_operations.filter((d) => d.status != "Complete"); - if (sub_operations && sub_operations.length) { - args["sub_operation"] = sub_operations[0].sub_operation; + update_sub_operation(frm, args) { + if (frm.doc.sub_operations?.length) { + const pending_sub_ops = frm.doc.sub_operations.filter((d) => d.status != "Complete"); + if (pending_sub_ops.length) { + args["sub_operation"] = pending_sub_ops[0].sub_operation; } } }, - make_dashboard: function (frm) { + make_dashboard(frm) { if (frm.doc.__islocal) return; - var section = ""; - - function setCurrentIncrement() { - currentIncrement += 1; - return currentIncrement; - } - - function updateStopwatch(increment) { - var hours = Math.floor(increment / 3600); - var minutes = Math.floor((increment - hours * 3600) / 60); - var seconds = Math.floor(flt(increment - hours * 3600 - minutes * 60, 2)); - - $(section) - .find(".hours") - .text(hours < 10 ? "0" + hours.toString() : hours.toString()); - $(section) - .find(".minutes") - .text(minutes < 10 ? "0" + minutes.toString() : minutes.toString()); - $(section) - .find(".seconds") - .text(seconds < 10 ? "0" + seconds.toString() : seconds.toString()); - } - - function initialiseTimer() { - const interval = setInterval(function () { - var current = setCurrentIncrement(); - updateStopwatch(current); - }, 1000); - } frm.dashboard.refresh(); - const timer = ` + + const timer_html = `
00 @@ -743,20 +666,44 @@ frappe.ui.form.on("Job Card", { 00
`; + let section; if (frappe.utils.is_xs()) { - frm.dashboard.add_comment(timer, "white", true); + frm.dashboard.add_comment(timer_html, "white", true); section = frm.layout.wrapper.find(".form-message-container"); } else { - section = frm.toolbar.page.add_inner_message(timer); + section = frm.toolbar.page.add_inner_message(timer_html); } - let currentIncrement = frm.events.get_current_time(frm); - if (frm.doc.time_logs?.length && frm.doc.time_logs[cint(frm.doc.time_logs.length) - 1].to_time) { - updateStopwatch(currentIncrement); - } else if (frm.doc.status == "On Hold") { - updateStopwatch(currentIncrement); + const pad = (n) => String(n).padStart(2, "0"); + + const update_stopwatch = (increment) => { + const hours = Math.floor(increment / 3600); + const minutes = Math.floor((increment - hours * 3600) / 60); + const seconds = Math.floor(flt(increment - hours * 3600 - minutes * 60, 2)); + + section.find(".hours").text(pad(hours)); + section.find(".minutes").text(pad(minutes)); + section.find(".seconds").text(pad(seconds)); + }; + + let current_increment = frm.events.get_current_time(frm); + + const start_timer = () => { + setInterval(() => { + current_increment += 1; + update_stopwatch(current_increment); + }, 1000); + }; + + const { time_logs, status } = frm.doc; + const last_log_complete = time_logs?.length && time_logs[cint(time_logs.length) - 1].to_time; + + if (last_log_complete) { + update_stopwatch(current_increment); + } else if (status == "On Hold") { + update_stopwatch(current_increment); } else { - initialiseTimer(); + start_timer(); } }, @@ -778,22 +725,22 @@ frappe.ui.form.on("Job Card", { return current_time; }, - hide_timer: function (frm) { + hide_timer(frm) { frm.toolbar.page.inner_toolbar.find(".stopwatch").remove(); }, - for_quantity: function (frm) { + for_quantity(frm) { frm.doc.items = []; frm.call({ method: "get_required_items", doc: frm.doc, - callback: function () { + callback() { refresh_field("items"); }, }); }, - make_material_request: function (frm) { + make_material_request(frm) { frappe.model.open_mapped_doc({ method: "erpnext.manufacturing.doctype.job_card.job_card.make_material_request", frm: frm, @@ -801,7 +748,7 @@ frappe.ui.form.on("Job Card", { }); }, - make_stock_entry: function (frm) { + make_stock_entry(frm) { frappe.model.open_mapped_doc({ method: "erpnext.manufacturing.doctype.job_card.job_card.make_stock_entry", frm: frm, @@ -809,11 +756,11 @@ frappe.ui.form.on("Job Card", { }); }, - timer: function (frm) { + timer(frm) { return ``; }, - set_total_completed_qty: function (frm) { + set_total_completed_qty(frm) { frm.doc.total_completed_qty = 0; frm.doc.time_logs.forEach((d) => { if (d.completed_qty) { @@ -822,10 +769,9 @@ frappe.ui.form.on("Job Card", { }); if (frm.doc.total_completed_qty && frm.doc.for_quantity > frm.doc.total_completed_qty) { - let flt_precision = precision("for_quantity", frm.doc); - let process_loss_qty = + const flt_precision = precision("for_quantity", frm.doc); + const process_loss_qty = flt(frm.doc.for_quantity, flt_precision) - flt(frm.doc.total_completed_qty, flt_precision); - frm.set_value("process_loss_qty", process_loss_qty); } @@ -842,8 +788,8 @@ frappe.ui.form.on("Job Card", { }); frappe.ui.form.on("Job Card Time Log", { - completed_qty: function (frm, cdt, cdn) { - let row = locals[cdt][cdn]; + completed_qty(frm, cdt, cdn) { + const row = locals[cdt][cdn]; if (!row.completed_qty) { frappe.model.set_value(row.doctype, row.name, { time_in_mins: 0, @@ -860,12 +806,8 @@ function get_seconds_diff(d1, d2) { } function get_last_completed_row(time_logs) { - let completed_rows = time_logs.filter((d) => d.to_time); - - if (completed_rows?.length) { - let last_completed_row = completed_rows[completed_rows.length - 1]; - return last_completed_row; - } + const completed_rows = time_logs.filter((d) => d.to_time); + return completed_rows[completed_rows.length - 1]; } function get_last_row(time_logs) { From 1be92f6d05ef3bb5416f61ba433fc6ecda52f2ce Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 20 May 2026 23:18:20 +0530 Subject: [PATCH 070/249] refactor: better timer and complete button --- .../doctype/job_card/job_card.js | 344 +++++++++++------- .../doctype/job_card/job_card.json | 48 ++- .../doctype/job_card/job_card.py | 9 + 3 files changed, 254 insertions(+), 147 deletions(-) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.js b/erpnext/manufacturing/doctype/job_card/job_card.js index 0dc483f9ea6..140733353f4 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.js +++ b/erpnext/manufacturing/doctype/job_card/job_card.js @@ -128,6 +128,12 @@ frappe.ui.form.on("Job Card", { const { doc } = frm; const has_items = doc.items && doc.items.length; + // Clear any running timer tick from a previous render. + if (frm._jcd_timer_interval) { + clearInterval(frm._jcd_timer_interval); + frm._jcd_timer_interval = null; + } + frm.trigger("make_fields_read_only"); if (!frm.is_new() && doc.__onload?.work_order_closed) { @@ -223,103 +229,10 @@ frappe.ui.form.on("Job Card", { } }, - // Renders the correct action button (Start / Resume / Pause + Complete) based on job state. + // Renders the dashboard widget (info + timer + action buttons) into job_card_dashboard wrapper. // Returns true if the job timer is actively running, so the caller can skip the stock entry button. setup_job_action_buttons(frm, has_items) { - const { doc } = frm; - - const has_remaining_qty = doc.for_quantity + doc.process_loss_qty > doc.total_completed_qty; - const materials_ready = - doc.skip_material_transfer || - doc.transferred_qty >= doc.for_quantity + doc.process_loss_qty || - !doc.finished_good || - !has_items?.length; - - if (!has_remaining_qty || !materials_ready) return false; - - let last_row = {}; - const has_sub_ops_or_pending_qty = doc.sub_operations?.length || doc.pending_qty > 0; - if (has_sub_ops_or_pending_qty && doc.time_logs?.length) { - last_row = get_last_row(doc.time_logs); - } - - const no_time_logs_yet = !doc.time_logs?.length; - const pending_qty_cycle_done = flt(doc.pending_qty) > 0.0 && last_row?.to_time; - const sub_operation_cycle_done = doc.sub_operations?.length && last_row?.to_time; - const should_show_start = - (no_time_logs_yet || pending_qty_cycle_done || sub_operation_cycle_done) && !doc.is_paused; - - if (should_show_start) { - frm.events.add_start_job_button(frm); - return false; - } - - if (doc.is_paused) { - frm.add_custom_button(__("Resume Job"), () => { - frm.call({ - method: "resume_job", - doc: frm.doc, - args: { start_time: frappe.datetime.now_datetime() }, - callback() { - frm.reload_doc(); - }, - }); - }); - return false; - } - - // Job is actively running — show Pause and Complete buttons. - const manufactured_qty = doc.manufactured_qty || doc.total_completed_qty; - const qty_yet_to_manufacture = doc.for_quantity - (manufactured_qty + doc.process_loss_qty); - - if (qty_yet_to_manufacture > 0) { - if (!doc.is_paused) { - frm.add_custom_button(__("Pause Job"), () => { - frm.call({ - method: "pause_job", - doc: frm.doc, - args: { end_time: frappe.datetime.now_datetime() }, - callback() { - frm.reload_doc(); - }, - }); - }); - } - - frm.add_custom_button(__("Complete Job"), () => { - frm.trigger("complete_job_card"); - }); - - frm.trigger("make_dashboard"); - return true; - } - - frm.trigger("make_dashboard"); - return false; - }, - - add_start_job_button(frm) { - frm.add_custom_button(__("Start Job"), () => { - const from_time = frappe.datetime.now_datetime(); - const has_no_employee = (frm.doc.employee && !frm.doc.employee.length) || !frm.doc.employee; - - if (has_no_employee) { - frappe.prompt( - { - fieldtype: "Table MultiSelect", - label: __("Select Employees"), - options: "Job Card Time Log", - fieldname: "employees", - reqd: 1, - filters: { status: "Active" }, - }, - (d) => frm.events.start_timer(frm, from_time, d.employees), - __("Assign Job to Employee") - ); - } else { - frm.events.start_timer(frm, from_time, frm.doc.employee); - } - }); + return frm.events.make_dashboard(frm, has_items); }, complete_job_card(frm) { @@ -469,7 +382,6 @@ frappe.ui.form.on("Job Card", { args: { start_time, employees }, callback() { frm.reload_doc(); - frm.trigger("make_dashboard"); }, }); }, @@ -651,60 +563,210 @@ frappe.ui.form.on("Job Card", { } }, - make_dashboard(frm) { - if (frm.doc.__islocal) return; + make_dashboard(frm, has_items) { + if (frm.doc.__islocal) return false; frm.dashboard.refresh(); - const timer_html = ` -
- 00 - : - 00 - : - 00 -
`; - - let section; - if (frappe.utils.is_xs()) { - frm.dashboard.add_comment(timer_html, "white", true); - section = frm.layout.wrapper.find(".form-message-container"); - } else { - section = frm.toolbar.page.add_inner_message(timer_html); + // Clear any previously running timer tick before re-rendering. + if (frm._jcd_timer_interval) { + clearInterval(frm._jcd_timer_interval); + frm._jcd_timer_interval = null; } + const wrapper = $(frm.fields_dict["job_card_dashboard"].wrapper); + wrapper.empty(); + + const { doc } = frm; + const { time_logs, status } = doc; + + // ── Determine which action buttons to show ──────────────────────── + const has_remaining_qty = doc.for_quantity + doc.process_loss_qty > doc.total_completed_qty; + const materials_ready = + doc.skip_material_transfer || + doc.transferred_qty >= doc.for_quantity + doc.process_loss_qty || + !doc.finished_good || + !has_items?.length; + + let last_row = {}; + const has_sub_ops_or_pending_qty = doc.sub_operations?.length || doc.pending_qty > 0; + if (has_sub_ops_or_pending_qty && time_logs?.length) { + last_row = get_last_row(time_logs); + } + + const no_time_logs_yet = !time_logs?.length; + const pending_qty_cycle_done = flt(doc.pending_qty) > 0.0 && last_row?.to_time; + const sub_operation_cycle_done = doc.sub_operations?.length && last_row?.to_time; + const should_show_start = + (no_time_logs_yet || pending_qty_cycle_done || sub_operation_cycle_done) && !doc.is_paused; + + const last_log_complete = time_logs?.length && time_logs[time_logs.length - 1].to_time; + const is_on_hold = status === "On Hold"; + const is_actively_running = !!( + time_logs?.length && + !last_log_complete && + !is_on_hold && + !doc.is_paused + ); + + let show_start = false, + show_pause = false, + show_resume = false, + show_complete = false, + is_timer_running = false; + + if (has_remaining_qty && materials_ready) { + const manufactured_qty = doc.manufactured_qty || doc.total_completed_qty; + const qty_yet_to_manufacture = doc.for_quantity - (manufactured_qty + doc.process_loss_qty); + + if (should_show_start) { + show_start = true; + } else if (doc.is_paused) { + show_resume = true; + } else if (qty_yet_to_manufacture > 0) { + show_pause = true; + show_complete = true; + is_timer_running = true; + } + } + + // ── Timer color reflects job state ──────────────────────────────── + const [timer_color, timer_bg, timer_border] = [ + "var(--gray-600,#6b7280)", + "var(--gray-100,#f3f4f6)", + "var(--gray-300,#d1d5db)", + ]; + + // ── Action button HTML ──────────────────────────────────────────── + const btn = (cls, icon_path, label, icon_color) => ` + `; + + const icons = { + play: { d: '', fill: "currentColor", stroke: "none" }, + pause: { + d: '', + fill: "currentColor", + stroke: "none", + }, + check: { d: '', sw: 3 }, + }; + + const buttons_html = [ + show_start && btn("btn-default jcd-btn-start", "play", __("Start Job")), + show_resume && btn("btn-default jcd-btn-resume", "play", __("Resume Job")), + show_pause && btn("btn-default jcd-btn-pause", "pause", __("Pause Job")), + show_complete && btn("btn-success jcd-btn-complete", "check", __("Complete Job"), "white"), + ] + .filter(Boolean) + .join(""); + + // ── Render widget ───────────────────────────────────────────────── + wrapper.append(` +
+
+
+
+ ${__("Elapsed Time")} +
+
+ ${frappe.utils.icon("clock-4", "md", "", "", "", "", timer_color)} + + 00:00:00 + +
+
+
+ ${buttons_html} +
+
+
`); + + // ── Wire up button click handlers ───────────────────────────────── + if (show_start) { + wrapper.find(".jcd-btn-start").on("click", () => { + const from_time = frappe.datetime.now_datetime(); + const has_no_employee = !frm.doc.employee || !frm.doc.employee.length; + + if (has_no_employee) { + frappe.prompt( + { + fieldtype: "Table MultiSelect", + label: __("Select Employees"), + options: "Job Card Time Log", + fieldname: "employees", + reqd: 1, + filters: { status: "Active" }, + }, + (d) => frm.events.start_timer(frm, from_time, d.employees), + __("Assign Job to Employee") + ); + } else { + frm.events.start_timer(frm, from_time, frm.doc.employee); + } + }); + } + + if (show_resume) { + wrapper.find(".jcd-btn-resume").on("click", () => { + frm.call({ + method: "resume_job", + doc: frm.doc, + args: { start_time: frappe.datetime.now_datetime() }, + callback() { + frm.reload_doc(); + }, + }); + }); + } + + if (show_pause) { + wrapper.find(".jcd-btn-pause").on("click", () => { + frm.call({ + method: "pause_job", + doc: frm.doc, + args: { end_time: frappe.datetime.now_datetime() }, + callback() { + frm.reload_doc(); + }, + }); + }); + } + + if (show_complete) { + wrapper.find(".jcd-btn-complete").on("click", () => { + frm.trigger("complete_job_card"); + }); + } + + // ── Timer tick ──────────────────────────────────────────────────── + const timer_el = wrapper.find(".jcd-stopwatch"); const pad = (n) => String(n).padStart(2, "0"); - - const update_stopwatch = (increment) => { - const hours = Math.floor(increment / 3600); - const minutes = Math.floor((increment - hours * 3600) / 60); - const seconds = Math.floor(flt(increment - hours * 3600 - minutes * 60, 2)); - - section.find(".hours").text(pad(hours)); - section.find(".minutes").text(pad(minutes)); - section.find(".seconds").text(pad(seconds)); + const update_stopwatch = (secs) => { + const h = Math.floor(secs / 3600); + const m = Math.floor((secs % 3600) / 60); + const s = Math.floor(secs % 60); + timer_el.text(`${pad(h)}:${pad(m)}:${pad(s)}`); }; let current_increment = frm.events.get_current_time(frm); + update_stopwatch(current_increment); - const start_timer = () => { - setInterval(() => { + if (is_actively_running) { + frm._jcd_timer_interval = setInterval(() => { current_increment += 1; update_stopwatch(current_increment); }, 1000); - }; - - const { time_logs, status } = frm.doc; - const last_log_complete = time_logs?.length && time_logs[cint(time_logs.length) - 1].to_time; - - if (last_log_complete) { - update_stopwatch(current_increment); - } else if (status == "On Hold") { - update_stopwatch(current_increment); - } else { - start_timer(); } + + return is_timer_running; }, get_current_time(frm) { @@ -726,7 +788,11 @@ frappe.ui.form.on("Job Card", { }, hide_timer(frm) { - frm.toolbar.page.inner_toolbar.find(".stopwatch").remove(); + if (frm._jcd_timer_interval) { + clearInterval(frm._jcd_timer_interval); + frm._jcd_timer_interval = null; + } + $(frm.fields_dict["job_card_dashboard"].wrapper).empty(); }, for_quantity(frm) { @@ -756,10 +822,6 @@ frappe.ui.form.on("Job Card", { }); }, - timer(frm) { - return ``; - }, - set_total_completed_qty(frm) { frm.doc.total_completed_qty = 0; frm.doc.time_logs.forEach((d) => { diff --git a/erpnext/manufacturing/doctype/job_card/job_card.json b/erpnext/manufacturing/doctype/job_card/job_card.json index b9236d2ba00..69a156009b1 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.json +++ b/erpnext/manufacturing/doctype/job_card/job_card.json @@ -7,20 +7,26 @@ "editable_grid": 1, "engine": "InnoDB", "field_order": [ + "section_break_smqo", + "job_card_dashboard", + "section_break_fsba", + "work_order", + "column_break_uqjq", + "production_item", + "column_break_qrpg", + "for_quantity", + "column_break_yecz", + "bom_no", + "section_break_oisd", "company", "naming_series", - "production_item", - "employee", "column_break_4", "posting_date", - "work_order", - "bom_no", "semi_finished_good__finished_good_section", "finished_good", "column_break_mcnb", "semi_fg_bom", "section_break_folk", - "for_quantity", "pending_qty", "column_break_cyjw", "process_loss_qty", @@ -39,6 +45,7 @@ "workstation_type", "workstation", "target_warehouse", + "employee", "section_break_8", "items", "quality_inspection_section", @@ -654,12 +661,41 @@ { "fieldname": "column_break_lgte", "fieldtype": "Column Break" + }, + { + "fieldname": "job_card_dashboard", + "fieldtype": "HTML" + }, + { + "fieldname": "section_break_oisd", + "fieldtype": "Section Break" + }, + { + "fieldname": "column_break_uqjq", + "fieldtype": "Column Break" + }, + { + "fieldname": "column_break_qrpg", + "fieldtype": "Column Break" + }, + { + "fieldname": "column_break_yecz", + "fieldtype": "Column Break" + }, + { + "fieldname": "section_break_smqo", + "fieldtype": "Section Break", + "hide_border": 1 + }, + { + "fieldname": "section_break_fsba", + "fieldtype": "Section Break" } ], "grid_page_length": 50, "is_submittable": 1, "links": [], - "modified": "2026-05-20 14:05:46.205365", + "modified": "2026-05-21 18:37:05.688342", "modified_by": "Administrator", "module": "Manufacturing", "name": "Job Card", diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py index 3de801a5f86..0c2905eac5a 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.py +++ b/erpnext/manufacturing/doctype/job_card/job_card.py @@ -1454,6 +1454,15 @@ class JobCard(Document): if isinstance(kwargs, dict): kwargs = frappe._dict(kwargs) + if flt(kwargs.pending_qty) and flt(kwargs.pending_qty) < 0: + frappe.throw(_("Pending quantity cannot be negative.")) + + if flt(kwargs.process_loss_qty) and flt(kwargs.process_loss_qty) < 0: + frappe.throw(_("Process loss quantity cannot be negative.")) + + if flt(kwargs.pending_qty) and flt(kwargs.pending_qty) > self.for_quantity: + frappe.throw(_("Pending quantity cannot be greater than the for quantity.")) + self.pending_qty = flt(kwargs.pending_qty) self.process_loss_qty = flt(kwargs.process_loss_qty) From bb5d4d8682fce72670a0cfe99b2877720cb9f403 Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Sat, 21 Mar 2026 07:25:53 +0000 Subject: [PATCH 071/249] feat(company): add Stock Delivered But Not Billed account configuration --- .../verified/in_standard_chart_of_accounts.json | 4 ++++ erpnext/setup/doctype/company/company.js | 4 ++++ erpnext/setup/doctype/company/company.json | 17 +++++++++++++++++ erpnext/setup/doctype/company/company.py | 4 ++++ erpnext/setup/doctype/company/test_company.py | 1 + 5 files changed, 30 insertions(+) diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json index 496cf4599b3..4a2584ae1b9 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/in_standard_chart_of_accounts.json @@ -223,6 +223,10 @@ "Stock Received But Not Billed": { "account_type": "Stock Received But Not Billed", "account_category": "Trade Payables" + }, + "Stock Delivered But Not Billed": { + "account_type": "Stock Delivered But Not Billed", + "account_category": "Trade Payables" } }, "Duties and Taxes": { diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js index bc700044f63..66acff63c0d 100644 --- a/erpnext/setup/doctype/company/company.js +++ b/erpnext/setup/doctype/company/company.js @@ -336,6 +336,10 @@ erpnext.company.setup_queries = function (frm) { "stock_received_but_not_billed", { root_type: "Liability", account_type: "Stock Received But Not Billed" }, ], + [ + "stock_delivered_but_not_billed", + { root_type: "Liability", account_type: "Stock Delivered But Not Billed" }, + ], [ "service_received_but_not_billed", { root_type: "Liability", account_type: "Service Received But Not Billed" }, diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json index d8c3c227f64..49f61238839 100644 --- a/erpnext/setup/doctype/company/company.json +++ b/erpnext/setup/doctype/company/company.json @@ -130,6 +130,8 @@ "column_break_32", "stock_adjustment_account", "stock_received_but_not_billed", + "stock_delivered_but_not_billed", + "disable_sdbnb_in_sr", "default_provisional_account", "default_in_transit_warehouse", "manufacturing_section", @@ -979,6 +981,21 @@ { "fieldname": "column_break_zqmp", "fieldtype": "Column Break" + }, + { + "default": "0", + "fieldname": "disable_sdbnb_in_sr", + "fieldtype": "Check", + "label": "Disable Stock Delivered But Not Billed in Sales Return", + "no_copy": 1 + }, + { + "fieldname": "stock_delivered_but_not_billed", + "fieldtype": "Link", + "ignore_user_permissions": 1, + "label": "Stock Delivered But Not Billed", + "no_copy": 1, + "options": "Account" } ], "grid_page_length": 50, diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index 44c87099e82..8e4071de24b 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -88,6 +88,7 @@ class Company(NestedSet): default_wip_warehouse: DF.Link | None depreciation_cost_center: DF.Link | None depreciation_expense_account: DF.Link | None + disable_sdbnb_in_sr: DF.Check disposal_account: DF.Link | None domain: DF.Data | None email: DF.Data | None @@ -122,6 +123,7 @@ class Company(NestedSet): series_for_depreciation_entry: DF.Data | None service_expense_account: DF.Link | None stock_adjustment_account: DF.Link | None + stock_delivered_but_not_billed: DF.Link | None stock_received_but_not_billed: DF.Link | None submit_err_jv: DF.Check tax_id: DF.Data | None @@ -251,6 +253,7 @@ class Company(NestedSet): ["Default Expense Account", "default_expense_account"], ["Default Income Account", "default_income_account"], ["Stock Received But Not Billed Account", "stock_received_but_not_billed"], + ["Stock Delivered But Not Billed Account", "stock_delivered_but_not_billed"], ["Stock Adjustment Account", "stock_adjustment_account"], ["Write Off Account", "write_off_account"], ["Default Payment Discount Account", "default_discount_account"], @@ -632,6 +635,7 @@ class Company(NestedSet): default_accounts.update( { "stock_received_but_not_billed": "Stock Received But Not Billed", + "stock_delivered_but_not_billed": "Stock Delivered But Not Billed", "default_inventory_account": "Stock", "stock_adjustment_account": "Stock Adjustment", } diff --git a/erpnext/setup/doctype/company/test_company.py b/erpnext/setup/doctype/company/test_company.py index db4e8c07482..566a976afd1 100644 --- a/erpnext/setup/doctype/company/test_company.py +++ b/erpnext/setup/doctype/company/test_company.py @@ -79,6 +79,7 @@ class TestCompany(ERPNextTestSuite): "Receivable", "Stock Adjustment", "Stock Received But Not Billed", + "Stock Delivered But Not Billed", "Bank", "Cash", "Stock", From 8596d98ac4e3eba90d42cde02240d9d2564a2204 Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Tue, 28 Apr 2026 06:00:55 +0000 Subject: [PATCH 072/249] feat(accounts): add Stock Delivered But Not Billed account type and defaults --- erpnext/accounts/doctype/account/account.json | 2 +- erpnext/accounts/doctype/account/account.py | 2 ++ .../ca_plan_comptable_pour_les_provinces_francophones.json | 3 +++ .../chart_of_accounts/verified/de_kontenplan_SKR03.json | 4 ++++ .../chart_of_accounts/verified/de_kontenplan_SKR04.json | 4 ++++ .../verified/fr_plan2025_comptable_general_avec_code.json | 3 +++ .../verified/fr_plan2025_comptable_general_ex_agricole.json | 3 +++ .../verified/fr_plan_comptable_associatif_avec_code.json | 3 +++ .../verified/fr_plan_comptable_general.json | 3 +++ .../verified/fr_plan_comptable_general_avec_code.json | 3 +++ .../chart_of_accounts/verified/standard_chart_of_accounts.py | 4 ++++ .../standard_chart_of_accounts_with_account_number.py | 5 +++++ 12 files changed, 38 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json index a5f8d60cf4b..1ab8869535d 100644 --- a/erpnext/accounts/doctype/account/account.json +++ b/erpnext/accounts/doctype/account/account.json @@ -126,7 +126,7 @@ "label": "Account Type", "oldfieldname": "account_type", "oldfieldtype": "Select", - "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nCurrent Asset\nCurrent Liability\nDepreciation\nDirect Expense\nDirect Income\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nIndirect Expense\nIndirect Income\nLiability\nPayable\nReceivable\nRound Off\nRound Off for Opening\nStock\nStock Adjustment\nStock Received But Not Billed\nService Received But Not Billed\nTax\nTemporary", + "options": "\nAccumulated Depreciation\nAsset Received But Not Billed\nBank\nCash\nChargeable\nCapital Work in Progress\nCost of Goods Sold\nCurrent Asset\nCurrent Liability\nDepreciation\nDirect Expense\nDirect Income\nEquity\nExpense Account\nExpenses Included In Asset Valuation\nExpenses Included In Valuation\nFixed Asset\nIncome Account\nIndirect Expense\nIndirect Income\nLiability\nPayable\nReceivable\nRound Off\nRound Off for Opening\nStock\nStock Adjustment\nStock Received But Not Billed\nStock Delivered But Not Billed\nService Received But Not Billed\nTax\nTemporary", "search_index": 1 }, { diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py index efd7c32171c..32221a2c73c 100644 --- a/erpnext/accounts/doctype/account/account.py +++ b/erpnext/accounts/doctype/account/account.py @@ -65,6 +65,7 @@ class Account(NestedSet): "Stock", "Stock Adjustment", "Stock Received But Not Billed", + "Stock Delivered But Not Billed", "Service Received But Not Billed", "Tax", "Temporary", @@ -673,6 +674,7 @@ def get_company_default_account_fields(): "default_expense_account": "Default Expense Account", "default_income_account": "Default Income Account", "stock_received_but_not_billed": "Stock Received But Not Billed Account", + "stock_delivered_but_not_billed": "Stock Delivered But Not Billed Account", "stock_adjustment_account": "Stock Adjustment Account", "write_off_account": "Write Off Account", "default_discount_account": "Default Payment Discount Account", diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ca_plan_comptable_pour_les_provinces_francophones.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ca_plan_comptable_pour_les_provinces_francophones.json index 2a30cbcbc9f..46a9291a72b 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ca_plan_comptable_pour_les_provinces_francophones.json +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ca_plan_comptable_pour_les_provinces_francophones.json @@ -378,6 +378,9 @@ "Passifs de stock": { "Stock re\u00e7u non factur\u00e9": { "account_type": "Stock Received But Not Billed" + }, + "Stock livr\u00e9 non factur\u00e9": { + "account_type": "Stock Delivered But Not Billed" } }, "Provision pour vacances et cong\u00e9s": {}, diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR03.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR03.json index 84b16059e99..02b177829ca 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR03.json +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR03.json @@ -221,6 +221,10 @@ "account_number": "1702", "account_type": "Stock Received But Not Billed" }, + "Warenausgangs-Verrechnungskonto": { + "account_number": "1703", + "account_type": "Stock Delivered But Not Billed" + }, "Verbindlichkeiten aus Lohn und Gehalt": { "account_number": "1740", "account_type": "Payable" diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json index 2bf55cfcd04..0924b3e3d14 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json @@ -1144,6 +1144,10 @@ "Wareneingangs-­Verrechnungskonto" : { "account_number": "70001", "account_type": "Stock Received But Not Billed" + }, + "Warenausgangs-Verrechnungskonto" : { + "account_number": "70002", + "account_type": "Stock Delivered But Not Billed" } }, "Verb. aus Lieferungen und Leistungen": { diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan2025_comptable_general_avec_code.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan2025_comptable_general_avec_code.json index 4d7f879ddc7..d1c21f024a7 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan2025_comptable_general_avec_code.json +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan2025_comptable_general_avec_code.json @@ -1076,6 +1076,9 @@ "account_type": "Stock Received But Not Billed", "account_number": "4088" } + }, + "Stock livr\u00e9 non factur\u00e9": { + "account_type": "Stock Delivered But Not Billed" } }, "41-Clients et comptes rattach\u00e9s (PASSIF)": { diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan2025_comptable_general_ex_agricole.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan2025_comptable_general_ex_agricole.json index 6d8d2b14302..0510372bdb5 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan2025_comptable_general_ex_agricole.json +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan2025_comptable_general_ex_agricole.json @@ -1589,6 +1589,9 @@ "account_type": "Stock Received But Not Billed", "account_number": "4088" } + }, + "Stock livr\u00e9 non factur\u00e9": { + "account_type": "Stock Delivered But Not Billed" } }, "41-Clients et comptes rattach\u00e9s (PASSIF)": { diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_associatif_avec_code.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_associatif_avec_code.json index 5eabdc179c8..353944d378f 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_associatif_avec_code.json +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_associatif_avec_code.json @@ -1592,6 +1592,9 @@ "account_number": "4088" }, "account_number": "408" + }, + "Stock livr\u00e9 non factur\u00e9": { + "account_type": "Stock Delivered But Not Billed" } }, "41-Clients et comptes rattach\u00e9s (PASSIF)": { diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_general.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_general.json index d60c5596618..ae9d1a88298 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_general.json +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_general.json @@ -805,6 +805,9 @@ }, "account_type": "Stock Received But Not Billed" }, + "Stock livr\u00e9 non factur\u00e9": { + "account_type": "Stock Delivered But Not Billed" + }, "account_type": "Payable" }, "41-Clients et comptes rattach\u00e9s (PASSIF)": { diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_general_avec_code.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_general_avec_code.json index d599ea65ea6..d8261df0315 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_general_avec_code.json +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_plan_comptable_general_avec_code.json @@ -1520,6 +1520,9 @@ "account_number": "4088" }, "account_number": "408" + }, + "Stock livr\u00e9 non factur\u00e9": { + "account_type": "Stock Delivered But Not Billed" } }, "41-Clients et comptes rattach\u00e9s (PASSIF)": { diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py index 0786da4f11b..46b064f4ffc 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py @@ -162,6 +162,10 @@ def get(): "account_type": "Stock Received But Not Billed", "account_category": "Trade Payables", }, + _("Stock Delivered But Not Billed"): { + "account_type": "Stock Delivered But Not Billed", + "account_category": "Trade Payables", + }, _("Asset Received But Not Billed"): { "account_type": "Asset Received But Not Billed", "account_category": "Trade Payables", diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py index 121263794c9..78f238d870c 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py @@ -281,6 +281,11 @@ def get(): "account_number": "2211", "account_category": "Trade Payables", }, + _("Stock Delivered But Not Billed"): { + "account_type": "Stock Delivered But Not Billed", + "account_number": "2212", + "account_category": "Trade Payables", + }, "account_number": "2200", }, _("Duties and Taxes"): { From 3364ee92741b0aee5c656e60b5aecf5caa82cff3 Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Sat, 21 Mar 2026 07:30:23 +0000 Subject: [PATCH 073/249] feat(stock): add Stock Delivered But Not Billed GL entries on Delivery Note and Sales Invoice --- .../doctype/sales_invoice/sales_invoice.py | 81 +++++++++++++++++++ erpnext/controllers/stock_controller.py | 1 + .../doctype/delivery_note/delivery_note.py | 37 +++++++++ erpnext/stock/get_item_details.py | 21 +++++ 4 files changed, 140 insertions(+) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index ebef1a8040d..86f84be0973 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -1586,6 +1586,12 @@ class SalesInvoice(SellingController): self.make_internal_transfer_gl_entries(gl_entries) self.make_item_gl_entries(gl_entries) + + disable_sdbnb_in_sr = frappe.get_cached_value("Company", self.company, "disable_sdbnb_in_sr") + + if not (self.is_return and disable_sdbnb_in_sr): + self.stock_delivered_but_not_billed_gl_entries(gl_entries) + self.make_precision_loss_gl_entry(gl_entries) self.make_discount_gl_entries(gl_entries) @@ -1603,6 +1609,81 @@ class SalesInvoice(SellingController): self.set_transaction_currency_and_rate_in_gl_map(gl_entries) return gl_entries + def stock_delivered_but_not_billed_gl_entries(self, gl_entries): + if self.update_stock or not cint(erpnext.is_perpetual_inventory_enabled(self.company)): + return + + for item in self.get("items"): + if not item.delivery_note and not item.dn_detail: + continue + + if not frappe.get_cached_value("Item", item.item_code, "is_stock_item"): + continue + + dn_expense_account = frappe.get_cached_value( + "Delivery Note Item", item.dn_detail, "expense_account" + ) + if ( + not dn_expense_account + or frappe.get_cached_value("Account", dn_expense_account, "account_type") + != "Stock Delivered But Not Billed" + or not item.expense_account + or dn_expense_account == item.expense_account + ): + continue + + delivery_note = item.delivery_note or frappe.get_cached_value( + "Delivery Note Item", item.dn_detail, "parent" + ) + if not delivery_note: + continue + + item_g = frappe.get_cached_value( + "Stock Ledger Entry", + { + "voucher_no": delivery_note, + "voucher_detail_no": item.dn_detail, + "item_code": item.item_code, + "is_cancelled": 0, + }, + ["stock_value_difference", "actual_qty"], + as_dict=True, + ) + + if not item_g or not flt(item_g.actual_qty): + continue + valuation_rate = flt(item_g.stock_value_difference) / flt(item_g.actual_qty) + valuation_amount = valuation_rate * item.stock_qty + dn_account_currency = get_account_currency(dn_expense_account) + item_account_currency = get_account_currency(item.expense_account) + + gl_entries.append( + self.get_gl_dict( + { + "account": dn_expense_account, + "against": item.expense_account, + "credit": flt(valuation_amount), + "credit_in_account_currency": flt(valuation_amount), + "cost_center": item.cost_center, + }, + dn_account_currency, + item=item, + ) + ) + gl_entries.append( + self.get_gl_dict( + { + "account": item.expense_account, + "against": dn_expense_account, + "debit": flt(valuation_amount), + "debit_in_account_currency": flt(valuation_amount), + "cost_center": item.cost_center, + }, + item_account_currency, + item=item, + ) + ) + def make_customer_gl_entry(self, gl_entries): # Checked both rounding_adjustment and rounded_total # because rounded_total had value even before introduction of posting GLE based on rounded total diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py index 4951ec346be..9fb9dfe58ab 100644 --- a/erpnext/controllers/stock_controller.py +++ b/erpnext/controllers/stock_controller.py @@ -940,6 +940,7 @@ class StockController(AccountsController): "Stock Reconciliation", "Stock Entry", "Subcontracting Receipt", + "Delivery Note", ) and not is_expense_account ): diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index fe03e3218b7..3d827cb84b2 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -289,6 +289,7 @@ class DeliveryNote(SellingController): self.validate_posting_time() super().validate() self.validate_references() + self.validate_expense_account() self.set_status() self.so_required() self.validate_proj_cust() @@ -461,6 +462,42 @@ class DeliveryNote(SellingController): d.actual_qty = flt(bin_qty.actual_qty) d.projected_qty = flt(bin_qty.projected_qty) + def validate_expense_account(self): + company_values = frappe.get_cached_value( + "Company", + self.company, + [ + "stock_delivered_but_not_billed", + "disable_sdbnb_in_sr", + "default_expense_account", + ], + as_dict=True, + ) + + sdbnb_account = company_values.stock_delivered_but_not_billed + disable_sdbnb_in_sr = company_values.disable_sdbnb_in_sr + default_expense_account = company_values.default_expense_account + + for item in self.items: + if item.get("against_sales_invoice"): + continue + is_stock_item = frappe.get_cached_value("Item", item.item_code, "is_stock_item") + # Only stock items + if not is_stock_item or item.get("is_fixed_asset") or item.get("is_subcontracted"): + continue + # Sales Return handling + if self.is_return and disable_sdbnb_in_sr: + if default_expense_account and ( + not item.expense_account or item.expense_account == sdbnb_account + ): + item.expense_account = default_expense_account + continue + + if sdbnb_account: + item.expense_account = sdbnb_account + elif not item.expense_account and default_expense_account: + item.expense_account = default_expense_account + def on_submit(self): self.validate_packed_qty() self.update_pick_list_status() diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index d40511d5e2c..38cb8b2eb1b 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -436,6 +436,27 @@ def get_basic_details(ctx: ItemDetailsCtx, item, overwrite_warehouse=True) -> It fieldname="fixed_asset_account", item=ctx.item_code, company=ctx.company ) + company_values = frappe.get_cached_value( + "Company", + ctx.company, + [ + "stock_delivered_but_not_billed", + "disable_sdbnb_in_sr", + ], + as_dict=True, + ) + + if ( + ctx.doctype == "Delivery Note" + and ctx.is_stock_item + and company_values + and company_values.stock_delivered_but_not_billed + and not ctx.get("is_fixed_asset") + and not ctx.get("is_subcontracted") + ): + if not (ctx.get("is_return") and company_values.disable_sdbnb_in_sr): + expense_account = company_values.stock_delivered_but_not_billed + # Set the UOM to the Default Sales UOM or Default Purchase UOM if configured in the Item Master if not ctx.uom: if ctx.doctype in sales_doctypes: From 05877140d177e899d3df2a82408ee3cdbb35f837 Mon Sep 17 00:00:00 2001 From: kavin-114 Date: Sun, 22 Mar 2026 22:29:46 +0530 Subject: [PATCH 074/249] feat: handle post delivery invoices gl reposting --- .../repost_item_valuation.py | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py index ce92dec82da..6a8d3cc7ffa 100644 --- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py +++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py @@ -493,6 +493,11 @@ def repost_gl_entries(doc): repost_affected_transaction = get_affected_transactions(doc) transactions = directly_dependent_transactions + list(repost_affected_transaction) + + # handle stock delivered but not billed ledger entries + if frappe.get_cached_value("Company", doc.company, "stock_delivered_but_not_billed"): + _update_post_delivery_billed_vouchers(transactions) + enable_separate_reposting_for_gl = frappe.db.get_single_value( "Stock Reposting Settings", "enable_separate_reposting_for_gl" ) @@ -548,6 +553,44 @@ def _get_directly_dependent_vouchers(doc): return affected_vouchers +def _update_post_delivery_billed_vouchers(transactions: list) -> None: + """ + Fetch the delivery notes from dependant transactions, + and repost the Sales Invoice vouchers created post delivery note. + To match the Stock Delivered But Not Billed ledger entries. + """ + dn_vouchers = set() + + for voucher_type, voucher_no in transactions: + if voucher_type == "Delivery Note": + dn_vouchers.add(voucher_no) + + if not dn_vouchers: + return + + sii = DocType("Sales Invoice Item") + si = DocType("Sales Invoice") + dni = DocType("Delivery Note Item") + + query = ( + frappe.qb.from_(sii) + .inner_join(si) + .on(si.name == sii.parent) + .left_join(dni) + .on(dni.name == sii.dn_detail) + .select(sii.parenttype, sii.parent) + .where((sii.delivery_note.isin(dn_vouchers) | dni.parent.isin(dn_vouchers)) & (si.docstatus == 1)) + .groupby(sii.parenttype, sii.parent) + ) + + result = query.run(as_dict=True) + + si_vouchers = {(d.parenttype, d.parent) for d in result} + existing = set(transactions) + + transactions.extend(list(si_vouchers - existing)) + + def notify_error_to_stock_managers(doc, traceback): recipients = get_recipients() From 6ee7dc0b4961b35ef807dc8c41cc1781356f59b7 Mon Sep 17 00:00:00 2001 From: kavin-114 Date: Sun, 22 Mar 2026 22:30:19 +0530 Subject: [PATCH 075/249] test: add unit test cases for Stock Delivered But Not Billed --- .../delivery_note/test_delivery_note.py | 500 ++++++++++++++++++ 1 file changed, 500 insertions(+) diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py index 23594265c01..1058fd07ff2 100644 --- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py @@ -10,6 +10,7 @@ from frappe.utils import add_days, cstr, flt, getdate, nowdate, nowtime, today from erpnext.accounts.doctype.account.test_account import get_inventory_account from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center +from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice from erpnext.accounts.utils import get_balance_on from erpnext.controllers.accounts_controller import InvalidQtyError from erpnext.selling.doctype.product_bundle.test_product_bundle import make_product_bundle @@ -45,8 +46,35 @@ from erpnext.tests.utils import ERPNextTestSuite class TestDeliveryNote(ERPNextTestSuite): + SDBNB_COMPANY_NAME = "_Test SDBNB Company" + SDBNB_COMPANY_ABBR = "_TSDBNB" + def setUp(self): self.load_test_records("Stock Entry") + self.setup_sdbnb_company() + + def setup_sdbnb_company(self): + if frappe.db.exists("Company", self.SDBNB_COMPANY_NAME): + company = frappe.get_doc("Company", self.SDBNB_COMPANY_NAME) + else: + company = frappe.get_doc( + { + "doctype": "Company", + "company_name": self.SDBNB_COMPANY_NAME, + "abbr": self.SDBNB_COMPANY_ABBR, + "country": "India", + "default_currency": "INR", + "enable_perpetual_inventory": 1, + } + ).insert() + + self.sdbnb_company = company.name + self.sdbnb_account = company.stock_delivered_but_not_billed + self.sdbnb_cost_center = company.cost_center + self.sdbnb_warehouse = f"Stores - {self.SDBNB_COMPANY_ABBR}" + self.sdbnb_expense_account = f"Cost of Goods Sold - {self.SDBNB_COMPANY_ABBR}" + self.sdbnb_income_account = f"Sales - {self.SDBNB_COMPANY_ABBR}" + self.sdbnb_debit_to = f"Debtors - {self.SDBNB_COMPANY_ABBR}" def test_delivery_note_qty(self): dn = create_delivery_note(qty=0, do_not_save=True) @@ -2865,6 +2893,478 @@ class TestDeliveryNote(ERPNextTestSuite): for entry in sabb.entries: self.assertEqual(entry.incoming_rate, 200) + def test_sdbnb_gl_entry_on_delivery_note(self): + """Test that DN GL entries use SDBNB account when configured on the company.""" + item_code = make_item("SDBNB Test Item", properties={"is_stock_item": 1}).name + make_stock_entry( + item_code=item_code, + target=self.sdbnb_warehouse, + qty=10, + basic_rate=100, + company=self.sdbnb_company, + ) + + dn = create_delivery_note( + item_code=item_code, + qty=5, + rate=150, + company=self.sdbnb_company, + warehouse=self.sdbnb_warehouse, + cost_center=self.sdbnb_cost_center, + expense_account=self.sdbnb_expense_account, + ) + + # DN expense_account should be overridden to SDBNB + dn.reload() + self.assertEqual(dn.items[0].expense_account, self.sdbnb_account) + + # Verify DN GL entries use SDBNB account (not COGS) + gl_entries = get_gl_entries("Delivery Note", dn.name) + self.assertTrue(gl_entries) + + stock_in_hand_account = get_inventory_account(self.sdbnb_company) + expected_values = { + self.sdbnb_account: {"debit": True}, + stock_in_hand_account: {"credit": True}, + } + for gle in gl_entries: + self.assertIn(gle.account, expected_values) + if expected_values[gle.account].get("debit"): + self.assertGreater(gle.debit, 0) + if expected_values[gle.account].get("credit"): + self.assertGreater(gle.credit, 0) + + def test_sdbnb_reversal_on_sales_invoice(self): + """Test that SI created from DN reverses SDBNB entries (credits SDBNB, debits COGS).""" + item_code = make_item("SDBNB Reversal Test Item", properties={"is_stock_item": 1}).name + make_stock_entry( + item_code=item_code, + target=self.sdbnb_warehouse, + qty=10, + basic_rate=100, + company=self.sdbnb_company, + ) + + dn = create_delivery_note( + item_code=item_code, + qty=5, + rate=150, + company=self.sdbnb_company, + warehouse=self.sdbnb_warehouse, + cost_center=self.sdbnb_cost_center, + expense_account=self.sdbnb_expense_account, + ) + + si = make_sales_invoice(dn.name) + si.submit() + + # Get the stock value difference from the DN's SLE + sle = frappe.db.get_value( + "Stock Ledger Entry", + { + "voucher_type": "Delivery Note", + "voucher_no": dn.name, + "item_code": item_code, + "is_cancelled": 0, + }, + ["stock_value_difference", "actual_qty"], + as_dict=True, + ) + + valuation_rate = abs(flt(sle.stock_value_difference) / flt(sle.actual_qty)) + expected_amount = flt(valuation_rate * 5) # SI qty = 5 + + # SI GL entries should have SDBNB reversal + si_gl_entries = get_gl_entries("Sales Invoice", si.name) + self.assertTrue(si_gl_entries) + self.assertGreater( + sum(gle.debit for gle in si_gl_entries if gle.account == self.sdbnb_expense_account), 0 + ) + sdbnb_credit = sum(gle.credit for gle in si_gl_entries if gle.account == self.sdbnb_account) + cogs_debit = sum(gle.debit for gle in si_gl_entries if gle.account == self.sdbnb_expense_account) + + self.assertEqual(flt(sdbnb_credit, 2), flt(expected_amount, 2)) + self.assertEqual(flt(cogs_debit, 2), flt(expected_amount, 2)) + + def test_sdbnb_partial_billing(self): + """Test SDBNB reversal for partial invoicing - only billed qty should be reversed.""" + item_code = make_item("SDBNB Partial Bill Item", properties={"is_stock_item": 1}).name + make_stock_entry( + item_code=item_code, + target=self.sdbnb_warehouse, + qty=10, + basic_rate=100, + company=self.sdbnb_company, + ) + + dn = create_delivery_note( + item_code=item_code, + qty=10, + rate=150, + company=self.sdbnb_company, + warehouse=self.sdbnb_warehouse, + cost_center=self.sdbnb_cost_center, + expense_account=self.sdbnb_expense_account, + ) + + # Create SI from DN and reduce qty to 4 (partial billing) + si = make_sales_invoice(dn.name) + si.items[0].qty = 4 + si.save() + si.submit() + + # Get valuation rate from DN's SLE + sle = frappe.db.get_value( + "Stock Ledger Entry", + { + "voucher_type": "Delivery Note", + "voucher_no": dn.name, + "item_code": item_code, + "is_cancelled": 0, + }, + ["stock_value_difference", "actual_qty"], + as_dict=True, + ) + + valuation_rate = abs(flt(sle.stock_value_difference) / flt(sle.actual_qty)) + expected_amount = flt(valuation_rate * 4) # Only 4 out of 10 + + si_gl_entries = get_gl_entries("Sales Invoice", si.name) + sdbnb_credit = sum(gle.credit for gle in si_gl_entries if gle.account == self.sdbnb_account) + + self.assertEqual(flt(sdbnb_credit, 2), flt(expected_amount, 2)) + + def test_sdbnb_disabled_for_sales_return(self): + """Test that sales return DN uses default expense account when disable_sdbnb_in_sr is enabled.""" + frappe.db.set_value("Company", self.sdbnb_company, "disable_sdbnb_in_sr", 1) + + try: + item_code = make_item("SDBNB Return Disable Item", properties={"is_stock_item": 1}).name + make_stock_entry( + item_code=item_code, + target=self.sdbnb_warehouse, + qty=10, + basic_rate=100, + company=self.sdbnb_company, + ) + + dn = create_delivery_note( + item_code=item_code, + qty=5, + rate=150, + company=self.sdbnb_company, + warehouse=self.sdbnb_warehouse, + cost_center=self.sdbnb_cost_center, + expense_account=self.sdbnb_expense_account, + ) + + # Original DN should use SDBNB + dn.reload() + self.assertEqual(dn.items[0].expense_account, self.sdbnb_account) + + return_dn = create_delivery_note( + item_code=item_code, + qty=-3, + rate=150, + company=self.sdbnb_company, + warehouse=self.sdbnb_warehouse, + cost_center=self.sdbnb_cost_center, + expense_account=self.sdbnb_expense_account, + is_return=1, + return_against=dn.name, + ) + + # Return DN should not use SDBNB (disable_sdbnb_in_sr is on) + return_dn.reload() + self.assertNotEqual(return_dn.items[0].expense_account, self.sdbnb_account) + finally: + frappe.db.set_value("Company", self.sdbnb_company, "disable_sdbnb_in_sr", 0) + + def test_sdbnb_enabled_for_sales_return(self): + """Test that sales return DN uses SDBNB account when disable_sdbnb_in_sr is off.""" + item_code = make_item("SDBNB Return Enable Item", properties={"is_stock_item": 1}).name + make_stock_entry( + item_code=item_code, + target=self.sdbnb_warehouse, + qty=10, + basic_rate=100, + company=self.sdbnb_company, + ) + + dn = create_delivery_note( + item_code=item_code, + qty=5, + rate=150, + company=self.sdbnb_company, + warehouse=self.sdbnb_warehouse, + cost_center=self.sdbnb_cost_center, + expense_account=self.sdbnb_expense_account, + ) + + return_dn = create_delivery_note( + item_code=item_code, + qty=-3, + rate=150, + company=self.sdbnb_company, + warehouse=self.sdbnb_warehouse, + cost_center=self.sdbnb_cost_center, + expense_account=self.sdbnb_expense_account, + is_return=1, + return_against=dn.name, + ) + + # Return DN should also use SDBNB since disable flag is off by default + return_dn.reload() + self.assertEqual(return_dn.items[0].expense_account, self.sdbnb_account) + + def test_sdbnb_no_reversal_with_update_stock(self): + """Test that SI with update_stock=1 (standalone, no DN link) does NOT create SDBNB GL entries.""" + item_code = make_item("SDBNB Update Stock Item", properties={"is_stock_item": 1}).name + make_stock_entry( + item_code=item_code, + target=self.sdbnb_warehouse, + qty=10, + basic_rate=100, + company=self.sdbnb_company, + ) + + # Create standalone SI with update_stock=1 (no DN link) + si = create_sales_invoice( + company=self.sdbnb_company, + currency="INR", + debit_to=self.sdbnb_debit_to, + income_account=self.sdbnb_income_account, + update_stock=1, + item_code=item_code, + qty=5, + rate=150, + warehouse=self.sdbnb_warehouse, + cost_center=self.sdbnb_cost_center, + expense_account=self.sdbnb_expense_account, + ) + + # SI GL entries should not have SDBNB account + si_gl_entries = get_gl_entries("Sales Invoice", si.name) + sdbnb_entries = [gle for gle in si_gl_entries if gle.account == self.sdbnb_account] + self.assertEqual(len(sdbnb_entries), 0) + + def test_sdbnb_skip_for_dn_against_sales_invoice(self): + """Test that DN items with against_sales_invoice reference skips SDBNB account assignment.""" + from erpnext.accounts.doctype.sales_invoice.sales_invoice import ( + make_delivery_note as make_dn_from_si, + ) + + item_code = make_item("SDBNB Against SI Item", properties={"is_stock_item": 1}).name + make_stock_entry( + item_code=item_code, + target=self.sdbnb_warehouse, + qty=10, + basic_rate=100, + company=self.sdbnb_company, + ) + + si = create_sales_invoice( + company=self.sdbnb_company, + currency="INR", + debit_to=self.sdbnb_debit_to, + income_account=self.sdbnb_income_account, + update_stock=0, + item_code=item_code, + qty=5, + rate=150, + warehouse=self.sdbnb_warehouse, + cost_center=self.sdbnb_cost_center, + expense_account=self.sdbnb_expense_account, + ) + + dn = make_dn_from_si(si.name) + self.assertEqual(dn.items[0].expense_account, self.sdbnb_expense_account) + dn.submit() + + # DN items created from SI have against_sales_invoice set, + # so SDBNB should be skipped + dn.reload() + self.assertEqual(dn.items[0].expense_account, self.sdbnb_expense_account) + + def test_sdbnb_non_stock_item_skipped(self): + """Test that non-stock items are not assigned SDBNB account.""" + non_stock_item = make_item( + "SDBNB Non Stock Item", + properties={"is_stock_item": 0}, + ).name + + dn = create_delivery_note( + company=self.sdbnb_company, + item_code=non_stock_item, + warehouse=self.sdbnb_warehouse, + qty=5, + rate=150, + cost_center=self.sdbnb_cost_center, + expense_account=self.sdbnb_expense_account, + do_not_submit=True, + ) + + # Non-stock item should retain original expense_account, not SDBNB + self.assertNotEqual(dn.items[0].expense_account, self.sdbnb_account) + self.assertEqual(dn.items[0].expense_account, self.sdbnb_expense_account) + + def test_sdbnb_reposting_with_fifo(self): + """Test that backdated inward entry triggers reposting and updates SDBNB GL entries (FIFO).""" + item_code = make_item( + "SDBNB Repost FIFO Item", properties={"is_stock_item": 1, "valuation_method": "FIFO"} + ).name + + posting_date = add_days(nowdate(), -1) + + # Inward 10 qty @ 100 + make_stock_entry( + item_code=item_code, + target=self.sdbnb_warehouse, + qty=10, + basic_rate=100, + company=self.sdbnb_company, + posting_date=posting_date, + ) + + # DN 5 qty → FIFO consumes 5 @ 100 → stock_value_diff = -500 + dn = create_delivery_note( + item_code=item_code, + qty=5, + rate=150, + company=self.sdbnb_company, + warehouse=self.sdbnb_warehouse, + cost_center=self.sdbnb_cost_center, + expense_account=self.sdbnb_expense_account, + posting_date=posting_date, + ) + + # Verify initial DN GL: SDBNB Dr 500, Stock In Hand Cr 500 + dn_gl = get_gl_entries("Delivery Note", dn.name) + sdbnb_debit = sum(gle.debit for gle in dn_gl if gle.account == self.sdbnb_account) + self.assertEqual(flt(sdbnb_debit, 2), 500.0) + + # SI from DN + si = make_sales_invoice(dn.name) + si.set_posting_time = 1 + si.posting_date = posting_date + si.submit() + + # Verify initial SI GL: SDBNB Cr 500, COGS Dr 500 + si_gl = get_gl_entries("Sales Invoice", si.name) + sdbnb_credit = sum(gle.credit for gle in si_gl if gle.account == self.sdbnb_account) + cogs_debit = sum(gle.debit for gle in si_gl if gle.account == self.sdbnb_expense_account) + self.assertEqual(flt(sdbnb_credit, 2), 500.0) + self.assertEqual(flt(cogs_debit, 2), 500.0) + + # Backdated inward: 5 qty @ 50 → FIFO queue becomes [[5,50],[10,100]] + # DN now consumes 5@50 from front → stock_value_diff = -250 + make_stock_entry( + item_code=item_code, + target=self.sdbnb_warehouse, + qty=5, + basic_rate=50, + company=self.sdbnb_company, + posting_date=add_days(posting_date, -1), + ) + + # After repost: DN GL should reflect new valuation (250 instead of 500) + dn_gl = get_gl_entries("Delivery Note", dn.name) + sdbnb_debit = sum(gle.debit for gle in dn_gl if gle.account == self.sdbnb_account) + self.assertEqual(flt(sdbnb_debit, 2), 250.0) + + # After repost: SI GL should also reflect new valuation + si_gl = get_gl_entries("Sales Invoice", si.name) + sdbnb_credit = sum(gle.credit for gle in si_gl if gle.account == self.sdbnb_account) + cogs_debit = sum(gle.debit for gle in si_gl if gle.account == self.sdbnb_expense_account) + self.assertEqual(flt(sdbnb_credit, 2), 250.0) + self.assertEqual(flt(cogs_debit, 2), 250.0) + + def test_sdbnb_reposting_with_moving_average(self): + """Test that backdated inward entry triggers reposting and updates SDBNB GL entries (Moving Average).""" + item_code = make_item( + "SDBNB Repost MA Item", properties={"is_stock_item": 1, "valuation_method": "Moving Average"} + ).name + + posting_date = add_days(nowdate(), -1) + + # Inward 10 qty @ 100 → avg = 100 + make_stock_entry( + item_code=item_code, + target=self.sdbnb_warehouse, + qty=10, + basic_rate=100, + company=self.sdbnb_company, + posting_date=posting_date, + ) + + # DN 5 qty → avg = 100 → stock_value_diff = -500 + dn = create_delivery_note( + item_code=item_code, + qty=5, + rate=150, + company=self.sdbnb_company, + warehouse=self.sdbnb_warehouse, + cost_center=self.sdbnb_cost_center, + expense_account=self.sdbnb_expense_account, + posting_date=posting_date, + ) + + # Verify initial DN GL: SDBNB Dr 500, Stock In Hand Cr 500 + dn_gl = get_gl_entries("Delivery Note", dn.name) + sdbnb_debit = sum(gle.debit for gle in dn_gl if gle.account == self.sdbnb_account) + self.assertEqual(flt(sdbnb_debit, 2), 500.0) + + # SI from DN + si = make_sales_invoice(dn.name) + si.set_posting_time = 1 + si.posting_date = posting_date + si.submit() + + # Verify initial SI GL: SDBNB Cr 500, COGS Dr 500 + si_gl = get_gl_entries("Sales Invoice", si.name) + sdbnb_credit = sum(gle.credit for gle in si_gl if gle.account == self.sdbnb_account) + cogs_debit = sum(gle.debit for gle in si_gl if gle.account == self.sdbnb_expense_account) + self.assertEqual(flt(sdbnb_credit, 2), 500.0) + self.assertEqual(flt(cogs_debit, 2), 500.0) + + # Backdated inward: 5 qty @ 50 + # Moving avg becomes: (5*50 + 10*100) / 15 = 1250/15 ≈ 83.33 + # DN 5 qty → reposted stock_value_diff ≈ -416.67 + make_stock_entry( + item_code=item_code, + target=self.sdbnb_warehouse, + qty=5, + basic_rate=50, + company=self.sdbnb_company, + posting_date=add_days(posting_date, -1), + ) + + # Read actual stock_value_difference from reposted SLE + sle = frappe.db.get_value( + "Stock Ledger Entry", + { + "voucher_type": "Delivery Note", + "voucher_no": dn.name, + "item_code": item_code, + "is_cancelled": 0, + }, + "stock_value_difference", + ) + expected_amount = abs(flt(sle, 2)) + + # DN GL should reflect new moving average valuation + dn_gl = get_gl_entries("Delivery Note", dn.name) + sdbnb_debit = sum(gle.debit for gle in dn_gl if gle.account == self.sdbnb_account) + self.assertEqual(flt(sdbnb_debit, 2), expected_amount) + self.assertLess(expected_amount, 500.0) + + # SI GL should also reflect new valuation + si_gl = get_gl_entries("Sales Invoice", si.name) + sdbnb_credit = sum(gle.credit for gle in si_gl if gle.account == self.sdbnb_account) + cogs_debit = sum(gle.debit for gle in si_gl if gle.account == self.sdbnb_expense_account) + self.assertEqual(flt(sdbnb_credit, 2), expected_amount) + self.assertEqual(flt(cogs_debit, 2), expected_amount) + @ERPNextTestSuite.change_settings("Selling Settings", {"validate_selling_price": 1}) def test_validate_selling_price(self): item_code = make_item("VSP Item", properties={"is_stock_item": 1}).name From 78993c1ebe63c3443f16576e31c6ce1e250643c1 Mon Sep 17 00:00:00 2001 From: kavin-114 Date: Fri, 27 Mar 2026 15:19:50 +0530 Subject: [PATCH 076/249] fix: update cost center tests to use dynamic expense account Existing tests hardcoded "Cost of Goods Sold" as expected GL account, but SDBNB overrides it on DN submission. Use dn.items[0].expense_account to work with both SDBNB-enabled and legacy companies. --- erpnext/stock/doctype/delivery_note/test_delivery_note.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py index 1058fd07ff2..58f5d71b3d4 100644 --- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py @@ -1224,7 +1224,7 @@ class TestDeliveryNote(ERPNextTestSuite): self.assertTrue(gl_entries) expected_values = { - "Cost of Goods Sold - TCP1": {"cost_center": cost_center}, + dn.items[0].expense_account: {"cost_center": cost_center}, stock_in_hand_account: {"cost_center": cost_center}, } for _i, gle in enumerate(gl_entries): @@ -1253,7 +1253,7 @@ class TestDeliveryNote(ERPNextTestSuite): self.assertTrue(gl_entries) expected_values = { - "Cost of Goods Sold - TCP1": {"cost_center": cost_center}, + dn.items[0].expense_account: {"cost_center": cost_center}, stock_in_hand_account: {"cost_center": cost_center}, } for _i, gle in enumerate(gl_entries): From 9ff3e28f5d8d58f015e64f50f3660744b779c3f7 Mon Sep 17 00:00:00 2001 From: Pugazhendhi Velu Date: Wed, 29 Apr 2026 03:02:25 +0000 Subject: [PATCH 077/249] fix: validate expense account for items linked to sales invoice --- .../doctype/delivery_note/delivery_note.py | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index 3d827cb84b2..f85ed1dc2a9 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -480,22 +480,26 @@ class DeliveryNote(SellingController): for item in self.items: if item.get("against_sales_invoice"): - continue - is_stock_item = frappe.get_cached_value("Item", item.item_code, "is_stock_item") - # Only stock items - if not is_stock_item or item.get("is_fixed_asset") or item.get("is_subcontracted"): - continue - # Sales Return handling - if self.is_return and disable_sdbnb_in_sr: - if default_expense_account and ( - not item.expense_account or item.expense_account == sdbnb_account - ): - item.expense_account = default_expense_account - continue + if sdbnb_account and item.expense_account == sdbnb_account: + frappe.throw( + _( + "Row #{0}: Stock Delivered But Not Billed account cannot be used for items linked to a Sales Invoice" + ).format(item.idx) + ) + else: + is_stock_item = frappe.get_cached_value("Item", item.item_code, "is_stock_item") + # Only stock items + if is_stock_item and not item.get("is_fixed_asset") and not item.get("is_subcontracted"): + # Sales Return handling + if self.is_return and disable_sdbnb_in_sr: + if default_expense_account and ( + not item.expense_account or item.expense_account == sdbnb_account + ): + item.expense_account = default_expense_account - if sdbnb_account: - item.expense_account = sdbnb_account - elif not item.expense_account and default_expense_account: + elif sdbnb_account: + item.expense_account = sdbnb_account + if not item.expense_account and default_expense_account: item.expense_account = default_expense_account def on_submit(self): From ba1f40fdd93e1235bda02864b4b1429028a2a63d Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 13 May 2026 13:16:00 +0530 Subject: [PATCH 078/249] fix: posting date and time --- erpnext/stock/serial_batch_bundle.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py index 4949e389b48..cdaf77ef3ef 100644 --- a/erpnext/stock/serial_batch_bundle.py +++ b/erpnext/stock/serial_batch_bundle.py @@ -11,6 +11,7 @@ from erpnext.stock.deprecated_serial_batch import ( DeprecatedBatchNoValuation, DeprecatedSerialNoValuation, ) +from erpnext.stock.utils import get_combine_datetime from erpnext.stock.valuation import round_off_if_near_zero CONSUMED_SERIAL_NO_STOCK_ENTRY_PURPOSES = ( @@ -1072,6 +1073,10 @@ class SerialBatchCreation: def set_other_details(self): from erpnext.stock.utils import get_combine_datetime + if not self.get("posting_datetime"): + if self.get("posting_date") and self.get("posting_time"): + self.posting_datetime = get_combine_datetime(self.posting_date, self.posting_time) + if not self.get("posting_datetime"): if self.get("posting_date") and self.get("posting_time"): self.posting_datetime = get_combine_datetime(self.posting_date, self.posting_time) From 61547fff44aa36fe4c8461d3f5fd78f50903b2b1 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 13 May 2026 14:05:55 +0530 Subject: [PATCH 079/249] chore: fixed test case --- erpnext/stock/serial_batch_bundle.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py index cdaf77ef3ef..4949e389b48 100644 --- a/erpnext/stock/serial_batch_bundle.py +++ b/erpnext/stock/serial_batch_bundle.py @@ -11,7 +11,6 @@ from erpnext.stock.deprecated_serial_batch import ( DeprecatedBatchNoValuation, DeprecatedSerialNoValuation, ) -from erpnext.stock.utils import get_combine_datetime from erpnext.stock.valuation import round_off_if_near_zero CONSUMED_SERIAL_NO_STOCK_ENTRY_PURPOSES = ( @@ -1073,10 +1072,6 @@ class SerialBatchCreation: def set_other_details(self): from erpnext.stock.utils import get_combine_datetime - if not self.get("posting_datetime"): - if self.get("posting_date") and self.get("posting_time"): - self.posting_datetime = get_combine_datetime(self.posting_date, self.posting_time) - if not self.get("posting_datetime"): if self.get("posting_date") and self.get("posting_time"): self.posting_datetime = get_combine_datetime(self.posting_date, self.posting_time) From 91026fbdb359b8c651af1bde8035df4ac1750ff9 Mon Sep 17 00:00:00 2001 From: kavin-114 Date: Fri, 22 May 2026 00:30:58 +0530 Subject: [PATCH 080/249] fix: classify Stock Delivered But Not Billed as a Current Asset This account holds a debit balance (inventory value delivered but not yet invoiced) and clears to COGS on Sales Invoice, so it is economically a short-term clearing asset rather than a trade payable. Move it from the Stock Liabilities group to Stock Assets under Current Assets, with account_category "Stock Assets" (and account_number 1420 in the numbered chart). The account_type "Stock Delivered But Not Billed" is unchanged, so posting logic in Sales Invoice and Delivery Note continues to key off the correct account. --- .../verified/standard_chart_of_accounts.py | 8 ++++---- .../standard_chart_of_accounts_with_account_number.py | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py index 46b064f4ffc..7901cc90230 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py @@ -35,6 +35,10 @@ def get(): _("Short-term Investments"): {"account_category": "Short-term Investments"}, _("Stock Assets"): { _("Stock In Hand"): {"account_type": "Stock", "account_category": "Stock Assets"}, + _("Stock Delivered But Not Billed"): { + "account_type": "Stock Delivered But Not Billed", + "account_category": "Stock Assets", + }, "account_type": "Stock", "account_category": "Stock Assets", }, @@ -162,10 +166,6 @@ def get(): "account_type": "Stock Received But Not Billed", "account_category": "Trade Payables", }, - _("Stock Delivered But Not Billed"): { - "account_type": "Stock Delivered But Not Billed", - "account_category": "Trade Payables", - }, _("Asset Received But Not Billed"): { "account_type": "Asset Received But Not Billed", "account_category": "Trade Payables", diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py index 78f238d870c..e38369ceb1d 100644 --- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py +++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py @@ -62,6 +62,11 @@ def get(): "account_number": "1410", "account_category": "Stock Assets", }, + _("Stock Delivered But Not Billed"): { + "account_type": "Stock Delivered But Not Billed", + "account_number": "1420", + "account_category": "Stock Assets", + }, "account_type": "Stock", "account_number": "1400", "account_category": "Stock Assets", @@ -281,11 +286,6 @@ def get(): "account_number": "2211", "account_category": "Trade Payables", }, - _("Stock Delivered But Not Billed"): { - "account_type": "Stock Delivered But Not Billed", - "account_number": "2212", - "account_category": "Trade Payables", - }, "account_number": "2200", }, _("Duties and Taxes"): { From d44f5745813403e0376b47661b8a84bed4b4157a Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 22 May 2026 11:31:00 +0530 Subject: [PATCH 081/249] fix: slow query --- erpnext/accounts/utils.py | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index bc7794b880b..470cb055134 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -41,7 +41,7 @@ import erpnext from erpnext.accounts.doctype.account.account import get_account_currency from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_dimensions from erpnext.stock import get_warehouse_account_map -from erpnext.stock.utils import get_stock_value_on +from erpnext.stock.utils import get_combine_datetime, get_stock_value_on if TYPE_CHECKING: from erpnext.stock.doctype.repost_item_valuation.repost_item_valuation import RepostItemValuation @@ -1764,31 +1764,31 @@ def sort_stock_vouchers_by_posting_date( def get_future_stock_vouchers(posting_date, posting_time, for_warehouses=None, for_items=None, company=None): - values = [] - condition = "" + posting_datetime = get_combine_datetime(posting_date, posting_time) + + SLE = DocType("Stock Ledger Entry") + + query = ( + frappe.qb.from_(SLE) + .select(SLE.voucher_type, SLE.voucher_no) + .distinct() + .where(SLE.posting_datetime >= posting_datetime) + .where(SLE.is_cancelled == 0) + .orderby(SLE.posting_datetime) + .orderby(SLE.creation) + .for_update() + ) + if for_items: - condition += " and item_code in ({})".format(", ".join(["%s"] * len(for_items))) - values += for_items + query = query.where(SLE.item_code.isin(for_items)) if for_warehouses: - condition += " and warehouse in ({})".format(", ".join(["%s"] * len(for_warehouses))) - values += for_warehouses + query = query.where(SLE.warehouse.isin(for_warehouses)) if company: - condition += " and company = %s" - values.append(company) + query = query.where(SLE.company == company) - future_stock_vouchers = frappe.db.sql( - f"""select distinct sle.voucher_type, sle.voucher_no - from `tabStock Ledger Entry` sle - where - timestamp(sle.posting_date, sle.posting_time) >= timestamp(%s, %s) - and is_cancelled = 0 - {condition} - order by timestamp(sle.posting_date, sle.posting_time) asc, creation asc for update""", - tuple([posting_date, posting_time, *values]), - as_dict=True, - ) + future_stock_vouchers = query.run(as_dict=True) return [(d.voucher_type, d.voucher_no) for d in future_stock_vouchers] From 9eeccecd303fa30cb975dcdfad14cfd66db5f215 Mon Sep 17 00:00:00 2001 From: "Nihantra C. Patel" <141945075+Nihantra-Patel@users.noreply.github.com> Date: Fri, 22 May 2026 12:32:53 +0530 Subject: [PATCH 082/249] perf: skip delink_original_entry during cancellation when Immutable Ledger is enabled (#55130) * perf: get payment ledger and remove update from delink when immutable ledger is enabled * revert: changes of get_payment_ledger_entries * perf: skip delink_original_entry during cancellation when Immutable Ledger is enabled * test: for immutable ledger * test: add posting_date in create_sales_invoice * fix: link validation err with immutable ledger on * test: update testcase of the immutable ledger * refactor(test): simpler test for immutable invariants --------- Co-authored-by: ruthra kumar --- .../test_payment_ledger_entry.py | 83 ++++++++++++++++++- erpnext/accounts/general_ledger.py | 2 +- erpnext/accounts/utils.py | 9 +- 3 files changed, 87 insertions(+), 7 deletions(-) diff --git a/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py b/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py index c2528040e98..dbc5d9e146a 100644 --- a/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py +++ b/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py @@ -3,7 +3,8 @@ import frappe from frappe import qb -from frappe.utils import nowdate +from frappe.query_builder.functions import Count, Sum +from frappe.utils import add_days, nowdate from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry @@ -90,6 +91,7 @@ class TestPaymentLedgerEntry(ERPNextTestSuite): posting_date = nowdate() sinv = create_sales_invoice( + posting_date=posting_date, qty=qty, rate=rate, company=self.company, @@ -531,3 +533,82 @@ class TestPaymentLedgerEntry(ERPNextTestSuite): # with references removed, deletion should be possible so.delete() self.assertRaises(frappe.DoesNotExistError, frappe.get_doc, so.doctype, so.name) + + @ERPNextTestSuite.change_settings( + "Accounts Settings", + {"enable_immutable_ledger": 1}, + ) + def test_reverse_entries_on_cancel_for_immutable_ledger(self): + invoice_posting_date = add_days(nowdate(), -5) + gle = qb.DocType("GL Entry") + ple = qb.DocType("Payment Ledger Entry") + + si = self.create_sales_invoice(qty=1, rate=100, posting_date=invoice_posting_date) + + gles_before = ( + qb.from_(gle) + .select( + Count(gle.name), + ) + .where((gle.voucher_type == si.doctype) & (gle.voucher_no == si.name) & (gle.is_cancelled == 0)) + .run()[0][0] + ) + ples_before = ( + qb.from_(ple) + .select( + Count(ple.name), + ) + .where((ple.voucher_type == si.doctype) & (ple.voucher_no == si.name) & (ple.delinked.eq(0))) + .run()[0][0] + ) + + si.cancel() + + gles_after = ( + qb.from_(gle) + .select(Count(gle.account)) + .where((gle.voucher_type == si.doctype) & (gle.voucher_no == si.name) & (gle.is_cancelled == 0)) + .run()[0][0] + ) + self.assertEqual(gles_after, gles_before * 2) + + ples_after = ( + qb.from_(ple) + .select( + Count(ple.name), + ) + .where((ple.voucher_type == si.doctype) & (ple.voucher_no == si.name) & (ple.delinked.eq(0))) + .run()[0][0] + ) + self.assertEqual(ples_after, ples_before * 2) + + # assert debit/credit are reversed + gl_entries = ( + qb.from_(gle) + .select(gle.account, Sum(gle.debit).as_("total_debit"), Sum(gle.credit).as_("total_credit")) + .where((gle.voucher_type == si.doctype) & (gle.voucher_no == si.name) & (gle.is_cancelled == 0)) + .groupby(gle.account) + .run(as_dict=True) + ) + for gl in gl_entries: + with self.subTest(gl=gl): + self.assertEqual(gl.total_debit, gl.total_credit) + + # assert amounts are reversed + pl_entries = ( + qb.from_(ple) + .select(ple.account, Sum(ple.amount).as_("total_amount")) + .where((ple.voucher_type == si.doctype) & (ple.voucher_no == si.name) & (ple.delinked == 0)) + .groupby(ple.account) + .run(as_dict=True) + ) + for pl in pl_entries: + with self.subTest(pl=pl): + self.assertEqual(pl.total_amount, 0) + + self.assertFalse( + frappe.db.exists( + "Payment Ledger Entry", + {"voucher_type": si.doctype, "voucher_no": si.name, "delinked": 1}, + ) + ) diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py index 76b85066a80..406ca90232c 100644 --- a/erpnext/accounts/general_ledger.py +++ b/erpnext/accounts/general_ledger.py @@ -430,7 +430,7 @@ def make_entry(args, adv_adj, update_outstanding, from_repost=False): gle.flags.adv_adj = adv_adj gle.flags.update_outstanding = update_outstanding or "Yes" gle.flags.notify_update = False - if gle.is_cancelled: + if gle.is_cancelled or is_immutable_ledger_enabled(): gle.flags.ignore_links = True gle.submit() diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index bc7794b880b..52f5e9890f2 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -2142,8 +2142,9 @@ def create_payment_ledger_entry( ple = frappe.get_doc(entry) if cancel: - delink_original_entry(ple, partial_cancel=partial_cancel) - if is_immutable_ledger_enabled(): + if not is_immutable_ledger_enabled(): + delink_original_entry(ple, partial_cancel=partial_cancel) + else: ple.delinked = 0 ple.posting_date = frappe.form_dict.get("posting_date") or getdate() ple.flags.ignore_links = True @@ -2233,6 +2234,7 @@ def delink_original_entry(pl_entry, partial_cancel=False): qb.update(ple) .set(ple.modified, now()) .set(ple.modified_by, frappe.session.user) + .set(ple.delinked, True) .where( (ple.company == pl_entry.company) & (ple.account_type == pl_entry.account_type) @@ -2249,9 +2251,6 @@ def delink_original_entry(pl_entry, partial_cancel=False): if partial_cancel: query = query.where(ple.voucher_detail_no == pl_entry.voucher_detail_no) - if not is_immutable_ledger_enabled(): - query = query.set(ple.delinked, True) - query.run() From ace4e45cfeff53b0f096ff8b9df8cdd47a71974b Mon Sep 17 00:00:00 2001 From: Nishka Gosalia <58264710+nishkagosalia@users.noreply.github.com> Date: Fri, 22 May 2026 14:23:24 +0530 Subject: [PATCH 083/249] fix: edit stock uom qty for purchase documents (#55135) --- erpnext/stock/doctype/stock_settings/stock_settings.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.py b/erpnext/stock/doctype/stock_settings/stock_settings.py index 2d85675f2ea..8250186dc6d 100644 --- a/erpnext/stock/doctype/stock_settings/stock_settings.py +++ b/erpnext/stock/doctype/stock_settings/stock_settings.py @@ -320,9 +320,8 @@ def clean_all_descriptions(): @frappe.whitelist() def get_enable_stock_uom_editing(): - return frappe.get_cached_value( + return frappe.get_single_value( "Stock Settings", - None, ["allow_to_edit_stock_uom_qty_for_sales", "allow_to_edit_stock_uom_qty_for_purchase"], as_dict=1, ) From 1bc8d02cef32d8df29fa988deca3dd037466d1c5 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 11:42:06 +0200 Subject: [PATCH 084/249] refactor(queries): migrate item_query to Query Builder (#54834) * refactor(queries): migrate item_query to Query Builder Use Frappe Query Builder to ensure compatibility with PostgreSQL. The implementation still relies on raw SQL for fcond and mcond through LiteralValue to maintain compatibility with legacy filter builders. * refactor(queries): migrate item_query to Query Builder Fix the bugs found by coderabbit. For the eol condition: PostgreSQL raises DatetimeFieldOverflow when evaluating '0000-00-00' as a date literal, even inside NULLIF(). Added a db_type guard to skip the zero-date condition on PostgreSQL, where it can never be stored anyway. No generic cross-db solution found for this case; open to revisiting * refactor(queries): Rework item_query to use get_query Rework the item_query method to use get_query with the ignore_permissions flag at False * refactor(controller): Fix the query builder Fix the build query in item_query according to coderabbit * refactor(queries): explicitly add has_variants Explicitely add has_variants==0 to the query according to coderabbit feedback --- erpnext/controllers/queries.py | 157 +++++++++++++++++++-------------- 1 file changed, 93 insertions(+), 64 deletions(-) diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index 5be68e60591..07dbc43f0e1 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -9,10 +9,11 @@ import frappe from frappe import qb, scrub from frappe.desk.reportview import get_filters_cond, get_match_cond from frappe.permissions import has_permission -from frappe.query_builder import Criterion, CustomFunction -from frappe.query_builder.functions import Concat, Locate, Sum +from frappe.query_builder import Case, Criterion, DocType, Field +from frappe.query_builder.functions import Concat, CustomFunction, Length, Locate, Substring, Sum from frappe.utils import nowdate, today, unique from pypika import Order +from pypika.terms import LiteralValue import erpnext from erpnext.accounts.utils import build_qb_match_conditions @@ -187,38 +188,14 @@ def item_query( filters: dict | str | None = None, as_dict: bool = False, ): + """ + Fetch items for link fields + """ doctype = "Item" - conditions = [] if isinstance(filters, str): filters = json.loads(filters) - # Get searchfields from meta and use in Item Link field query - meta = frappe.get_meta(doctype, cached=True) - searchfields = meta.get_search_fields() - - columns = "" - extra_searchfields = [field for field in searchfields if field not in ["name", "description"]] - - if extra_searchfields: - columns += ", " + ", ".join(extra_searchfields) - - if "description" in searchfields: - columns += """, if(length(tabItem.description) > 40, \ - concat(substr(tabItem.description, 1, 40), "..."), description) as description""" - - searchfields = searchfields + [ - field - for field in [ - searchfield or "name", - "item_code", - "item_group", - "item_name", - ] - if field not in searchfields - ] - searchfields = " or ".join([field + " like %(txt)s" for field in searchfields]) - if filters and isinstance(filters, dict): if filters.get("customer") or filters.get("supplier"): party = filters.get("customer") or filters.get("supplier") @@ -251,43 +228,95 @@ def item_query( filters.pop("customer", None) filters.pop("supplier", None) - description_cond = "" - if frappe.db.estimate_count(doctype) < 50000: - # scan description only if items are less than 50000 - description_cond = "or tabItem.description LIKE %(txt)s" + item = DocType(doctype) - return frappe.db.sql( - """select - tabItem.name {columns} - from tabItem - where tabItem.docstatus < 2 - and tabItem.disabled=0 - and tabItem.has_variants=0 - and (tabItem.end_of_life > %(today)s or ifnull(tabItem.end_of_life, '0000-00-00')='0000-00-00') - and ({scond} or tabItem.item_code IN (select parent from `tabItem Barcode` where barcode LIKE %(txt)s) - {description_cond}) - {fcond} {mcond} - order by - if(locate(%(_txt)s, name), locate(%(_txt)s, name), 99999), - if(locate(%(_txt)s, item_name), locate(%(_txt)s, item_name), 99999), - idx desc, - name, item_name - limit %(start)s, %(page_len)s """.format( - columns=columns, - scond=searchfields, - fcond=get_filters_cond(doctype, filters, conditions).replace("%", "%%"), - mcond=get_match_cond(doctype).replace("%", "%%"), - description_cond=description_cond, - ), - { - "today": nowdate(), - "txt": "%%%s%%" % txt, - "_txt": txt.replace("%", ""), - "start": start, - "page_len": page_len, - }, - as_dict=as_dict, + # Condition for the date + eol = item.end_of_life + date_conditions = [eol > nowdate(), eol.isnull()] + # Add the condition if the db can evaluate it + if frappe.db.db_type not in ["postgres"]: + date_conditions.append(eol == "0000-00-00") + + date_condition = Criterion.any(date_conditions) + + # Condition for the searchfields + meta = frappe.get_meta("Item", cached=True) + searchfields = meta.get_search_fields() + query_select = [] + + extra_searchfields = [field for field in searchfields if field not in ["name", "description"]] + + for field in extra_searchfields: + query_select.append(item[field]) + + if "description" in searchfields: + description_col = ( + Case() + .when(Length(item.description) > 40, Concat(Substring(item.description, 1, 40), "...")) + .else_(item.description) + ).as_("description") + + query_select.append(description_col) + + fields_to_process = list( + dict.fromkeys( + searchfields + + [ + field + for field in [ + searchfield or "name", + "item_code", + "item_group", + "item_name", + ] + if field not in searchfields + ] + ) ) + db_fields = [f.fieldname for f in meta.fields] + ["name"] + search_str = f"%{txt}%" + search_conditions = [] + for fieldname in fields_to_process: + if fieldname in db_fields: + search_conditions.append(item[fieldname].like(search_str)) + + barcode_tbl = DocType("Item Barcode") + barcode_subquery = ( + frappe.qb.from_(barcode_tbl).select(barcode_tbl.parent).where(barcode_tbl.barcode.like(search_str)) + ) + search_conditions.append(item.item_code.isin(barcode_subquery)) + + # Condition for the description + if frappe.db.estimate_count("Item") < 50000 and "description" not in fields_to_process: + search_conditions.append(item.description.like(search_str)) + + txt_no_percent = txt.replace("%", "") + + # Building the query + query = ( + frappe.get_query(doctype, filters=filters, ignore_permissions=False) + .select(*query_select) + .where(item.docstatus < 2) + .where(item.disabled == 0) + .where(item.has_variants == 0) + .where(date_condition) + .where(Criterion.any(search_conditions)) + .orderby( + Case().when(Locate(txt_no_percent, item.name) > 0, Locate(txt_no_percent, item.name)).else_(99999) + ) + .orderby( + Case() + .when(Locate(txt_no_percent, item.item_name) > 0, Locate(txt_no_percent, item.item_name)) + .else_(99999) + ) + .orderby(item.idx, order=Order.desc) + .orderby(item.name) + .orderby(item.item_name) + .limit(page_len) + .offset(start) + ) + + return query.run(as_dict=as_dict) @frappe.whitelist() From b84ec2d22a4cd00019898d7a8b947506a3aa7278 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 12:34:18 +0200 Subject: [PATCH 085/249] refactor(territory_wise_sales): replace SQL with query builder (#55176) --- .../territory_wise_sales/territory_wise_sales.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py index e31b259d731..48d469e795e 100644 --- a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py +++ b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py @@ -133,17 +133,13 @@ def get_quotations(opportunities): if not opportunities: return [] - opportunity_names = [o.name for o in opportunities] + opportunity_names = [o.get("name") for o in opportunities] - return frappe.db.sql( - """ - SELECT `name`,`base_grand_total`, `opportunity` - FROM `tabQuotation` - WHERE docstatus=1 AND opportunity in ({}) - """.format(", ".join(["%s"] * len(opportunity_names))), - tuple(opportunity_names), - as_dict=1, - ) # nosec + return frappe.get_all( + "Quotation", + fields=["name", "base_grand_total", "opportunity"], + filters={"docstatus": 1, "opportunity": ["in", opportunity_names]}, + ) def get_sales_orders(quotations): From 82d19677edac526f6b56b55fa740535d591a3cd9 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 12:35:33 +0200 Subject: [PATCH 086/249] refactor(supplier_scorecard_variable): replace sql with query builder (#55164) --- .../supplier_scorecard_variable.py | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py index 5728aa81925..23ce6c56f01 100644 --- a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +++ b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py @@ -82,29 +82,25 @@ def get_item_workdays(scorecard): def get_total_cost_of_shipments(scorecard): """Gets the total cost of all shipments in the period (based on Purchase Orders)""" - supplier = frappe.get_doc("Supplier", scorecard.supplier) - # Look up all PO Items with delivery dates between our dates - data = frappe.db.sql( - """ - SELECT - SUM(po_item.base_amount) - FROM - `tabPurchase Order Item` po_item, - `tabPurchase Order` po - WHERE - po.supplier = %(supplier)s - AND po_item.schedule_date BETWEEN %(start_date)s AND %(end_date)s - AND po_item.docstatus = 1 - AND po_item.parent = po.name""", - {"supplier": supplier.name, "start_date": scorecard.start_date, "end_date": scorecard.end_date}, - as_dict=0, - )[0][0] + from frappe.query_builder.functions import Sum - if data: - return data - else: - return 0 + PO = frappe.qb.DocType("Purchase Order") + PO_Item = frappe.qb.DocType("Purchase Order Item") + + query = ( + frappe.qb.from_(PO_Item) + .join(PO) + .on(PO_Item.parent == PO.name) + .select(Sum(PO_Item.base_amount)) + .where(PO.supplier == scorecard.supplier) + .where(PO_Item.schedule_date[scorecard.start_date : scorecard.end_date]) # Syntaxe BETWEEN + .where(PO_Item.docstatus == 1) + ) + + result = query.run(as_list=True) + total_cost = result[0][0] if result and result[0][0] is not None else 0 + return total_cost def get_cost_of_delayed_shipments(scorecard): From 2eb2defd907cef44a60ff38a4825e486eecde9d7 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 12:36:04 +0200 Subject: [PATCH 087/249] refactor(supplier_scorecard_variable): replace sql with query builder (#55163) --- .../supplier_scorecard_variable.py | 49 +++++++++---------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py index 23ce6c56f01..f486fd2499d 100644 --- a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +++ b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py @@ -110,35 +110,32 @@ def get_cost_of_delayed_shipments(scorecard): def get_cost_of_on_time_shipments(scorecard): """Gets the total cost of all on_time shipments in the period (based on Purchase Receipts)""" - supplier = frappe.get_doc("Supplier", scorecard.supplier) - # Look up all PO Items with delivery dates between our dates + from frappe.query_builder.functions import Sum - total_delivered_on_time_costs = frappe.db.sql( - """ - SELECT - SUM(pr_item.base_amount) - FROM - `tabPurchase Order Item` po_item, - `tabPurchase Receipt Item` pr_item, - `tabPurchase Order` po, - `tabPurchase Receipt` pr - WHERE - po.supplier = %(supplier)s - AND po_item.schedule_date BETWEEN %(start_date)s AND %(end_date)s - AND po_item.schedule_date >= pr.posting_date - AND pr_item.docstatus = 1 - AND pr_item.purchase_order_item = po_item.name - AND po_item.parent = po.name - AND pr_item.parent = pr.name""", - {"supplier": supplier.name, "start_date": scorecard.start_date, "end_date": scorecard.end_date}, - as_dict=0, - )[0][0] + PO = frappe.qb.DocType("Purchase Order") + PO_Item = frappe.qb.DocType("Purchase Order Item") + PR = frappe.qb.DocType("Purchase Receipt") + PR_Item = frappe.qb.DocType("Purchase Receipt Item") - if total_delivered_on_time_costs: - return total_delivered_on_time_costs - else: - return 0 + query = ( + frappe.qb.from_(PR_Item) + .join(PR) + .on(PR_Item.parent == PR.name) + .join(PO_Item) + .on(PR_Item.purchase_order_item == PO_Item.name) + .join(PO) + .on(PO_Item.parent == PO.name) + .select(Sum(PR_Item.base_amount)) + .where(PO.supplier == scorecard.supplier) + .where(PO_Item.schedule_date[scorecard.start_date : scorecard.end_date]) + .where(PO_Item.schedule_date >= PR.posting_date) + .where(PR_Item.docstatus == 1) + ) + + result = query.run(as_list=True) + total_costs = result[0][0] if result and result[0][0] is not None else 0 + return total_costs def get_total_days_late(scorecard): From e75de4d33765c5eac97cdb2cb55af51104aad041 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 12:36:30 +0200 Subject: [PATCH 088/249] refactor(supplier_scorecard_variable): replace sql with query builder (#55167) --- .../supplier_scorecard_variable.py | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py index f486fd2499d..f5c59a3901a 100644 --- a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +++ b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py @@ -58,25 +58,24 @@ def get_total_workdays(scorecard): def get_item_workdays(scorecard): """Gets the number of days in this period""" - supplier = frappe.get_doc("Supplier", scorecard.supplier) - total_item_days = frappe.db.sql( - """ - SELECT - SUM(DATEDIFF( %(end_date)s, po_item.schedule_date) * (po_item.qty)) - FROM - `tabPurchase Order Item` po_item, - `tabPurchase Order` po - WHERE - po.supplier = %(supplier)s - AND po_item.received_qty < po_item.qty - AND po_item.schedule_date BETWEEN %(start_date)s AND %(end_date)s - AND po_item.parent = po.name""", - {"supplier": supplier.name, "start_date": scorecard.start_date, "end_date": scorecard.end_date}, - as_dict=0, - )[0][0] - if not total_item_days: - total_item_days = 0 + from frappe.query_builder.functions import Sum + + PO = frappe.qb.DocType("Purchase Order") + PO_Item = frappe.qb.DocType("Purchase Order Item") + + query = ( + frappe.qb.from_(PO_Item) + .join(PO) + .on(PO_Item.parent == PO.name) + .select(Sum(frappe.qb.fn.DATEDIFF(scorecard.end_date, PO_Item.schedule_date) * (PO_Item.qty))) + .where(PO.supplier == scorecard.supplier) + .where(PO_Item.received_qty < PO_Item.qty) + .where(PO_Item.schedule_date[scorecard.start_date : scorecard.end_date]) # Équivalent du BETWEEN + ) + + result = query.run(as_list=True) + total_item_days = result[0][0] if result and result[0][0] is not None else 0 return total_item_days From ab99c9a54ee7b55a969fddbb65fa4d8a4137b908 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 12:37:12 +0200 Subject: [PATCH 089/249] refactor(supplier_scorecard): Replace sql with orm (#55170) --- .../supplier_scorecard/supplier_scorecard.py | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py index d791c354cf8..8ff32a47ec6 100644 --- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py @@ -207,25 +207,16 @@ def make_all_scorecards(docname: str): while (start_date < todays) and (end_date <= todays): # check to make sure there is no scorecard period already created - scorecards = frappe.db.sql( - """ - SELECT - scp.name - FROM - `tabSupplier Scorecard Period` scp - WHERE - scp.scorecard = %(sc)s - AND scp.docstatus = 1 - AND ( - (scp.start_date > %(end_date)s - AND scp.end_date < %(start_date)s) - OR - (scp.start_date < %(end_date)s - AND scp.end_date > %(start_date)s)) - ORDER BY - scp.end_date DESC""", - {"sc": docname, "start_date": start_date, "end_date": end_date}, - as_dict=1, + scorecards = frappe.get_all( + "Supplier Scorecard Period", + fields=["name"], + filters={ + "scorecard": docname, + "docstatus": 1, + "start_date": ["<", end_date], + "end_date": [">", start_date], + }, + order_by="end_date desc", ) if len(scorecards) == 0: period_card = make_supplier_scorecard(docname, None) From f6bf7d85add89ed8d882a7c601b04007e684f6a5 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 12:39:15 +0200 Subject: [PATCH 090/249] refactor(supplier_qotation): Replace sql by query builder (#55154) --- .../supplier_quotation/supplier_quotation.py | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py index 4f94a89870b..b47941e945a 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py @@ -170,6 +170,8 @@ class SupplierQuotation(BuyingController): frappe.throw(_("Valid till Date cannot be before Transaction Date")) def update_rfq_supplier_status(self, include_me): + from frappe.query_builder.functions import Count + rfq_list = set([]) for item in self.items: if item.request_for_quotation: @@ -194,22 +196,25 @@ class SupplierQuotation(BuyingController): ) quote_status = _("Received") + + SQ = frappe.qb.DocType("Supplier Quotation") + SQ_Item = frappe.qb.DocType("Supplier Quotation Item") + for item in doc.items: - sqi_count = frappe.db.sql( - """ - SELECT - COUNT(sqi.name) as count - FROM - `tabSupplier Quotation Item` as sqi, - `tabSupplier Quotation` as sq - WHERE sq.supplier = %(supplier)s - AND sqi.docstatus = 1 - AND sq.name != %(me)s - AND sqi.request_for_quotation_item = %(rqi)s - AND sqi.parent = sq.name""", - {"supplier": self.supplier, "rqi": item.name, "me": self.name}, - as_dict=1, - )[0] + query = ( + frappe.qb.from_(SQ_Item) + .join(SQ) + .on(SQ_Item.parent == SQ.name) + .select(Count(SQ_Item.name).as_("count")) + .where(SQ.supplier == self.supplier) + .where(SQ_Item.docstatus == 1) + .where(SQ.name != self.name) + .where(SQ_Item.request_for_quotation_item == item.name) + ) + + result = query.run(as_dict=True) + sqi_count = result[0] if result else frappe._dict(count=0) + self_count = ( sum(my_item.request_for_quotation_item == item.name for my_item in self.items) if include_me From 1135429181e2186d5d3c15fc671dcb3e3d2af18e Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 12:39:41 +0200 Subject: [PATCH 091/249] refactor(territory_wise_sales):replace sql with orm (#55177) --- .../territory_wise_sales.py | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py index 48d469e795e..3e239635add 100644 --- a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py +++ b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py @@ -104,29 +104,20 @@ def get_data(filters=None): def get_opportunities(filters): - conditions = "" + orm_filters = {} if filters.get("transaction_date"): - conditions = " WHERE transaction_date between {} and {}".format( - frappe.db.escape(filters["transaction_date"][0]), - frappe.db.escape(filters["transaction_date"][1]), - ) + orm_filters["transaction_date"] = [ + "between", + [filters["transaction_date"][0], filters["transaction_date"][1]], + ] - if filters.company: - if conditions: - conditions += " AND" - else: - conditions += " WHERE" - conditions += " company = %(company)s" + if filters.get("company"): + orm_filters["company"] = filters["company"] - return frappe.db.sql( - f""" - SELECT name, territory, opportunity_amount - FROM `tabOpportunity` {conditions} - """, - filters, - as_dict=1, - ) # nosec + return frappe.get_all( + "Opportunity", fields=["name", "territory", "opportunity_amount"], filters=orm_filters + ) def get_quotations(opportunities): From e7c4fb85f8271768cbfff6d462aeda2f35184b15 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 12:40:18 +0200 Subject: [PATCH 092/249] refactor(request_for_quotation): Use query builder instead of SQL (#55171) --- .../request_for_quotation.py | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py index 42ba9004150..e5a498677ce 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py @@ -575,27 +575,29 @@ def get_pdf( def get_item_from_material_requests_based_on_supplier( source_name: str, target_doc: str | Document | None = None ): - mr_items_list = frappe.db.sql( - """ - SELECT - mr.name, mr_item.item_code - FROM - `tabItem` as item, - `tabItem Supplier` as item_supp, - `tabMaterial Request Item` as mr_item, - `tabMaterial Request` as mr - WHERE item_supp.supplier = %(supplier)s - AND item.name = item_supp.parent - AND mr_item.parent = mr.name - AND mr_item.item_code = item.name - AND mr.status != "Stopped" - AND mr.material_request_type = "Purchase" - AND mr.docstatus = 1 - AND mr.per_ordered < 99.99""", - {"supplier": source_name}, - as_dict=1, + Item = frappe.qb.DocType("Item") + Item_Supp = frappe.qb.DocType("Item Supplier") + MR = frappe.qb.DocType("Material Request") + MR_Item = frappe.qb.DocType("Material Request Item") + + query = ( + frappe.qb.from_(MR_Item) + .join(MR) + .on(MR_Item.parent == MR.name) + .join(Item) + .on(MR_Item.item_code == Item.name) + .join(Item_Supp) + .on(Item.name == Item_Supp.parent) + .select(MR.name, MR_Item.item_code) + .where(Item_Supp.supplier == source_name) + .where(MR.status != "Stopped") + .where(MR.material_request_type == "Purchase") + .where(MR.docstatus == 1) + .where(MR.per_ordered < 99.99) ) + mr_items_list = query.run(as_dict=True) + material_requests = {} for d in mr_items_list: material_requests.setdefault(d.name, []).append(d.item_code) From 30ba93fb8f299e0ee51ebf527393c72a64f82063 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 12:40:40 +0200 Subject: [PATCH 093/249] refactor(supplier_quotation): Replace SQL by the orm (#55155) --- .../supplier_quotation/supplier_quotation.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py index b47941e945a..c7fa6ecfc63 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py @@ -347,14 +347,12 @@ def make_quotation(source_name: str, target_doc: str | Document | None = None): def set_expired_status(): - frappe.db.sql( - """ - UPDATE - `tabSupplier Quotation` SET `status` = 'Expired' - WHERE - `status` not in ('Cancelled', 'Stopped') AND `valid_till` < %s - """, - (nowdate()), + frappe.db.set_value( + "Supplier Quotation", + filters={"status": ["not in", ["Cancelled", "Stopped"]], "valid_till": ["<", nowdate()]}, + fieldname="status", + value="Expired", + update_modified=True, ) From f5899b55195167c864609b30f60da8dd5fb598c5 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 12:41:04 +0200 Subject: [PATCH 094/249] refactor(supplier_scorecard):replace sql with orm (#55161) --- .../supplier_scorecard/supplier_scorecard.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py index 8ff32a47ec6..bca1c74e380 100644 --- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py @@ -89,19 +89,11 @@ class SupplierScorecard(Document): throw(_("Criteria weights must add up to 100%")) def calculate_total_score(self): - scorecards = frappe.db.sql( - """ - SELECT - scp.name - FROM - `tabSupplier Scorecard Period` scp - WHERE - scp.scorecard = %(sc)s - AND scp.docstatus = 1 - ORDER BY - scp.end_date DESC""", - {"sc": self.name}, - as_dict=1, + scorecards = frappe.get_all( + "Supplier Scorecard Period", + fields=["name"], + filters={"scorecard": self.name, "docstatus": 1}, + order_by="end_date desc", ) period = 0 From 1b23ef2ff4ee0fcebe322b25e1fb376cb756db9c Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 12:41:48 +0200 Subject: [PATCH 095/249] refactor(request_for_quotation): use query builder instead of SQL (#55172) --- .../request_for_quotation.py | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py index e5a498677ce..3ba026c8a81 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py @@ -378,25 +378,29 @@ class RequestforQuotation(BuyingController): return [d.name for d in get_attachments(self.doctype, self.name)] def update_rfq_supplier_status(self, sup_name=None): + from frappe.query_builder.functions import Count + + SQ = frappe.qb.DocType("Supplier Quotation") + SQ_Item = frappe.qb.DocType("Supplier Quotation Item") + for supplier in self.suppliers: if sup_name is None or supplier.supplier == sup_name: quote_status = _("Received") for item in self.items: - sqi_count = frappe.db.sql( - """ - SELECT - COUNT(sqi.name) as count - FROM - `tabSupplier Quotation Item` as sqi, - `tabSupplier Quotation` as sq - WHERE sq.supplier = %(supplier)s - AND sqi.docstatus = 1 - AND sqi.request_for_quotation_item = %(rqi)s - AND sqi.parent = sq.name""", - {"supplier": supplier.supplier, "rqi": item.name}, - as_dict=1, - )[0] - if (sqi_count.count) == 0: + query = ( + frappe.qb.from_(SQ_Item) + .join(SQ) + .on(SQ_Item.parent == SQ.name) + .select(Count(SQ_Item.name).as_("count")) + .where(SQ.supplier == supplier.supplier) + .where(SQ_Item.docstatus == 1) + .where(SQ_Item.request_for_quotation_item == item.name) + ) + + result = query.run(as_dict=True) + sqi_count = result[0] if result else frappe._dict(count=0) + + if sqi_count.count == 0: quote_status = _("Pending") supplier.quote_status = quote_status From 8fb962e50e0c8659d560ef45e2f0e1d8da240b57 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 12:44:30 +0200 Subject: [PATCH 096/249] refactor(supplier_scorecard_variable):replace sql with query builder (#55168) --- .../supplier_scorecard_variable.py | 50 +++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py index f5c59a3901a..e48f64b9bd2 100644 --- a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +++ b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py @@ -185,35 +185,33 @@ def get_total_days_late(scorecard): def get_on_time_shipments(scorecard): - """Gets the number of late shipments (counting each item) in the period (based on Purchase Receipts vs POs)""" + """Gets the number of on time shipments (counting each item) in the period (based on Purchase Receipts vs POs)""" - supplier = frappe.get_doc("Supplier", scorecard.supplier) + from frappe.query_builder.functions import Count - # Look up all PO Items with delivery dates between our dates - total_items_delivered_on_time = frappe.db.sql( - """ - SELECT - COUNT(pr_item.qty) - FROM - `tabPurchase Order Item` po_item, - `tabPurchase Receipt Item` pr_item, - `tabPurchase Order` po, - `tabPurchase Receipt` pr - WHERE - po.supplier = %(supplier)s - AND po_item.schedule_date BETWEEN %(start_date)s AND %(end_date)s - AND po_item.schedule_date <= pr.posting_date - AND po_item.qty = pr_item.qty - AND pr_item.docstatus = 1 - AND pr_item.purchase_order_item = po_item.name - AND po_item.parent = po.name - AND pr_item.parent = pr.name""", - {"supplier": supplier.name, "start_date": scorecard.start_date, "end_date": scorecard.end_date}, - as_dict=0, - )[0][0] + PO = frappe.qb.DocType("Purchase Order") + PO_Item = frappe.qb.DocType("Purchase Order Item") + PR = frappe.qb.DocType("Purchase Receipt") + PR_Item = frappe.qb.DocType("Purchase Receipt Item") - if not total_items_delivered_on_time: - total_items_delivered_on_time = 0 + query = ( + frappe.qb.from_(PR_Item) + .join(PR) + .on(PR_Item.parent == PR.name) + .join(PO_Item) + .on(PR_Item.purchase_order_item == PO_Item.name) + .join(PO) + .on(PO_Item.parent == PO.name) + .select(Count(PR_Item.qty)) + .where(PO.supplier == scorecard.supplier) + .where(PO_Item.schedule_date[scorecard.start_date : scorecard.end_date]) + .where(PO_Item.schedule_date >= PR.posting_date) + .where(PO_Item.qty == PR_Item.qty) + .where(PR_Item.docstatus == 1) + ) + + result = query.run(as_list=True) + total_items_delivered_on_time = result[0][0] if result and result[0][0] is not None else 0 return total_items_delivered_on_time From b71eacd6b3b1f6340a6475b7b032eca2d691337f Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Fri, 22 May 2026 16:44:09 +0530 Subject: [PATCH 097/249] fix: invalid filter on item_group (#55186) --- erpnext/stock/doctype/item/item.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index c03199e4348..51fa652d310 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -287,13 +287,6 @@ frappe.ui.form.on("Item", { }); frm.set_df_property("is_fixed_asset", "read_only", frm.doc.__onload?.asset_exists ? 1 : 0); frm.toggle_reqd("customer", frm.doc.is_customer_provided_item ? 1 : 0); - frm.set_query("item_group", () => { - return { - filters: { - is_group: 0, - }, - }; - }); }, validate: function (frm) { @@ -548,12 +541,6 @@ $.extend(erpnext.item, { }; }; - frm.fields_dict["item_group"].get_query = function (doc, cdt, cdn) { - return { - filters: [["Item Group", "docstatus", "!=", 2]], - }; - }; - frm.fields_dict["item_defaults"].grid.get_field("deferred_revenue_account").get_query = function ( doc, cdt, From 9d8f3863f2e9f2016247477502e77f77dccb1106 Mon Sep 17 00:00:00 2001 From: nareshkannasln Date: Fri, 22 May 2026 16:47:46 +0530 Subject: [PATCH 098/249] fix(project): update customer and sales order as no copy --- erpnext/projects/doctype/project/project.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json index 95bf037c5e5..8f5a9b03813 100644 --- a/erpnext/projects/doctype/project/project.json +++ b/erpnext/projects/doctype/project/project.json @@ -181,6 +181,7 @@ "fieldtype": "Link", "in_global_search": 1, "label": "Customer", + "no_copy": 1, "oldfieldname": "customer", "oldfieldtype": "Link", "options": "Customer", @@ -195,6 +196,7 @@ "fieldname": "sales_order", "fieldtype": "Link", "label": "Sales Order", + "no_copy": 1, "options": "Sales Order" }, { @@ -480,7 +482,7 @@ "index_web_pages_for_search": 1, "links": [], "max_attachments": 4, - "modified": "2026-04-14 18:17:40.676750", + "modified": "2026-05-22 16:45:50.762759", "modified_by": "Administrator", "module": "Projects", "name": "Project", From e11e386fff6504c077c995cb082764930eeaf93e Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 13:45:56 +0200 Subject: [PATCH 099/249] refactor(territory_wise_sales):replace sql with query builder (#55174) --- .../territory_wise_sales.py | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py index 3e239635add..f07550c9091 100644 --- a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py +++ b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py @@ -154,17 +154,21 @@ def get_sales_invoice(sales_orders): if not sales_orders: return [] - so_names = [so.name for so in sales_orders] + so_names = [so.get("name") for so in sales_orders] - return frappe.db.sql( - """ - SELECT si.name, si.base_grand_total, sii.sales_order - FROM `tabSales Invoice` si, `tabSales Invoice Item` sii - WHERE si.docstatus=1 AND si.name = sii.parent AND sii.sales_order in ({}) - """.format(", ".join(["%s"] * len(so_names))), - tuple(so_names), - as_dict=1, - ) # nosec + SalesInvoice = frappe.qb.DocType("Sales Invoice") + SalesInvoiceItem = frappe.qb.DocType("Sales Invoice Item") + + query = ( + frappe.qb.from_(SalesInvoice) + .join(SalesInvoiceItem) + .on(SalesInvoice.name == SalesInvoiceItem.parent) + .select(SalesInvoice.name, SalesInvoice.base_grand_total, SalesInvoiceItem.sales_order) + .where(SalesInvoice.docstatus == 1) + .where(SalesInvoiceItem.sales_order.isin(so_names)) + ) + + return query.run(as_dict=True) def _get_total(doclist, amount_field="base_grand_total"): From 98c2ec528c7f6e44503e9497f81bddd62bffb992 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Fri, 22 May 2026 13:56:10 +0200 Subject: [PATCH 100/249] refactor(territory_wise_sales): replace sql with query builder (#55175) --- .../territory_wise_sales.py | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py index f07550c9091..a134bd2915a 100644 --- a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py +++ b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py @@ -137,17 +137,21 @@ def get_sales_orders(quotations): if not quotations: return [] - quotation_names = [q.name for q in quotations] + quotation_names = [q.get("name") for q in quotations] - return frappe.db.sql( - """ - SELECT so.`name`, so.`base_grand_total`, soi.prevdoc_docname as quotation - FROM `tabSales Order` so, `tabSales Order Item` soi - WHERE so.docstatus=1 AND so.name = soi.parent AND soi.prevdoc_docname in ({}) - """.format(", ".join(["%s"] * len(quotation_names))), - tuple(quotation_names), - as_dict=1, - ) # nosec + SalesOrder = frappe.qb.DocType("Sales Order") + SalesOrderItem = frappe.qb.DocType("Sales Order Item") + + query = ( + frappe.qb.from_(SalesOrder) + .join(SalesOrderItem) + .on(SalesOrder.name == SalesOrderItem.parent) + .select(SalesOrder.name, SalesOrder.base_grand_total, SalesOrderItem.prevdoc_docname.as_("quotation")) + .where(SalesOrder.docstatus == 1) + .where(SalesOrderItem.prevdoc_docname.isin(quotation_names)) + ) + + return query.run(as_dict=True) def get_sales_invoice(sales_orders): From 3aaa828e328978e5260d2f21b5cb0784a1d8854d Mon Sep 17 00:00:00 2001 From: MochaMind Date: Sat, 23 May 2026 04:17:48 +0530 Subject: [PATCH 101/249] fix: sync translations from crowdin (#55118) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- erpnext/locale/fr.po | 14 +++++++------- erpnext/locale/sv.po | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/erpnext/locale/fr.po b/erpnext/locale/fr.po index 5eb2ae85198..97b23eb5dd4 100644 --- a/erpnext/locale/fr.po +++ b/erpnext/locale/fr.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" "POT-Creation-Date: 2026-05-17 10:04+0000\n" -"PO-Revision-Date: 2026-05-18 20:20\n" +"PO-Revision-Date: 2026-05-20 21:03\n" "Last-Translator: hello@frappe.io\n" "Language-Team: French\n" "MIME-Version: 1.0\n" @@ -13338,7 +13338,7 @@ msgstr "Créer une offre fournisseur" #. Label of an action in the Onboarding Step 'Create Tasks' #: erpnext/projects/onboarding_step/create_tasks/create_tasks.json msgid "Create Task" -msgstr "" +msgstr "Créer une tâche" #. Title of an Onboarding Step #: erpnext/projects/onboarding_step/create_tasks/create_tasks.json @@ -17718,7 +17718,7 @@ msgstr "" #: erpnext/setup/install.py:198 msgid "Documentation" -msgstr "" +msgstr "Documentation" #. Description of the 'Reconciliation Queue Size' (Int) field in DocType #. 'Accounts Settings' @@ -18123,7 +18123,7 @@ msgstr "" #. Label of a Desktop Icon #: erpnext/desktop_icon/erpnext.json msgid "ERPNext" -msgstr "" +msgstr "ERPNext" #. Label of a Desktop Icon #. Name of a Workspace @@ -25200,7 +25200,7 @@ msgstr "Investissements" #. Label of an action in the Onboarding Step 'Invite Users' #: erpnext/setup/onboarding_step/invite_users/invite_users.json msgid "Invite Users" -msgstr "" +msgstr "Inviter des utilisateurs" #. Option for the 'Posting Date Inheritance for Exchange Gain / Loss' (Select) #. field in DocType 'Accounts Settings' @@ -32912,7 +32912,7 @@ msgstr "" #. Order' #: erpnext/subcontracting/doctype/subcontracting_inward_order/subcontracting_inward_order.json msgid "Ongoing" -msgstr "" +msgstr "En cours" #: erpnext/manufacturing/dashboard_fixtures.py:228 msgid "Ongoing Job Cards" @@ -53013,7 +53013,7 @@ msgstr "Basculer entre les modes de paiement" #: banking/src/components/features/Settings/Preferences.tsx:186 msgid "Switch between light, dark, or system theme" -msgstr "" +msgstr "Basculer entre le thème clair, sombre ou système" #: erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js:23 msgid "Sync Now" diff --git a/erpnext/locale/sv.po b/erpnext/locale/sv.po index 90a7933cc01..947864f2083 100644 --- a/erpnext/locale/sv.po +++ b/erpnext/locale/sv.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" "POT-Creation-Date: 2026-05-17 10:04+0000\n" -"PO-Revision-Date: 2026-05-18 20:21\n" +"PO-Revision-Date: 2026-05-22 21:18\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -1799,7 +1799,7 @@ msgstr "Bokföring Dimension" #: erpnext/accounts/doctype/gl_entry/gl_entry.py:213 #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:150 msgid "Accounting Dimension {0} is required for 'Balance Sheet' account {1}." -msgstr "Bokföring Dimension {0} erfordras för 'Saldo Rapport' konto {1}." +msgstr "Bokföring Dimension {0} erfordras för 'Balans Rapport' konto {1}." #: erpnext/accounts/doctype/gl_entry/gl_entry.py:200 #: erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:138 @@ -7265,7 +7265,7 @@ msgstr "Balans Rapport" #. Closing Voucher' #: erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.json msgid "Balance Sheet Closing Balance" -msgstr "Balansräkning Stängning Saldo" +msgstr "Balans Rapport Stängning Saldo" #. Label of the balance_sheet_summary (Heading) field in DocType 'Bisect #. Accounting Statements' @@ -17705,7 +17705,7 @@ msgstr "Visa inte någon valuta symbol t.ex. $." #. Settings' #: erpnext/stock/doctype/item_variant_settings/item_variant_settings.json msgid "Do not update variants on save" -msgstr "Uppdatera inte varianter vid spara" +msgstr "Uppdatera inte Varianter vid Spara" #: erpnext/assets/doctype/asset/asset.js:955 msgid "Do you really want to restore this scrapped asset?" @@ -20217,7 +20217,7 @@ msgstr "Fält i Bank Transaktion" #. 'Item Variant Settings' #: erpnext/stock/doctype/item_variant_settings/item_variant_settings.json msgid "Fields will be copied over only at time of creation." -msgstr "Fält kopieras över endast vid skapande tid." +msgstr "Fält kopieras över endast när variant skapas." #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1068 msgid "File does not belong to this Transaction Deletion Record" @@ -20423,7 +20423,7 @@ msgstr "Finansiella Tjänster" #: erpnext/accounts/workspace/financial_reports/financial_reports.json #: erpnext/public/js/financial_statements.js:312 msgid "Financial Statements" -msgstr "Finans Rapporter" +msgstr "Bokslut" #: erpnext/public/js/setup_wizard.js:48 msgid "Financial Year Begins On" @@ -35583,7 +35583,7 @@ msgstr "ID Handling Detaljer" #. Label of the passport_number (Data) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "Passport Number" -msgstr "ID Handling Nummer" +msgstr "Pass Nummer" #: erpnext/accounts/doctype/subscription/subscription_list.js:10 msgid "Past Due Date" @@ -36352,7 +36352,7 @@ msgstr "Betalningar uppdaterade." #. Account' #: erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json msgid "Payroll Entry" -msgstr "Lön Post" +msgstr "Löneregistrering" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:156 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:262 @@ -59194,7 +59194,7 @@ msgstr "Visa Stycklista Uppdatering Logg" #: erpnext/accounts/onboarding_step/view_balance_sheet/view_balance_sheet.json #: erpnext/assets/onboarding_step/view_balance_sheet/view_balance_sheet.json msgid "View Balance Sheet" -msgstr "Visa Balans Räkning" +msgstr "Visa Balans Rapport" #: erpnext/public/js/setup_wizard.js:47 msgid "View Chart of Accounts" From 4d0ee719c0164f97e277b51cf25979baab8b4e96 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 07:56:23 +0200 Subject: [PATCH 102/249] refactor(purchase_order): Use the ORM instead of SQL (#55173) --- erpnext/buying/doctype/purchase_order/purchase_order.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index ba928c6dbb7..e25332528e2 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -406,11 +406,10 @@ class PurchaseOrder(BuyingController): update_bin_qty(item_code, warehouse, {"ordered_qty": get_ordered_qty(item_code, warehouse)}) def check_modified_date(self): - mod_db = frappe.db.sql("select modified from `tabPurchase Order` where name = %s", self.name) - date_diff = frappe.db.sql(f"select '{mod_db[0][0]}' - '{cstr(self.modified)}' ") + modified_in_db = frappe.db.get_value("Purchase Order", self.name, "modified") - if date_diff and date_diff[0][0]: - msgprint( + if modified_in_db and cstr(modified_in_db) != cstr(self.modified): + frappe.msgprint( _("{0} {1} has been modified. Please refresh.").format(self.doctype, self.name), raise_exception=True, ) From c9593d8c62f9ef75f9651a66111720e2e66ff4df Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 07:58:06 +0200 Subject: [PATCH 103/249] refactor(customer): Replace SQL with query builder in get_customer_name (#55210) --- erpnext/selling/doctype/customer/customer.py | 40 ++++++++------------ 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py index f7a9a6d21f1..9b5cd7c6557 100644 --- a/erpnext/selling/doctype/customer/customer.py +++ b/erpnext/selling/doctype/customer/customer.py @@ -15,7 +15,8 @@ from frappe.model.document import Document from frappe.model.mapper import get_mapped_doc from frappe.model.naming import set_name_by_naming_series, set_name_from_naming_options from frappe.model.utils.rename_doc import update_linked_doctypes -from frappe.query_builder import Field, functions +from frappe.query_builder import CustomFunction, Field, functions +from frappe.query_builder.functions import Cast, Coalesce, Max, Substring from frappe.utils import cint, cstr, flt, get_formatted_email, today from frappe.utils.user import get_users_with_role @@ -120,36 +121,25 @@ class Customer(TransactionBase): self.customer_name = self.customer_name.strip() if frappe.db.get_value("Customer", self.customer_name) and not frappe.flags.in_import: name_prefix = f"{self.customer_name} - %" + Customer = frappe.qb.DocType("Customer") if frappe.db.db_type == "postgres": # Postgres: extract trailing digits (e.g. "Customer - 3") and cast to int. # NOTE: PostgreSQL is strict about types; MySQL's UNSIGNED cast does not exist. - count = frappe.db.sql( - """ - SELECT COALESCE( - MAX(CAST(SUBSTRING(name FROM '\\d+$') AS INTEGER)), - 0 - ) - FROM tabCustomer - WHERE name LIKE %(name_prefix)s - """, - {"name_prefix": name_prefix}, - as_list=1, - )[0][0] + extracted_part = Substring(Customer.name, r"\d+$") + casted_part = Cast(extracted_part, "INTEGER") else: # MariaDB/MySQL: keep existing behavior. - count = frappe.db.sql( - """ - SELECT COALESCE( - MAX(CAST(SUBSTRING_INDEX(name, ' ', -1) AS UNSIGNED)), - 0 - ) - FROM tabCustomer - WHERE name LIKE %(name_prefix)s - """, - {"name_prefix": name_prefix}, - as_list=1, - )[0][0] + SubstringIndex = CustomFunction("SUBSTRING_INDEX", ["str", "delim", "count"]) + extracted_part = SubstringIndex(Customer.name, " ", -1) + casted_part = Cast(extracted_part, "UNSIGNED") + + query = ( + frappe.qb.from_(Customer) + .select(Coalesce(Max(casted_part), 0)) + .where(Customer.name.like(name_prefix)) + ) + count = query.run()[0][0] count = cint(count) + 1 new_customer_name = f"{self.customer_name} - {cstr(count)}" From de531ceeb9297728a21d83b8d93fea08708412fa Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 07:58:42 +0200 Subject: [PATCH 104/249] refactor(sales_person_wise_transaction_summary): Replace SQL with ORM (#55190) --- .../sales_person_wise_transaction_summary.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py index f8cde141fe4..8966e758fc2 100644 --- a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +++ b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py @@ -250,8 +250,5 @@ def get_items(filters): def get_item_details(): - item_details = {} - for d in frappe.db.sql("""SELECT `name`, `item_group`, `brand` FROM `tabItem`""", as_dict=1): - item_details.setdefault(d.name, d) - - return item_details + items = frappe.get_all("Item", fields=["name", "item_group", "brand"]) + return {d.name: d for d in items} From df3d0859a13b00d9aa9377dac48cfc365e557b20 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 07:59:09 +0200 Subject: [PATCH 105/249] =?UTF-8?q?refactor(sales=5Fperson=5Fwise=5Ftransa?= =?UTF-8?q?ction=5Fsummary):=20Replace=20SQL=20with=20que=E2=80=A6=20(#551?= =?UTF-8?q?91)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales_person_wise_transaction_summary.py | 94 ++++++++++--------- 1 file changed, 52 insertions(+), 42 deletions(-) diff --git a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py index 8966e758fc2..ceb637e8078 100644 --- a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +++ b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py @@ -4,7 +4,7 @@ import frappe from frappe import _, msgprint, qb -from frappe.query_builder import Criterion +from frappe.query_builder import Case, Criterion from erpnext import get_company_currency @@ -146,50 +146,60 @@ def get_columns(filters): def get_entries(filters): - date_field = filters["doc_type"] == "Sales Order" and "transaction_date" or "posting_date" - if filters["doc_type"] == "Sales Order": - qty_field = "delivered_qty" - else: - qty_field = "qty" - conditions, values = get_conditions(filters, date_field) + doc_type = filters["doc_type"] - entries = frappe.db.sql( - """ - SELECT - dt.name, dt.customer, dt.territory, dt.{} as posting_date, dt_item.item_code, - st.sales_person, st.allocated_percentage, dt_item.warehouse, - CASE - WHEN dt.status = "Closed" THEN dt_item.{} * dt_item.conversion_factor - ELSE dt_item.stock_qty - END as stock_qty, - CASE - WHEN dt.status = "Closed" THEN (dt_item.base_net_rate * dt_item.{} * dt_item.conversion_factor) - ELSE dt_item.base_net_amount - END as base_net_amount, - CASE - WHEN dt.status = "Closed" THEN ((dt_item.base_net_rate * dt_item.{} * dt_item.conversion_factor) * st.allocated_percentage/100) - ELSE dt_item.base_net_amount * st.allocated_percentage/100 - END as contribution_amt - FROM - `tab{}` dt, `tab{} Item` dt_item, `tabSales Team` st - WHERE - st.parent = dt.name and dt.name = dt_item.parent and st.parenttype = {} - and dt.docstatus = 1 {} order by st.sales_person, dt.name desc - """.format( - date_field, - qty_field, - qty_field, - qty_field, - filters["doc_type"], - filters["doc_type"], - "%s", - conditions, - ), - tuple([filters["doc_type"], *values]), - as_dict=1, + date_field = "transaction_date" if doc_type == "Sales Order" else "posting_date" + qty_field = "delivered_qty" if doc_type == "Sales Order" else "qty" + + dt = frappe.qb.DocType(doc_type) + dt_item = frappe.qb.DocType(f"{doc_type} Item") + st = frappe.qb.DocType("Sales Team") + + calc_qty = dt_item[qty_field] * dt_item.conversion_factor + calc_net_amount = dt_item.base_net_rate * calc_qty + + stock_qty_case = Case().when(dt.status == "Closed", calc_qty).else_(dt_item.stock_qty).as_("stock_qty") + + base_net_amount_case = ( + Case() + .when(dt.status == "Closed", calc_net_amount) + .else_(dt_item.base_net_amount) + .as_("base_net_amount") ) - return entries + contribution_amt_case = ( + Case() + .when(dt.status == "Closed", (calc_net_amount * st.allocated_percentage / 100)) + .else_(dt_item.base_net_amount * st.allocated_percentage / 100) + .as_("contribution_amt") + ) + + query = ( + frappe.get_query(dt, filters=filters, ignore_permissions=False) + .join(dt_item) + .on(dt.name == dt_item.parent) + .join(st) + .on(dt.name == st.parent) + .select( + dt.name, + dt.customer, + dt.territory, + dt[date_field].as_("posting_date"), + dt_item.item_code, + st.sales_person, + st.allocated_percentage, + dt_item.warehouse, + stock_qty_case, + base_net_amount_case, + contribution_amt_case, + ) + .where(st.parenttype == doc_type) + .where(dt.docstatus == 1) + ) + + query = query.orderby(st.sales_person).orderby(dt.name, order=frappe.qb.desc) + + return query.run(as_dict=True) def get_conditions(filters, date_field): From 9a46b3374fb42980eb34474e6e018bd6e36d6fcc Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 08:03:23 +0200 Subject: [PATCH 106/249] refactor(sales_order):Replace SQL with query builder in get_events (#55208) --- .../doctype/sales_order/sales_order.py | 53 +++++++++++-------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index ae9f57bee2d..b0cb1e5b8ac 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -1655,32 +1655,39 @@ def get_events(start: str, end: str, filters: str | dict | None = None): :param end: End date-time. :param filters: Filters (JSON). """ - from frappe.desk.calendar import get_event_conditions - conditions = get_event_conditions("Sales Order", filters) + SalesOrder = frappe.qb.DocType("Sales Order") + SalesOrderItem = frappe.qb.DocType("Sales Order Item") - data = frappe.db.sql( - f""" - select - distinct `tabSales Order`.name, `tabSales Order`.customer_name, `tabSales Order`.status, - `tabSales Order`.delivery_status, `tabSales Order`.billing_status, - `tabSales Order Item`.delivery_date - from - `tabSales Order`, `tabSales Order Item` - where `tabSales Order`.name = `tabSales Order Item`.parent - and `tabSales Order`.skip_delivery_note = 0 - and (ifnull(`tabSales Order Item`.delivery_date, '0000-00-00')!= '0000-00-00') \ - and (`tabSales Order Item`.delivery_date between %(start)s and %(end)s) - and `tabSales Order`.docstatus < 2 - {conditions} - """, - {"start": start, "end": end}, - as_dict=True, - update={ - "allDay": 0, - "convertToUserTz": 0, - }, + query = ( + frappe.get_query("Sales Order", filters=filters, ignore_permissions=False) + .join(SalesOrderItem) + .on(SalesOrder.name == SalesOrderItem.parent) + .select( + SalesOrder.name, + SalesOrder.customer_name, + SalesOrder.status, + SalesOrder.delivery_status, + SalesOrder.billing_status, + SalesOrderItem.delivery_date, + ) + .distinct() + .where(SalesOrder.skip_delivery_note == 0) + .where(SalesOrder.docstatus < 2) + .where(SalesOrderItem.delivery_date.between(start, end)) + .where(SalesOrderItem.delivery_date.isnotnull()) ) + + data = query.run(as_dict=True) + + for row in data: + row.update( + { + "allDay": 0, + "convertToUserTz": 0, + } + ) + return data From f1c2d2e21dca1a5fc7ea42c8bc163941fe0c1075 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 08:03:54 +0200 Subject: [PATCH 107/249] refactor(sales_order): Replace SQL with ORM in update_enquiry_status (#55203) --- erpnext/selling/doctype/sales_order/sales_order.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index b0cb1e5b8ac..b170305ebfb 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -474,12 +474,9 @@ class SalesOrder(SellingController): self.validate_rate_with_reference_doc([["Quotation", "prevdoc_docname", "quotation_item"]]) def update_enquiry_status(self, prevdoc, flag): - enq = frappe.db.sql( - "select t2.prevdoc_docname from `tabQuotation` t1, `tabQuotation Item` t2 where t2.parent = t1.name and t1.name=%s", - prevdoc, - ) - if enq: - frappe.db.sql("update `tabOpportunity` set status = %s where name=%s", (flag, enq[0][0])) + opportunity_name = frappe.db.get_value("Quotation Item", {"parent": prevdoc}, "prevdoc_docname") + if opportunity_name: + frappe.db.set_value("Opportunity", opportunity_name, "status", flag) def update_prevdoc_status(self, flag=None): for quotation in set(d.prevdoc_docname for d in self.get("items")): From e27b88d789a6669cb2c463827d15dca010bb4fa6 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 08:04:18 +0200 Subject: [PATCH 108/249] refactor(sales_order): replace SQL with ORM in check_nextdoc_docstatus (#55204) --- erpnext/selling/doctype/sales_order/sales_order.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index b170305ebfb..aa8be395176 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -577,13 +577,12 @@ class SalesOrder(SellingController): check_credit_limit(self.customer, self.company) def check_nextdoc_docstatus(self): - linked_invoices = frappe.db.sql_list( - """select distinct t1.name - from `tabSales Invoice` t1,`tabSales Invoice Item` t2 - where t1.name = t2.parent and t2.sales_order = %s and t1.docstatus = 0""", - self.name, + linked_invoices = frappe.get_all( + "Sales Invoice Item", + filters={"sales_order": self.name, "docstatus": 0}, + pluck="parent", + distinct=True, ) - if linked_invoices: linked_invoices = [get_link_to_form("Sales Invoice", si) for si in linked_invoices] frappe.throw( From 4719ba15c666f8ea75a923b34fff282ba5e96aa9 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 08:04:54 +0200 Subject: [PATCH 109/249] =?UTF-8?q?refactor(sales=5Forder):=20Replace=20SQ?= =?UTF-8?q?L=20with=20query=20builder=20in=20make=5Fmainten=E2=80=A6=20(#5?= =?UTF-8?q?5207)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doctype/sales_order/sales_order.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index aa8be395176..57bbd0a7998 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -1618,15 +1618,20 @@ def make_maintenance_schedule(source_name: str, target_doc: str | Document | Non @frappe.whitelist() def make_maintenance_visit(source_name: str, target_doc: str | Document | None = None): - visit = frappe.db.sql( - """select t1.name - from `tabMaintenance Visit` t1, `tabMaintenance Visit Purpose` t2 - where t2.parent=t1.name and t2.prevdoc_docname=%s - and t1.docstatus=1 and t1.completion_status='Fully Completed'""", - source_name, + MaintenanceVisit = frappe.qb.DocType("Maintenance Visit") + MaintenanceVisitPurpose = frappe.qb.DocType("Maintenance Visit Purpose") + + query = ( + frappe.qb.from_(MaintenanceVisit) + .join(MaintenanceVisitPurpose) + .on(MaintenanceVisitPurpose.parent == MaintenanceVisit.name) + .select(MaintenanceVisit.name) + .where(MaintenanceVisitPurpose.prevdoc_docname == source_name) + .where(MaintenanceVisit.docstatus == 1) + .where(MaintenanceVisit.completion_status == "Fully Completed") ) - if not visit: + if not query.run(): doclist = get_mapped_doc( "Sales Order", source_name, From f370404a75060ad6e9c7f0fa848016564acbb5e4 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 08:05:46 +0200 Subject: [PATCH 110/249] =?UTF-8?q?refactor(sales=5Forder):=20Replace=20SQ?= =?UTF-8?q?L=20with=20ORM=20in=20product=5Fbundle=5Fhas=5Fsto=E2=80=A6=20(?= =?UTF-8?q?#55200)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erpnext/selling/doctype/sales_order/sales_order.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 57bbd0a7998..50dd739b074 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -381,14 +381,14 @@ class SalesOrder(SellingController): def product_bundle_has_stock_item(self, product_bundle): """Returns true if product bundle has stock item""" - ret = len( - frappe.db.sql( - """select i.name from tabItem i, `tabProduct Bundle Item` pbi - where pbi.parent = %s and pbi.item_code = i.name and i.is_stock_item = 1""", - product_bundle, - ) + bundle_items = frappe.get_all( + "Product Bundle Item", filters={"parent": product_bundle}, pluck="item_code" ) - return ret + + if not bundle_items: + return False + + return frappe.db.exists("Item", {"name": ["in", bundle_items], "is_stock_item": 1}) is not None def validate_sales_mntc_quotation(self): for d in self.get("items"): From ea2eb3dc015302a2be02772bfec29886e7ef2a8e Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 08:06:11 +0200 Subject: [PATCH 111/249] refactor(supplier_scorecard_variable): replace sql with query builder (#55162) --- .../supplier_scorecard_variable.py | 82 ++++++++++--------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py index e48f64b9bd2..d7edd57b18a 100644 --- a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py +++ b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.py @@ -139,48 +139,50 @@ def get_cost_of_on_time_shipments(scorecard): def get_total_days_late(scorecard): """Gets the number of item days late in the period (based on Purchase Receipts vs POs)""" - supplier = frappe.get_doc("Supplier", scorecard.supplier) - total_delivered_late_days = frappe.db.sql( - """ - SELECT - SUM(DATEDIFF(pr.posting_date,po_item.schedule_date)* pr_item.qty) - FROM - `tabPurchase Order Item` po_item, - `tabPurchase Receipt Item` pr_item, - `tabPurchase Order` po, - `tabPurchase Receipt` pr - WHERE - po.supplier = %(supplier)s - AND po_item.schedule_date BETWEEN %(start_date)s AND %(end_date)s - AND po_item.schedule_date < pr.posting_date - AND pr_item.docstatus = 1 - AND pr_item.purchase_order_item = po_item.name - AND po_item.parent = po.name - AND pr_item.parent = pr.name""", - {"supplier": supplier.name, "start_date": scorecard.start_date, "end_date": scorecard.end_date}, - as_dict=0, - )[0][0] - if not total_delivered_late_days: - total_delivered_late_days = 0 - total_missed_late_days = frappe.db.sql( - """ - SELECT - SUM(DATEDIFF( %(end_date)s, po_item.schedule_date) * (po_item.qty - po_item.received_qty)) - FROM - `tabPurchase Order Item` po_item, - `tabPurchase Order` po - WHERE - po.supplier = %(supplier)s - AND po_item.received_qty < po_item.qty - AND po_item.schedule_date BETWEEN %(start_date)s AND %(end_date)s - AND po_item.parent = po.name""", - {"supplier": supplier.name, "start_date": scorecard.start_date, "end_date": scorecard.end_date}, - as_dict=0, - )[0][0] + PO = frappe.qb.DocType("Purchase Order") + PO_Item = frappe.qb.DocType("Purchase Order Item") + PR = frappe.qb.DocType("Purchase Receipt") + PR_Item = frappe.qb.DocType("Purchase Receipt Item") + + query_delivered = ( + frappe.qb.from_(PR_Item) + .join(PR) + .on(PR_Item.parent == PR.name) + .join(PO_Item) + .on(PR_Item.purchase_order_item == PO_Item.name) + .join(PO) + .on(PO_Item.parent == PO.name) + .select(Sum(frappe.qb.fn.DATEDIFF(PR.posting_date, PO_Item.schedule_date) * PR_Item.qty)) + .where(PO.supplier == scorecard.supplier) + .where(PO_Item.schedule_date[scorecard.start_date : scorecard.end_date]) + .where(PO_Item.schedule_date < PR.posting_date) + .where(PR_Item.docstatus == 1) + ) + + res_delivered = query_delivered.run(as_list=True) + total_delivered_late_days = ( + res_delivered[0][0] if res_delivered and res_delivered[0][0] is not None else 0 + ) + + query_missed = ( + frappe.qb.from_(PO_Item) + .join(PO) + .on(PO_Item.parent == PO.name) + .select( + Sum( + frappe.qb.fn.DATEDIFF(scorecard.end_date, PO_Item.schedule_date) + * (PO_Item.qty - PO_Item.received_qty) + ) + ) + .where(PO.supplier == scorecard.supplier) + .where(PO_Item.received_qty < PO_Item.qty) + .where(PO_Item.schedule_date[scorecard.start_date : scorecard.end_date]) + ) + + res_missed = query_missed.run(as_list=True) + total_missed_late_days = res_missed[0][0] if res_missed and res_missed[0][0] is not None else 0 - if not total_missed_late_days: - total_missed_late_days = 0 return total_missed_late_days + total_delivered_late_days From f9d430c4aadee57f3618f3c5fb1312e80175881d Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 08:07:09 +0200 Subject: [PATCH 112/249] refactor(supplier_scorecard): replace sql with orm (#55169) --- .../supplier_scorecard/supplier_scorecard.py | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py index bca1c74e380..ae32c2537d3 100644 --- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py +++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py @@ -140,28 +140,20 @@ class SupplierScorecard(Document): @frappe.whitelist() def get_timeline_data(doctype: str, name: str): # Get a list of all the associated scorecards - scs = frappe.get_doc(doctype, name) + out = {} timeline_data = {} - scorecards = frappe.db.sql( - """ - SELECT - sc.name - FROM - `tabSupplier Scorecard Period` sc - WHERE - sc.scorecard = %(scs)s - AND sc.docstatus = 1""", - {"scs": scs.name}, - as_dict=1, + + scorecards = frappe.get_all( + "Supplier Scorecard Period", + fields=["name", "start_date", "end_date", "total_score"], + filters={"scorecard": name, "docstatus": 1}, + order_by="end_date desc", ) for sc in scorecards: - start_date, end_date, total_score = frappe.db.get_value( - "Supplier Scorecard Period", sc.name, ["start_date", "end_date", "total_score"] - ) - for single_date in daterange(start_date, end_date): - timeline_data[time.mktime(single_date.timetuple())] = total_score + for single_date in daterange(sc.start_date, sc.end_date): + timeline_data[time.mktime(single_date.timetuple())] = sc.total_score out["timeline_data"] = timeline_data return out From 3cd9943cc0681ac7da11d68778292c2ef731dc0c Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 08:09:28 +0200 Subject: [PATCH 113/249] refactor(customer): replace SQL with ORM in on_trash (#55211) --- erpnext/selling/doctype/customer/customer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py index 9b5cd7c6557..4c2f6999e4c 100644 --- a/erpnext/selling/doctype/customer/customer.py +++ b/erpnext/selling/doctype/customer/customer.py @@ -405,7 +405,7 @@ class Customer(TransactionBase): delete_contact_and_address("Customer", self.name) if self.lead_name: - frappe.db.sql("update `tabLead` set status='Interested' where name=%s", self.lead_name) + frappe.db.set_value("Lead", self.lead_name, "status", "Interested") def before_rename(self, olddn, newdn, merge=False): if merge: From 2d2b45f2705247776eff2f79a2cae647f38fa752 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 08:10:04 +0200 Subject: [PATCH 114/249] refactor(sales_order): Replace SQL with ORM in check_modified_date (#55205) --- erpnext/selling/doctype/sales_order/sales_order.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 50dd739b074..05e2e66d1a8 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -593,8 +593,7 @@ class SalesOrder(SellingController): def check_modified_date(self): mod_db = frappe.db.get_value("Sales Order", self.name, "modified") - date_diff = frappe.db.sql(f"select TIMEDIFF('{mod_db}', '{cstr(self.modified)}')") - if date_diff and date_diff[0][0]: + if mod_db and cstr(mod_db) != cstr(self.modified): frappe.throw(_("{0} {1} has been modified. Please refresh.").format(self.doctype, self.name)) def update_status(self, status): From 78894f7c78612709b7061f733dd93598a79d397a Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 08:13:50 +0200 Subject: [PATCH 115/249] refactor(sales_order): Replace SQL with ORM in validate_for_items (#55199) --- .../doctype/sales_order/sales_order.py | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 05e2e66d1a8..2a6e1d7eeb0 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -368,16 +368,22 @@ class SalesOrder(SellingController): ) def validate_for_items(self): - for d in self.get("items"): - # used for production plan - d.transaction_date = self.transaction_date + item_warehouse_pairs = [ + (d.item_code, d.warehouse) for d in self.get("items") if d.item_code and d.warehouse + ] - tot_avail_qty = frappe.db.sql( - "select projected_qty from `tabBin` \ - where item_code = %s and warehouse = %s", - (d.item_code, d.warehouse), + bin_data = {} + if item_warehouse_pairs: + bins = frappe.get_all( + "Bin", + fields=["item_code", "warehouse", "projected_qty"], + filters={"item_code": ["in", [p[0] for p in item_warehouse_pairs]]}, ) - d.projected_qty = tot_avail_qty and flt(tot_avail_qty[0][0]) or 0 + bin_data = {(b.item_code, b.warehouse): flt(b.projected_qty) for b in bins} + + for d in self.get("items"): + d.transaction_date = self.transaction_date + d.projected_qty = bin_data.get((d.item_code, d.warehouse), 0.0) def product_bundle_has_stock_item(self, product_bundle): """Returns true if product bundle has stock item""" From 9546374ac30bb7a815ac74dbc905fc6f1ae06214 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 08:17:00 +0200 Subject: [PATCH 116/249] =?UTF-8?q?refactor(sales=5Forder):=20Replace=20SQ?= =?UTF-8?q?L=20with=20ORM=20in=20validate=5Fsales=5Fmntc=5Fqu=E2=80=A6=20(?= =?UTF-8?q?#55201)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doctype/sales_order/sales_order.py | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 2a6e1d7eeb0..b290ef1b563 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -397,16 +397,20 @@ class SalesOrder(SellingController): return frappe.db.exists("Item", {"name": ["in", bundle_items], "is_stock_item": 1}) is not None def validate_sales_mntc_quotation(self): + quotation_names = [d.prevdoc_docname for d in self.get("items") if d.prevdoc_docname] + + if not quotation_names: + return + + valid_quotations = frappe.get_all( + "Quotation", + filters={"name": ["in", quotation_names], "order_type": self.order_type}, + pluck="name", + ) + for d in self.get("items"): - if d.prevdoc_docname: - res = frappe.db.sql( - "select name from `tabQuotation` where name=%s and order_type = %s", - (d.prevdoc_docname, self.order_type), - ) - if not res: - frappe.msgprint( - _("Quotation {0} not of type {1}").format(d.prevdoc_docname, self.order_type) - ) + if d.prevdoc_docname and d.prevdoc_docname not in valid_quotations: + frappe.msgprint(_("Quotation {0} not of type {1}").format(d.prevdoc_docname, self.order_type)) def validate_delivery_date(self): if self.order_type == "Sales" and not self.skip_delivery_note: From 6f9f6d3b7dc39a0b6b8ee9836895ba1421c9a80c Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 08:26:25 +0200 Subject: [PATCH 117/249] refactor(sales_order): Replace SQL with ORM in validate_proj_cust (#55202) --- erpnext/selling/doctype/sales_order/sales_order.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index b290ef1b563..cbad5faa22d 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -438,12 +438,10 @@ class SalesOrder(SellingController): def validate_proj_cust(self): if self.project and self.customer_name: - res = frappe.db.sql( - """select name from `tabProject` where name = %s - and (customer = %s or ifnull(customer,'')='')""", - (self.project, self.customer), + project_has_valid_customer = frappe.db.exists( + "Project", {"name": self.project, "customer": ["in", [self.customer, "", None]]} ) - if not res: + if not project_has_valid_customer: frappe.throw( _("Customer {0} does not belong to project {1}").format(self.customer, self.project) ) From 983ae011f0b1366d8603e93c368a08a8a5691e49 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Sat, 23 May 2026 08:27:27 +0200 Subject: [PATCH 118/249] refactor(sales_order): Replace SQL with ORM in make_maintenance_schedule (#55206) --- erpnext/selling/doctype/sales_order/sales_order.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index cbad5faa22d..5104e1a360e 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -1599,11 +1599,8 @@ def make_sales_invoice( @frappe.whitelist() def make_maintenance_schedule(source_name: str, target_doc: str | Document | None = None): - maint_schedule = frappe.db.sql( - """select t1.name - from `tabMaintenance Schedule` t1, `tabMaintenance Schedule Item` t2 - where t2.parent=t1.name and t2.sales_order=%s and t1.docstatus=1""", - source_name, + maint_schedule = frappe.db.exists( + "Maintenance Schedule Item", {"sales_order": source_name, "docstatus": 1} ) if not maint_schedule: From a47e4c04f73cf1501b96a9d04cc346a70a86518a Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sat, 23 May 2026 13:08:11 +0530 Subject: [PATCH 119/249] fix: fg valuation rate in repack entry when multiple FGs --- erpnext/stock/doctype/stock_entry/stock_entry.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 16a8634c416..ba02499faae 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -644,13 +644,21 @@ class StockEntry(StockController, SubcontractingInwardController): ) def get_basic_rate_for_repacked_items(self, finished_item_qty, outgoing_items_cost): - finished_items = [d.item_code for d in self.get("items") if d.is_finished_item] + finished_items = [ + d.item_code for d in self.get("items") if d.is_finished_item and not d.set_basic_rate_manually + ] if len(finished_items) == 1: return flt(outgoing_items_cost / finished_item_qty) else: unique_finished_items = set(finished_items) - if len(unique_finished_items) == 1: - total_fg_qty = sum([flt(d.transfer_qty) for d in self.items if d.is_finished_item]) + if unique_finished_items: + total_fg_qty = sum( + [ + flt(d.transfer_qty) + for d in self.items + if d.is_finished_item and not d.set_basic_rate_manually + ] + ) return flt(outgoing_items_cost / total_fg_qty) def get_basic_rate_for_manufactured_item(self, finished_item_qty, outgoing_items_cost=0) -> float: From 268910467ab34410295fab420c5932af2d14d17d Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Sun, 24 May 2026 12:26:48 +0530 Subject: [PATCH 120/249] fix: not able to reserve product bundle through dialog (#55194) --- .../selling/doctype/sales_order/sales_order.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 5104e1a360e..3c3097d0be3 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -852,9 +852,13 @@ class SalesOrder(SellingController): packed_items = [] if items_details: - for idx, item in enumerate(items_details): + for item in items_details: if not frappe.db.exists("Sales Order Item", item.get("sales_order_item")): - packed_items.append(items_details.pop(idx)) + item["qty"] = item.pop("qty_to_reserve") + packed_items.append(item) + + for item in packed_items: + items_details.remove(item) sre_count = 0 if items_details != []: @@ -865,7 +869,13 @@ class SalesOrder(SellingController): notify=notify, ) - if items := packed_items or [item for item in self.packed_items if item.reserve_stock]: + items = [] + if packed_items: + items = packed_items + elif not items_details: + items = [item for item in self.packed_items if item.reserve_stock] + + if items: from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import StockReservation stock_reservation = StockReservation(doc=self, items=items) From 004818e0ac481061517eea7c6971b5f4d6474a48 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Sun, 24 May 2026 12:27:48 +0530 Subject: [PATCH 121/249] fix: consider batchwise valuation in stock ageing report (#54919) --- .../stock/report/stock_ageing/stock_ageing.py | 428 +++++++++++--- .../report/stock_ageing/test_stock_ageing.py | 522 ++++++++++++++++++ erpnext/tests/utils.py | 3 + 3 files changed, 866 insertions(+), 87 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index ba735d82b03..77b8056f663 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -7,7 +7,7 @@ from operator import itemgetter import frappe from frappe import _ -from frappe.query_builder.functions import Count +from frappe.query_builder.functions import Abs, Count from frappe.utils import cint, date_diff, flt, get_datetime from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos @@ -31,7 +31,7 @@ def execute(filters: Filters = None) -> tuple: def format_report_data(filters: Filters, item_details: dict, to_date: str) -> list[dict]: "Returns ordered, formatted data with ranges." - _func = itemgetter(1) + _func = itemgetter(-2) data = [] precision = cint(frappe.db.get_single_value("System Settings", "float_precision", cache=True)) @@ -48,15 +48,14 @@ def format_report_data(filters: Filters, item_details: dict, to_date: str) -> li if not fifo_queue: continue + if details.has_batch_no: + fifo_queue = [slot[2:] if len(slot) == 5 else slot for slot in fifo_queue] + average_age = get_average_age(fifo_queue, to_date) earliest_age = date_diff(to_date, fifo_queue[0][1]) latest_age = date_diff(to_date, fifo_queue[-1][1]) range_values = get_range_age(filters, fifo_queue, to_date, item_dict) - check_and_replace_valuations_if_moving_average( - range_values, details.valuation_method, details.valuation_rate, filters.get("company") - ) - row = [details.name, details.item_name, details.description, details.item_group, details.brand] if filters.get("show_warehouse_wise_stock"): @@ -78,17 +77,6 @@ def format_report_data(filters: Filters, item_details: dict, to_date: str) -> li return data -def check_and_replace_valuations_if_moving_average( - range_values, item_valuation_method, valuation_rate, company -): - if item_valuation_method == "Moving Average" or ( - not item_valuation_method - and frappe.get_cached_value("Company", company, "valuation_method") == "Moving Average" - ): - for i in range(0, len(range_values), 2): - range_values[i + 1] = range_values[i] * valuation_rate - - def get_average_age(fifo_queue: list, to_date: str) -> float: batch_age = age_qty = total_qty = 0.0 for batch in fifo_queue: @@ -239,7 +227,9 @@ class FIFOSlots: def __init__(self, filters: dict | None = None, sle: list | None = None): self.item_details = {} self.transferred_item_details = {} - self.serial_no_batch_purchase_details = {} + self.serial_no_details = {} + self.batch_no_details = {} + self.batchwise_valuation_by_batch = {} self.filters = filters self.sle = sle @@ -258,8 +248,10 @@ class FIFOSlots: stock_ledger_entries = self.sle bundle_wise_serial_nos = frappe._dict({}) + bundle_wise_batch_nos = frappe._dict({}) if stock_ledger_entries is None: bundle_wise_serial_nos = self.__get_bundle_wise_serial_nos() + bundle_wise_batch_nos = self.__get_bundle_wise_batch_nos() # prepare single sle voucher detail lookup self.prepare_stock_reco_voucher_wise_count() @@ -291,17 +283,40 @@ class FIFOSlots: d.actual_qty = flt(d.qty_after_transaction) - flt(prev_balance_qty) serial_nos = get_serial_nos(d.serial_no) if d.serial_no else [] - if d.serial_and_batch_bundle and d.has_serial_no: - if bundle_wise_serial_nos: - serial_nos = bundle_wise_serial_nos.get(d.serial_and_batch_bundle) or [] - else: - serial_nos = sorted(get_serial_nos_from_bundle(d.serial_and_batch_bundle)) or [] + batch_nos = ( + [ + [ + d.batch_no.upper(), + self.__get_batchwise_valuation(d.batch_no), + abs(d.actual_qty), + abs(d.stock_value_difference), + ] + ] + if d.batch_no + else [] + ) + if d.serial_and_batch_bundle: + if d.has_serial_no: + if bundle_wise_serial_nos: + serial_nos = bundle_wise_serial_nos.get(d.serial_and_batch_bundle) or [] + else: + serial_nos = sorted(get_serial_nos_from_bundle(d.serial_and_batch_bundle)) or [] + elif d.has_batch_no: + if bundle_wise_batch_nos: + batch_nos = bundle_wise_batch_nos.get(d.serial_and_batch_bundle) or [] + else: + batch_nos = ( + self.__get_bundle_wise_batch_nos(d.serial_and_batch_bundle).get( + d.serial_and_batch_bundle + ) + or [] + ) serial_nos = self.uppercase_serial_nos(serial_nos) if d.actual_qty > 0: - self.__compute_incoming_stock(d, fifo_queue, transferred_item_key, serial_nos) + self.__compute_incoming_stock(d, fifo_queue, transferred_item_key, serial_nos, batch_nos) else: - self.__compute_outgoing_stock(d, fifo_queue, transferred_item_key, serial_nos) + self.__compute_outgoing_stock(d, fifo_queue, transferred_item_key, serial_nos, batch_nos) self.__update_balances(d, key) @@ -326,6 +341,14 @@ class FIFOSlots: "Convert serial nos to uppercase for uniformity." return [sn.upper() for sn in serial_nos] + def __get_batchwise_valuation(self, batch_no: str): + if batch_no not in self.batchwise_valuation_by_batch: + self.batchwise_valuation_by_batch[batch_no] = frappe.db.get_value( + "Batch", batch_no, "use_batchwise_valuation" + ) + + return self.batchwise_valuation_by_batch[batch_no] + def __init_key_stores(self, row: dict) -> tuple: "Initialise keys and FIFO Queue." @@ -338,102 +361,286 @@ class FIFOSlots: return key, fifo_queue, transferred_item_key - def __compute_incoming_stock(self, row: dict, fifo_queue: list, transfer_key: tuple, serial_nos: list): + def __compute_incoming_stock( + self, row: dict, fifo_queue: list, transfer_key: tuple, serial_nos: list, batch_nos: list + ): "Update FIFO Queue on inward stock." + def set_fifo_queue_for_serial_items(): + valuation = row.stock_value_difference / row.actual_qty + for serial_no in serial_nos: + if self.serial_no_details.get(serial_no): + fifo_queue.append([serial_no, self.serial_no_details.get(serial_no), valuation]) + else: + self.serial_no_details.setdefault(serial_no, row.posting_date) + fifo_queue.append([serial_no, row.posting_date, valuation]) + + def set_fifo_queue_for_batch_items(): + for batch_no, use_batchwise_valuation, qty, stock_value_difference in batch_nos: + qty, stock_value_difference = neutralize_negative_batch_stock( + batch_no, use_batchwise_valuation, qty, stock_value_difference + ) + + if not qty: + continue + + if self.batch_no_details.get(batch_no): + fifo_queue.append( + [ + batch_no, + use_batchwise_valuation, + qty, + self.batch_no_details.get(batch_no), + stock_value_difference, + ] + ) + else: + self.batch_no_details.setdefault(batch_no, row.posting_date) + fifo_queue.append( + [batch_no, use_batchwise_valuation, qty, row.posting_date, stock_value_difference] + ) + + def neutralize_negative_batch_stock(batch_no, use_batchwise_valuation, qty, stock_value_difference): + qty = flt(qty) + stock_value_difference = flt(stock_value_difference) + + if not qty: + return qty, stock_value_difference + + for slot in list(fifo_queue): + if ( + len(slot) != 5 + or slot[0] != batch_no + or slot[1] != use_batchwise_valuation + or flt(slot[2]) >= 0 + ): + continue + + qty_to_adjust = min(qty, abs(flt(slot[2]))) + value_to_adjust = ( + stock_value_difference + if qty_to_adjust == qty + else flt(stock_value_difference * (qty_to_adjust / qty)) + ) + + slot[2] = flt(slot[2]) + qty_to_adjust + slot[3] = row.posting_date + slot[4] = flt(slot[4]) + value_to_adjust + + qty = flt(qty - qty_to_adjust) + stock_value_difference = flt(stock_value_difference - value_to_adjust) + + if not flt(slot[2]) and not flt(slot[4]): + fifo_queue.remove(slot) + + if not qty: + break + + return qty, stock_value_difference + transfer_data = self.transferred_item_details.get(transfer_key) if transfer_data: # inward/outward from same voucher, item & warehouse # eg: Repack with same item, Stock reco for batch item # consume transfer data and add stock to fifo queue - self.__adjust_incoming_transfer_qty(transfer_data, fifo_queue, row) + self.__adjust_incoming_transfer_qty(transfer_data, fifo_queue, row, batch_nos) else: - if not serial_nos and not row.get("has_serial_no"): - if fifo_queue and flt(fifo_queue[0][0]) <= 0: - # neutralize 0/negative stock by adding positive stock - fifo_queue[0][0] += flt(row.actual_qty) - fifo_queue[0][1] = row.posting_date - fifo_queue[0][2] += flt(row.stock_value_difference) - else: - fifo_queue.append( - [flt(row.actual_qty), row.posting_date, flt(row.stock_value_difference)] - ) - return + if serial_nos and row.get("has_serial_no"): + set_fifo_queue_for_serial_items() + elif batch_nos and row.get("has_batch_no"): + set_fifo_queue_for_batch_items() + elif fifo_queue and flt(fifo_queue[0][0]) <= 0: + # neutralize 0/negative stock by adding positive stock + fifo_queue[0][0] += flt(row.actual_qty) + fifo_queue[0][1] = row.posting_date + fifo_queue[0][2] += flt(row.stock_value_difference) + else: + fifo_queue.append([flt(row.actual_qty), row.posting_date, flt(row.stock_value_difference)]) - valuation = row.stock_value_difference / row.actual_qty - for serial_no in serial_nos: - if self.serial_no_batch_purchase_details.get(serial_no): - fifo_queue.append( - [serial_no, self.serial_no_batch_purchase_details.get(serial_no), valuation] - ) - else: - self.serial_no_batch_purchase_details.setdefault(serial_no, row.posting_date) - fifo_queue.append([serial_no, row.posting_date, valuation]) - - def __compute_outgoing_stock(self, row: dict, fifo_queue: list, transfer_key: tuple, serial_nos: list): + def __compute_outgoing_stock( + self, row: dict, fifo_queue: list, transfer_key: tuple, serial_nos: list, batch_nos: list + ): "Update FIFO Queue on outward stock." if serial_nos: fifo_queue[:] = [serial_no for serial_no in fifo_queue if serial_no[0] not in serial_nos] - return + elif batch_nos: + for batch_no, use_batchwise_valuation, qty, stock_value_difference in batch_nos: + items_to_remove = [] - qty_to_pop = abs(row.actual_qty) - stock_value = abs(row.stock_value_difference) + for slot in fifo_queue: + slot_batch_no, slot_use_batchwise_valuation, slot_qty, _, slot_stock_value = slot - while qty_to_pop: - slot = fifo_queue[0] if fifo_queue else [0, None, 0] - if 0 < flt(slot[0]) <= qty_to_pop: - # qty to pop >= slot qty - # if +ve and not enough or exactly same balance in current slot, consume whole slot - qty_to_pop -= flt(slot[0]) - stock_value -= flt(slot[2]) - self.transferred_item_details[transfer_key].append(fifo_queue.pop(0)) - elif not fifo_queue: - # negative stock, no balance but qty yet to consume - fifo_queue.append([-(qty_to_pop), row.posting_date, -(stock_value)]) - self.transferred_item_details[transfer_key].append( - [qty_to_pop, row.posting_date, stock_value] - ) - qty_to_pop = 0 - stock_value = 0 - else: - # qty to pop < slot qty, ample balance - # consume actual_qty from first slot - slot[0] = flt(slot[0]) - qty_to_pop - slot[2] = flt(slot[2]) - stock_value - self.transferred_item_details[transfer_key].append([qty_to_pop, slot[1], stock_value]) - qty_to_pop = 0 - stock_value = 0 + if flt(slot_qty) <= 0: + continue - def __adjust_incoming_transfer_qty(self, transfer_data: dict, fifo_queue: list, row: dict): + # Batchwise valuation: consume only from same batch + if use_batchwise_valuation: + if slot_batch_no != batch_no: + continue + # Non-batchwise valuation: consume from any non-batchwise batch + else: + if slot_use_batchwise_valuation: + continue + + if flt(slot_qty) <= qty: + qty -= flt(slot_qty) + stock_value_difference -= flt(slot_stock_value) + self.transferred_item_details[transfer_key].append( + [flt(slot_qty), slot[3], flt(slot_stock_value)] + ) + items_to_remove.append(slot) + else: + slot[2] = flt(slot_qty) - qty + # preserve ledger valuation (moving average / SLE value), not slot proportional value + slot[4] = flt(slot_stock_value) - stock_value_difference + self.transferred_item_details[transfer_key].append( + [qty, slot[3], stock_value_difference] + ) + qty = 0 + stock_value_difference = 0 + break + + for item in items_to_remove: + fifo_queue.remove(item) + + if qty: + fifo_queue.append( + [ + batch_no, + use_batchwise_valuation, + -(qty), + row.posting_date, + -(stock_value_difference), + ] + ) + self.transferred_item_details[transfer_key].append( + [qty, row.posting_date, stock_value_difference] + ) + else: + qty_to_pop = abs(row.actual_qty) + stock_value = abs(row.stock_value_difference) + + while qty_to_pop: + slot = fifo_queue[0] if fifo_queue else [0, None, 0] + if 0 < flt(slot[0]) <= qty_to_pop: + # qty to pop >= slot qty + # if +ve and not enough or exactly same balance in current slot, consume whole slot + qty_to_pop -= flt(slot[0]) + stock_value -= flt(slot[2]) + self.transferred_item_details[transfer_key].append(fifo_queue.pop(0)) + elif not fifo_queue: + # negative stock, no balance but qty yet to consume + fifo_queue.append([-(qty_to_pop), row.posting_date, -(stock_value)]) + self.transferred_item_details[transfer_key].append( + [qty_to_pop, row.posting_date, stock_value] + ) + qty_to_pop = 0 + stock_value = 0 + else: + # qty to pop < slot qty, ample balance + # consume actual_qty from first slot + slot[0] = flt(slot[0]) - qty_to_pop + slot[2] = flt(slot[2]) - stock_value + self.transferred_item_details[transfer_key].append([qty_to_pop, slot[1], stock_value]) + qty_to_pop = 0 + stock_value = 0 + + def __adjust_incoming_transfer_qty( + self, transfer_data: dict, fifo_queue: list, row: dict, batch_nos: list | None = None + ): "Add previously removed stock back to FIFO Queue." transfer_qty_to_pop = flt(row.actual_qty) stock_value = flt(row.stock_value_difference) + batch_nos = [list(batch_no) for batch_no in batch_nos or []] + + def is_batch_slot(slot): + return len(slot) == 5 + + def get_incoming_slots(qty, posting_date, value): + if not batch_nos: + return [[qty, posting_date, value]] + + incoming_slots = [] + remaining_qty = flt(qty) + remaining_value = flt(value) + + while remaining_qty and batch_nos: + batch_no, use_batchwise_valuation, batch_qty, _ = batch_nos[0] + batch_qty = flt(batch_qty) + slot_qty = min(batch_qty, remaining_qty) + slot_value = ( + remaining_value + if slot_qty == remaining_qty + else flt(remaining_value * (slot_qty / remaining_qty)) + ) + + incoming_slots.append([batch_no, use_batchwise_valuation, slot_qty, posting_date, slot_value]) + + batch_nos[0][2] = flt(batch_qty - slot_qty) + if not batch_nos[0][2]: + batch_nos.pop(0) + + remaining_qty = flt(remaining_qty - slot_qty) + remaining_value = flt(remaining_value - slot_value) + + if remaining_qty: + incoming_slots.append([remaining_qty, posting_date, remaining_value]) + + return incoming_slots def add_to_fifo_queue(slot): - if fifo_queue and flt(fifo_queue[0][0]) <= 0: - # neutralize 0/negative stock by adding positive stock + matching_negative_batch_slot = next( + ( + existing_slot + for existing_slot in fifo_queue + if is_batch_slot(existing_slot) + and is_batch_slot(slot) + and flt(existing_slot[2]) <= 0 + and existing_slot[0] == slot[0] + and existing_slot[1] == slot[1] + ), + None, + ) + + if ( + fifo_queue + and not is_batch_slot(fifo_queue[0]) + and not is_batch_slot(slot) + and flt(fifo_queue[0][0]) <= 0 + ): fifo_queue[0][0] += flt(slot[0]) fifo_queue[0][1] = slot[1] fifo_queue[0][2] += flt(slot[2]) + elif matching_negative_batch_slot: + matching_negative_batch_slot[2] += flt(slot[2]) + matching_negative_batch_slot[3] = slot[3] + matching_negative_batch_slot[4] += flt(slot[4]) else: fifo_queue.append(slot) while transfer_qty_to_pop: - if transfer_data and 0 < transfer_data[0][0] <= transfer_qty_to_pop: + if transfer_data and 0 < flt(transfer_data[0][0]) <= transfer_qty_to_pop: # bucket qty is not enough, consume whole - transfer_qty_to_pop -= transfer_data[0][0] - stock_value -= transfer_data[0][2] - add_to_fifo_queue(transfer_data.pop(0)) + transfer_qty = flt(transfer_data[0][0]) + transfer_date = transfer_data[0][1] + transfer_value = flt(transfer_data[0][2]) + transfer_qty_to_pop -= transfer_qty + stock_value -= transfer_value + for slot in get_incoming_slots(transfer_qty, transfer_date, transfer_value): + add_to_fifo_queue(slot) + transfer_data.pop(0) elif not transfer_data: # transfer bucket is empty, extra incoming qty - add_to_fifo_queue([transfer_qty_to_pop, row.posting_date, stock_value]) + for slot in get_incoming_slots(transfer_qty_to_pop, row.posting_date, stock_value): + add_to_fifo_queue(slot) transfer_qty_to_pop = 0 stock_value = 0 else: # ample bucket qty to consume transfer_data[0][0] -= transfer_qty_to_pop transfer_data[0][2] -= stock_value - add_to_fifo_queue([transfer_qty_to_pop, transfer_data[0][1], stock_value]) + for slot in get_incoming_slots(transfer_qty_to_pop, transfer_data[0][1], stock_value): + add_to_fifo_queue(slot) transfer_qty_to_pop = 0 stock_value = 0 @@ -445,6 +652,7 @@ class FIFOSlots: self.item_details[key]["total_qty"] += row.actual_qty self.item_details[key]["has_serial_no"] = row.has_serial_no + self.item_details[key]["has_batch_no"] = row.has_batch_no self.item_details[key]["details"].valuation_rate = row.valuation_rate def __aggregate_details_by_item(self, wh_wise_data: dict) -> dict: @@ -468,6 +676,7 @@ class FIFOSlots: item_row["qty_after_transaction"] += flt(row["qty_after_transaction"]) item_row["total_qty"] += flt(row["total_qty"]) item_row["has_serial_no"] = row["has_serial_no"] + item_row["has_batch_no"] = row["has_batch_no"] return item_aggregated_data @@ -486,8 +695,8 @@ class FIFOSlots: item.brand, item.description, item.stock_uom, + item.has_batch_no, item.has_serial_no, - item.valuation_method, sle.actual_qty, sle.stock_value_difference, sle.valuation_rate, @@ -556,6 +765,51 @@ class FIFOSlots: return bundle_wise_serial_nos + def __get_bundle_wise_batch_nos(self, sabb_name=None) -> dict: + bundle = frappe.qb.DocType("Serial and Batch Bundle") + entry = frappe.qb.DocType("Serial and Batch Entry") + batch = frappe.qb.DocType("Batch") + + to_date = get_datetime(self.filters.get("to_date") + " 23:59:59") + query = ( + frappe.qb.from_(bundle) + .join(entry) + .on(bundle.name == entry.parent) + .join(batch) + .on(entry.batch_no == batch.name) + .select( + bundle.name, + entry.batch_no, + batch.use_batchwise_valuation, + Abs(entry.qty).as_("qty"), + Abs(entry.stock_value_difference).as_("stock_value_difference"), + ) + .where( + (bundle.docstatus == 1) + & (entry.batch_no.isnotnull()) + & (bundle.company == self.filters.get("company")) + & (bundle.posting_datetime <= to_date) + ) + ) + + for field in ["item_code"]: + if self.filters.get(field): + query = query.where(bundle[field] == self.filters.get(field)) + + if self.filters.get("warehouse"): + query = self.__get_warehouse_conditions(bundle, query) + + if sabb_name: + query = query.where(bundle.name == sabb_name) + + bundle_wise_batch_nos = frappe._dict({}) + for bundle_name, batch_no, use_batchwise_valuation, qty, stock_value_difference in query.run(): + bundle_wise_batch_nos.setdefault(bundle_name, []).append( + [batch_no.upper(), use_batchwise_valuation, qty, stock_value_difference] + ) + + return bundle_wise_batch_nos + def __get_item_query(self) -> str: item_table = frappe.qb.DocType("Item") @@ -567,7 +821,7 @@ class FIFOSlots: "brand", "item_group", "has_serial_no", - "valuation_method", + "has_batch_no", ) if self.filters.get("item_code"): diff --git a/erpnext/stock/report/stock_ageing/test_stock_ageing.py b/erpnext/stock/report/stock_ageing/test_stock_ageing.py index 4e2e5ca9d88..dee556e1e88 100644 --- a/erpnext/stock/report/stock_ageing/test_stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/test_stock_ageing.py @@ -868,6 +868,528 @@ class TestStockAgeing(ERPNextTestSuite): range_valuations = range_values[1::2] self.assertEqual(range_valuations, [15, 7.5, 20, 5]) + def test_batch_item_report_formatting_preserves_mixed_fifo_slots(self): + item_details = { + "Batch Mixed Item": { + "details": frappe._dict( + name="Batch Mixed Item", + item_name="Batch Mixed Item", + description="Batch Mixed Item", + item_group=None, + brand=None, + has_batch_no=True, + stock_uom="Nos", + ), + "fifo_queue": [ + ["SA-BATCH-MIXED-SLOT", 1, 5.0, "2021-12-01", 50.0], + [3.0, "2021-12-02", 30.0], + ], + "has_serial_no": False, + "total_qty": 8.0, + } + } + + report_data = format_report_data(self.filters, item_details, self.filters["to_date"]) + + self.assertEqual(report_data[0][7:15], [8.0, 80.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]) + + def test_batchwise_valuation(self): + from erpnext.stock.doctype.item.test_item import make_item + + item_code = make_item( + "Test Stock Ageing Batchwise Valuation", + { + "is_stock_item": 1, + "has_batch_no": 1, + "valuation_method": "FIFO", + }, + ).name + + def make_batch(batch_id, use_batchwise_valuation): + if not frappe.db.exists("Batch", batch_id): + frappe.get_doc( + { + "doctype": "Batch", + "batch_id": batch_id, + "item": item_code, + } + ).insert(ignore_permissions=True) + + frappe.db.set_value("Batch", batch_id, "use_batchwise_valuation", use_batchwise_valuation) + + batchwise_above_90 = "SA-BATCHWISE-ABOVE-90" + non_batchwise_above_90 = "SA-NON-BATCHWISE-ABOVE-90" + batchwise_61_90 = "SA-BATCHWISE-61-90" + non_batchwise_61_90 = "SA-NON-BATCHWISE-61-90" + batchwise_31_60 = "SA-BATCHWISE-31-60" + non_batchwise_31_60 = "SA-NON-BATCHWISE-31-60" + batchwise_0_30 = "SA-BATCHWISE-0-30" + non_batchwise_0_30 = "SA-NON-BATCHWISE-0-30" + + for batch_id, use_batchwise_valuation in { + batchwise_above_90: 1, + non_batchwise_above_90: 0, + batchwise_61_90: 1, + non_batchwise_61_90: 0, + batchwise_31_60: 1, + non_batchwise_31_60: 0, + batchwise_0_30: 1, + non_batchwise_0_30: 0, + }.items(): + make_batch(batch_id, use_batchwise_valuation) + + qty_after_transaction = 0 + + def make_sle(posting_date, voucher_no, batch_no, actual_qty, stock_value_difference): + nonlocal qty_after_transaction + + qty_after_transaction += actual_qty + return frappe._dict( + name=item_code, + actual_qty=actual_qty, + qty_after_transaction=qty_after_transaction, + stock_value_difference=stock_value_difference, + warehouse="WH 1", + posting_date=posting_date, + voucher_type="Stock Entry", + voucher_no=voucher_no, + has_serial_no=False, + has_batch_no=True, + serial_no=None, + batch_no=batch_no, + valuation_rate=10, + ) + + sle = [ + make_sle("2021-08-01", "001", batchwise_above_90, 50, 500), + make_sle("2021-08-10", "002", non_batchwise_above_90, 60, 600), + make_sle("2021-08-20", "003", batchwise_above_90, -10, -100), + make_sle("2021-09-01", "004", non_batchwise_above_90, -15, -150), + make_sle("2021-09-20", "005", batchwise_61_90, 40, 400), + make_sle("2021-09-25", "006", non_batchwise_61_90, 50, 500), + make_sle("2021-09-30", "007", batchwise_61_90, -5, -50), + make_sle("2021-10-05", "008", non_batchwise_above_90, -20, -200), + make_sle("2021-10-20", "009", batchwise_31_60, 30, 300), + make_sle("2021-10-25", "010", non_batchwise_31_60, 40, 400), + make_sle("2021-10-30", "011", batchwise_31_60, -8, -80), + make_sle("2021-11-05", "012", non_batchwise_above_90, -25, -250), + make_sle("2021-11-20", "013", batchwise_0_30, 20, 200), + make_sle("2021-11-25", "014", non_batchwise_0_30, 30, 300), + make_sle("2021-11-30", "015", batchwise_0_30, -6, -60), + make_sle("2021-12-01", "016", non_batchwise_61_90, -10, -100), + ] + + slots = FIFOSlots(self.filters, sle).generate() + item_result = slots[item_code] + + self.assertEqual(item_result["qty_after_transaction"], item_result["total_qty"]) + self.assertEqual(item_result["total_qty"], 221.0) + self.assertEqual( + item_result["fifo_queue"], + [ + [batchwise_above_90, 1, 40.0, "2021-08-01", 400.0], + [batchwise_61_90, 1, 35.0, "2021-09-20", 350.0], + [non_batchwise_61_90, 0, 40.0, "2021-09-25", 400.0], + [batchwise_31_60, 1, 22.0, "2021-10-20", 220.0], + [non_batchwise_31_60, 0, 40, "2021-10-25", 400], + [batchwise_0_30, 1, 14.0, "2021-11-20", 140.0], + [non_batchwise_0_30, 0, 30, "2021-11-25", 300], + ], + ) + + report_data = format_report_data(self.filters, slots, self.filters["to_date"]) + range_values = report_data[0][7:15] + self.assertEqual(range_values, [44.0, 440.0, 62.0, 620.0, 75.0, 750.0, 40.0, 400.0]) + + def test_batchwise_valuation_same_voucher_transfer(self): + from erpnext.stock.doctype.item.test_item import make_item + + item_code = make_item( + "Test Stock Ageing Batchwise Transfer", + { + "is_stock_item": 1, + "has_batch_no": 1, + "valuation_method": "FIFO", + }, + ).name + + def make_batch(batch_id): + if not frappe.db.exists("Batch", batch_id): + frappe.get_doc( + { + "doctype": "Batch", + "batch_id": batch_id, + "item": item_code, + } + ).insert(ignore_permissions=True) + + frappe.db.set_value("Batch", batch_id, "use_batchwise_valuation", 1) + + source_batch = "SA-BATCHWISE-TRANSFER-SOURCE" + target_batch = "SA-BATCHWISE-TRANSFER-TARGET" + make_batch(source_batch) + make_batch(target_batch) + + sle = [ + frappe._dict( + name=item_code, + actual_qty=20, + qty_after_transaction=20, + stock_value_difference=200, + warehouse="WH 1", + posting_date="2021-09-01", + voucher_type="Stock Entry", + voucher_no="001", + has_serial_no=False, + has_batch_no=True, + serial_no=None, + batch_no=source_batch, + valuation_rate=10, + ), + frappe._dict( + name=item_code, + actual_qty=-15, + qty_after_transaction=5, + stock_value_difference=-150, + warehouse="WH 1", + posting_date="2021-10-01", + voucher_type="Stock Entry", + voucher_no="002", + has_serial_no=False, + has_batch_no=True, + serial_no=None, + batch_no=source_batch, + valuation_rate=10, + ), + frappe._dict( + name=item_code, + actual_qty=10, + qty_after_transaction=15, + stock_value_difference=100, + warehouse="WH 1", + posting_date="2021-10-01", + voucher_type="Stock Entry", + voucher_no="002", + has_serial_no=False, + has_batch_no=True, + serial_no=None, + batch_no=target_batch, + valuation_rate=10, + ), + ] + + fifo_slots = FIFOSlots(self.filters, sle) + slots = fifo_slots.generate() + item_result = slots[item_code] + + self.assertEqual(item_result["total_qty"], 15.0) + self.assertEqual( + item_result["fifo_queue"], + [ + [source_batch, 1, 5.0, "2021-09-01", 50.0], + [target_batch, 1, 10.0, "2021-09-01", 100.0], + ], + ) + self.assertEqual( + fifo_slots.transferred_item_details[("002", item_code, "WH 1")], + [[5.0, "2021-09-01", 50.0]], + ) + + def test_batchwise_valuation_negative_stock_same_voucher(self): + from erpnext.stock.doctype.item.test_item import make_item + + item_code = make_item( + "Test Stock Ageing Batchwise Negative Stock", + { + "is_stock_item": 1, + "has_batch_no": 1, + "valuation_method": "FIFO", + }, + ).name + + batch_no = "SA-BATCHWISE-NEGATIVE-STOCK" + if not frappe.db.exists("Batch", batch_no): + frappe.get_doc( + { + "doctype": "Batch", + "batch_id": batch_no, + "item": item_code, + } + ).insert(ignore_permissions=True) + + frappe.db.set_value("Batch", batch_no, "use_batchwise_valuation", 1) + + sle = [ + frappe._dict( + name=item_code, + actual_qty=-10, + qty_after_transaction=-10, + stock_value_difference=-100, + warehouse="WH 1", + posting_date="2021-12-01", + voucher_type="Stock Entry", + voucher_no="001", + has_serial_no=False, + has_batch_no=True, + serial_no=None, + batch_no=batch_no, + valuation_rate=10, + ) + ] + + fifo_slots = FIFOSlots(self.filters, sle) + slots = fifo_slots.generate() + item_result = slots[item_code] + + self.assertEqual(item_result["fifo_queue"], [[batch_no, 1, -10, "2021-12-01", -100]]) + self.assertEqual( + fifo_slots.transferred_item_details[("001", item_code, "WH 1")], [[10, "2021-12-01", 100]] + ) + + sle.append( + frappe._dict( + name=item_code, + actual_qty=6, + qty_after_transaction=-4, + stock_value_difference=60, + warehouse="WH 1", + posting_date="2021-12-01", + voucher_type="Stock Entry", + voucher_no="001", + has_serial_no=False, + has_batch_no=True, + serial_no=None, + batch_no=batch_no, + valuation_rate=10, + ) + ) + + fifo_slots = FIFOSlots(self.filters, sle) + slots = fifo_slots.generate() + item_result = slots[item_code] + + self.assertEqual(item_result["fifo_queue"], [[batch_no, 1, -4.0, "2021-12-01", -40.0]]) + self.assertEqual( + fifo_slots.transferred_item_details[("001", item_code, "WH 1")], + [[4.0, "2021-12-01", 40.0]], + ) + + def test_batchwise_valuation_neutralizes_non_head_negative_batch(self): + from erpnext.stock.doctype.item.test_item import make_item + + item_code = make_item( + "Test Stock Ageing Batchwise Negative Non Head", + { + "is_stock_item": 1, + "has_batch_no": 1, + "valuation_method": "FIFO", + }, + ).name + + buffer_batch = "SA-BATCHWISE-NEGATIVE-BUFFER" + negative_batch = "SA-BATCHWISE-NEGATIVE-NON-HEAD" + for batch_no in [buffer_batch, negative_batch]: + if not frappe.db.exists("Batch", batch_no): + frappe.get_doc( + { + "doctype": "Batch", + "batch_id": batch_no, + "item": item_code, + } + ).insert(ignore_permissions=True) + + frappe.db.set_value("Batch", batch_no, "use_batchwise_valuation", 1) + + sle = [ + frappe._dict( + name=item_code, + actual_qty=5, + qty_after_transaction=5, + stock_value_difference=50, + warehouse="WH 1", + posting_date="2021-11-30", + voucher_type="Stock Entry", + voucher_no="001", + has_serial_no=False, + has_batch_no=True, + serial_no=None, + batch_no=buffer_batch, + valuation_rate=10, + ), + frappe._dict( + name=item_code, + actual_qty=-10, + qty_after_transaction=-5, + stock_value_difference=-100, + warehouse="WH 1", + posting_date="2021-12-01", + voucher_type="Stock Entry", + voucher_no="002", + has_serial_no=False, + has_batch_no=True, + serial_no=None, + batch_no=negative_batch, + valuation_rate=10, + ), + frappe._dict( + name=item_code, + actual_qty=6, + qty_after_transaction=1, + stock_value_difference=60, + warehouse="WH 1", + posting_date="2021-12-01", + voucher_type="Stock Entry", + voucher_no="002", + has_serial_no=False, + has_batch_no=True, + serial_no=None, + batch_no=negative_batch, + valuation_rate=10, + ), + ] + + fifo_slots = FIFOSlots(self.filters, sle) + slots = fifo_slots.generate() + item_result = slots[item_code] + + self.assertEqual(item_result["qty_after_transaction"], item_result["total_qty"]) + self.assertEqual( + item_result["fifo_queue"], + [ + [buffer_batch, 1, 5, "2021-11-30", 50], + [negative_batch, 1, -4.0, "2021-12-01", -40.0], + ], + ) + self.assertEqual( + fifo_slots.transferred_item_details[("002", item_code, "WH 1")], + [[4.0, "2021-12-01", 40.0]], + ) + + def test_batchwise_valuation_negative_stock_later_voucher(self): + from erpnext.stock.doctype.item.test_item import make_item + + item_code = make_item( + "Test Stock Ageing Batchwise Negative Later Voucher", + { + "is_stock_item": 1, + "has_batch_no": 1, + "valuation_method": "FIFO", + }, + ).name + + batch_no = "SA-BATCHWISE-NEGATIVE-LATER-VOUCHER" + if not frappe.db.exists("Batch", batch_no): + frappe.get_doc( + { + "doctype": "Batch", + "batch_id": batch_no, + "item": item_code, + } + ).insert(ignore_permissions=True) + + frappe.db.set_value("Batch", batch_no, "use_batchwise_valuation", 1) + + sle = [ + frappe._dict( + name=item_code, + actual_qty=-10, + qty_after_transaction=-10, + stock_value_difference=-100, + warehouse="WH 1", + posting_date="2021-11-01", + voucher_type="Stock Entry", + voucher_no="001", + has_serial_no=False, + has_batch_no=True, + serial_no=None, + batch_no=batch_no, + valuation_rate=10, + ), + frappe._dict( + name=item_code, + actual_qty=6, + qty_after_transaction=-4, + stock_value_difference=60, + warehouse="WH 1", + posting_date="2021-11-10", + voucher_type="Stock Entry", + voucher_no="002", + has_serial_no=False, + has_batch_no=True, + serial_no=None, + batch_no=batch_no, + valuation_rate=10, + ), + ] + + slots = FIFOSlots(self.filters, sle).generate() + item_result = slots[item_code] + + self.assertEqual(item_result["qty_after_transaction"], item_result["total_qty"]) + self.assertEqual(item_result["total_qty"], -4.0) + self.assertEqual(item_result["fifo_queue"], [[batch_no, 1, -4.0, "2021-11-10", -40.0]]) + + def test_batchwise_valuation_stock_reconciliation_with_bundle(self): + from frappe.utils import add_days, getdate, nowdate + + from erpnext.stock.doctype.item.test_item import make_item + from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import ( + get_batch_from_bundle, + ) + from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import ( + create_stock_reconciliation, + ) + + suffix = frappe.generate_hash(length=8).upper() + item_code = make_item( + f"Test Stock Ageing Batch Reco {suffix}", + { + "is_stock_item": 1, + "has_batch_no": 1, + "create_new_batch": 1, + "batch_number_series": f"SA-RECO-{suffix}-.###", + "valuation_method": "FIFO", + }, + ).name + warehouse = "_Test Warehouse - _TC" + base_date = nowdate() + + opening_reco = create_stock_reconciliation( + item_code=item_code, + warehouse=warehouse, + qty=12, + rate=10, + posting_date=add_days(base_date, -2), + posting_time="10:00:00", + ) + batch_no = get_batch_from_bundle(opening_reco.items[0].serial_and_batch_bundle) + frappe.db.set_value("Batch", batch_no, "use_batchwise_valuation", 1) + + create_stock_reconciliation( + item_code=item_code, + warehouse=warehouse, + qty=5, + rate=10, + batch_no=batch_no, + posting_date=add_days(base_date, -1), + posting_time="10:00:00", + ) + + filters = frappe._dict( + company="_Test Company", + to_date=base_date, + ranges=["30", "60", "90"], + item_code=item_code, + ) + slots = FIFOSlots(filters).generate() + item_result = slots[item_code] + + self.assertEqual(item_result["qty_after_transaction"], item_result["total_qty"]) + self.assertEqual(item_result["total_qty"], 5.0) + self.assertEqual( + item_result["fifo_queue"], [[batch_no.upper(), 1, 5.0, getdate(add_days(base_date, -2)), 50.0]] + ) + def generate_item_and_item_wh_wise_slots(filters, sle): "Return results with and without 'show_warehouse_wise_stock'" diff --git a/erpnext/tests/utils.py b/erpnext/tests/utils.py index 70f12142fac..99c55b6d7ba 100644 --- a/erpnext/tests/utils.py +++ b/erpnext/tests/utils.py @@ -3003,6 +3003,9 @@ class ERPNextTestSuite(unittest.TestCase): def tearDown(self): frappe.db.rollback() + frappe.local.request_cache.clear() + if hasattr(frappe.local, "future_sle"): + frappe.local.future_sle.clear() def load_test_records(self, doctype): if doctype not in self.globalTestRecords: From c1a4c3d053c981b2e4d2f4dbf7407914f1a82920 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Sun, 24 May 2026 15:06:45 +0530 Subject: [PATCH 122/249] =?UTF-8?q?refactor:=20use=20`frappe.db.bulk=5Fupd?= =?UTF-8?q?ate`=20instead=20of=20Case=20queries=20in=20subcon=E2=80=A6=20(?= =?UTF-8?q?#55232)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subcontracting_inward_controller.py | 96 ++++++++++--------- 1 file changed, 52 insertions(+), 44 deletions(-) diff --git a/erpnext/controllers/subcontracting_inward_controller.py b/erpnext/controllers/subcontracting_inward_controller.py index 77a6a9ea19d..e331ccfe26c 100644 --- a/erpnext/controllers/subcontracting_inward_controller.py +++ b/erpnext/controllers/subcontracting_inward_controller.py @@ -651,20 +651,25 @@ class SubcontractingInwardController: ).update_manufacturing_qty_fields() elif self.purpose in ["Subcontracting Delivery", "Subcontracting Return"]: fieldname = "delivered_qty" if self.purpose == "Subcontracting Delivery" else "returned_qty" + qty_map = defaultdict(lambda: defaultdict(float)) for item in self.items: doctype = ( "Subcontracting Inward Order Item" if not item.type and not item.is_legacy_scrap_item else "Subcontracting Inward Order Secondary Item" ) - frappe.db.set_value( - doctype, - item.scio_detail, - fieldname, - frappe.get_value(doctype, item.scio_detail, fieldname) - + (item.transfer_qty if self._action == "submit" else -item.transfer_qty), + qty_map[doctype][item.scio_detail] += ( + item.transfer_qty if self._action == "submit" else -item.transfer_qty ) + for doctype, item_qty_map in qty_map.items(): + table = frappe.qb.DocType(doctype) + field = table[fieldname] + doc_updates = { + scio_detail: {fieldname: field + qty} for scio_detail, qty in item_qty_map.items() + } + frappe.db.bulk_update(doctype, doc_updates, chunk_size=len(doc_updates)) + def update_inward_order_received_items(self): if self.subcontracting_inward_order: match self.purpose: @@ -679,14 +684,18 @@ class SubcontractingInwardController: else -item.transfer_qty for item in self.items } - case_expr = Case() table = frappe.qb.DocType("Subcontracting Inward Order Received Item") - for scio_rm_name, qty in scio_rm_names.items(): - case_expr = case_expr.when(table.name == scio_rm_name, table.returned_qty + qty) - - frappe.qb.update(table).set(table.returned_qty, case_expr).where( - (table.name.isin(list(scio_rm_names.keys()))) & (table.docstatus == 1) - ).run() + doc_updates = { + scio_rm_name: {"returned_qty": table.returned_qty + qty} + for scio_rm_name, qty in scio_rm_names.items() + } + if doc_updates: + frappe.db.bulk_update( + "Subcontracting Inward Order Received Item", + doc_updates, + chunk_size=len(doc_updates), + update_modified=False, + ) def update_inward_order_received_items_for_raw_materials_receipt(self): data = frappe._dict() @@ -738,9 +747,7 @@ class SubcontractingInwardController: fields=["rate", "name", "required_qty", "received_qty"], ) - deleted_docs = [] - table = frappe.qb.DocType("Subcontracting Inward Order Received Item") - case_expr_qty, case_expr_rate = Case(), Case() + doc_updates = {} for d in result: current_qty = flt(data[d.name].transfer_qty) * (1 if self._action == "submit" else -1) current_rate = flt(data[d.name].rate) @@ -755,16 +762,17 @@ class SubcontractingInwardController: ) if not d.required_qty and not d.received_qty: - deleted_docs.append(d.name) frappe.delete_doc("Subcontracting Inward Order Received Item", d.name) else: - case_expr_qty = case_expr_qty.when(table.name == d.name, d.received_qty) - case_expr_rate = case_expr_rate.when(table.name == d.name, d.rate) + doc_updates[d.name] = {"received_qty": d.received_qty, "rate": d.rate} - if final_list := list(set(data.keys()) - set(deleted_docs)): - frappe.qb.update(table).set(table.received_qty, case_expr_qty).set( - table.rate, case_expr_rate - ).where((table.name.isin(final_list)) & (table.docstatus == 1)).run() + if doc_updates: + frappe.db.bulk_update( + "Subcontracting Inward Order Received Item", + doc_updates, + chunk_size=len(doc_updates), + update_modified=False, + ) def update_inward_order_received_items_for_manufacture(self): customer_warehouse = frappe.get_cached_value( @@ -816,8 +824,8 @@ class SubcontractingInwardController: ) if data := data.run(as_dict=True): - deleted_docs, used_item_wh = [], [] - case_expr = Case() + used_item_wh = [] + doc_updates = {} for d in data: if not d.warehouse: d.warehouse = next( @@ -829,15 +837,17 @@ class SubcontractingInwardController: qty = d.consumed_qty + item_code_wh[(d.rm_item_code, d.warehouse)] if qty or d.is_customer_provided_item or not d.is_additional_item: - case_expr = case_expr.when((table.name == d.name), qty) + doc_updates[d.name] = {"consumed_qty": qty} else: - deleted_docs.append(d.name) frappe.delete_doc("Subcontracting Inward Order Received Item", d.name) - if final_list := list(set([d.name for d in data]) - set(deleted_docs)): - frappe.qb.update(table).set(table.consumed_qty, case_expr).where( - (table.name.isin(final_list)) & (table.docstatus == 1) - ).run() + if doc_updates: + frappe.db.bulk_update( + "Subcontracting Inward Order Received Item", + doc_updates, + chunk_size=len(doc_updates), + update_modified=False, + ) main_item_code = next(fg for fg in self.items if fg.is_finished_item).item_code for extra_item in [ @@ -910,27 +920,25 @@ class SubcontractingInwardController: for d in result } ) - deleted_docs = [] - case_expr = Case() - table = frappe.qb.DocType("Subcontracting Inward Order Secondary Item") + doc_updates = {} for key, value in secondary_items_dict.items(): if ( self._action == "cancel" and value.produced_qty - abs(secondary_items.get(key)) == 0 ): - deleted_docs.append(value.name) frappe.delete_doc("Subcontracting Inward Order Secondary Item", value.name) else: - case_expr = case_expr.when( - table.name == value.name, value.produced_qty + secondary_items.get(key) - ) + doc_updates[value.name] = { + "produced_qty": value.produced_qty + secondary_items.get(key) + } - if final_list := list( - set([v.name for v in secondary_items_dict.values()]) - set(deleted_docs) - ): - frappe.qb.update(table).set(table.produced_qty, case_expr).where( - (table.name.isin(final_list)) & (table.docstatus == 1) - ).run() + if doc_updates: + frappe.db.bulk_update( + "Subcontracting Inward Order Secondary Item", + doc_updates, + chunk_size=len(doc_updates), + update_modified=False, + ) fg_item_code = next(fg for fg in self.items if fg.is_finished_item).item_code for secondary_item in [ From 2a01a37d5d739e2d4fb6cdda869fec6548eaf743 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Sun, 24 May 2026 15:43:07 +0530 Subject: [PATCH 123/249] refactor: stock ageing report (#55231) --- .../stock/report/stock_ageing/stock_ageing.py | 981 +++++++++++------- .../report/stock_ageing/test_stock_ageing.py | 27 + 2 files changed, 605 insertions(+), 403 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index 77b8056f663..81fc944a4b3 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -15,10 +15,25 @@ from erpnext.stock.valuation import round_off_if_near_zero Filters = frappe._dict +FIFO_POSTING_DATE_INDEX = -2 +FIFO_QTY_INDEX = 0 +FIFO_DATE_INDEX = 1 +FIFO_VALUE_INDEX = 2 + +BATCH_SLOT_SIZE = 5 +BATCH_SLOT_BATCH_INDEX = 0 +BATCH_SLOT_VALUATION_INDEX = 1 +BATCH_SLOT_QTY_INDEX = 2 +BATCH_SLOT_DATE_INDEX = 3 +BATCH_SLOT_VALUE_INDEX = 4 + +AVERAGE_AGE_COLUMN = 6 +MAX_CHART_ITEMS = 10 + def execute(filters: Filters = None) -> tuple: to_date = filters["to_date"] - filters.ranges = [num.strip() for num in filters.range.split(",") if num.strip().isdigit()] + filters.ranges = get_age_ranges(filters.range) columns = get_columns(filters) item_details = FIFOSlots(filters).generate() @@ -29,95 +44,125 @@ def execute(filters: Filters = None) -> tuple: return columns, data, None, chart_data -def format_report_data(filters: Filters, item_details: dict, to_date: str) -> list[dict]: +def get_age_ranges(age_range: str) -> list[str]: + return [num.strip() for num in age_range.split(",") if num.strip().isdigit()] + + +def get_float_precision() -> int: + return cint(frappe.db.get_single_value("System Settings", "float_precision", cache=True)) + + +def format_report_data(filters: Filters, item_details: dict, to_date: str) -> list[list]: "Returns ordered, formatted data with ranges." - _func = itemgetter(-2) data = [] - precision = cint(frappe.db.get_single_value("System Settings", "float_precision", cache=True)) + precision = get_float_precision() for _item, item_dict in item_details.items(): if not flt(item_dict.get("total_qty"), precision): continue - earliest_age, latest_age = 0, 0 details = item_dict["details"] - - fifo_queue = sorted(filter(_func, item_dict["fifo_queue"]), key=_func) - + fifo_queue = get_report_fifo_queue(item_dict["fifo_queue"], details.has_batch_no) if not fifo_queue: continue - if details.has_batch_no: - fifo_queue = [slot[2:] if len(slot) == 5 else slot for slot in fifo_queue] - - average_age = get_average_age(fifo_queue, to_date) - earliest_age = date_diff(to_date, fifo_queue[0][1]) - latest_age = date_diff(to_date, fifo_queue[-1][1]) - range_values = get_range_age(filters, fifo_queue, to_date, item_dict) - - row = [details.name, details.item_name, details.description, details.item_group, details.brand] - - if filters.get("show_warehouse_wise_stock"): - row.append(details.warehouse) - - row.extend( - [ - flt(item_dict.get("total_qty"), precision), - average_age, - *range_values, - earliest_age, - latest_age, - details.stock_uom, - ] - ) - - data.append(row) + data.append(get_report_row(filters, item_dict, fifo_queue, to_date, precision)) return data -def get_average_age(fifo_queue: list, to_date: str) -> float: - batch_age = age_qty = total_qty = 0.0 - for batch in fifo_queue: - batch_age = date_diff(to_date, batch[1]) +def get_report_fifo_queue(fifo_queue: list, has_batch_no: bool) -> list: + get_posting_date = itemgetter(FIFO_POSTING_DATE_INDEX) + fifo_queue = sorted([slot for slot in fifo_queue if get_posting_date(slot)], key=get_posting_date) - if isinstance(batch[0], int | float): - age_qty += batch_age * batch[0] - total_qty += batch[0] - else: - age_qty += batch_age * 1 - total_qty += 1 + if has_batch_no: + return [get_batch_report_slot(slot) for slot in fifo_queue] + + return fifo_queue + + +def get_batch_report_slot(slot: list) -> list: + if is_batch_slot(slot): + return slot[BATCH_SLOT_QTY_INDEX:] + + return slot + + +def get_report_row(filters: Filters, item_dict: dict, fifo_queue: list, to_date: str, precision: int) -> list: + details = item_dict["details"] + range_values = get_range_age(filters, fifo_queue, to_date, item_dict, precision) + row = [details.name, details.item_name, details.description, details.item_group, details.brand] + + if filters.get("show_warehouse_wise_stock"): + row.append(details.warehouse) + + row.extend( + [ + flt(item_dict.get("total_qty"), precision), + get_average_age(fifo_queue, to_date), + *range_values, + date_diff(to_date, fifo_queue[0][FIFO_DATE_INDEX]), + date_diff(to_date, fifo_queue[-1][FIFO_DATE_INDEX]), + details.stock_uom, + ] + ) + + return row + + +def get_average_age(fifo_queue: list, to_date: str) -> float: + age_qty = total_qty = 0.0 + for slot in fifo_queue: + qty = get_slot_qty(slot) + age_qty += date_diff(to_date, slot[FIFO_DATE_INDEX]) * qty + total_qty += qty return flt(age_qty / total_qty, 2) if total_qty else 0.0 -def get_range_age(filters: Filters, fifo_queue: list, to_date: str, item_dict: dict) -> list: - precision = cint(frappe.db.get_single_value("System Settings", "float_precision", cache=True)) +def get_slot_qty(slot: list) -> float: + if is_qty_slot(slot): + return slot[FIFO_QTY_INDEX] + + return 1.0 + + +def get_range_age( + filters: Filters, fifo_queue: list, to_date: str, item_dict: dict, precision: int | None = None +) -> list: + precision = precision if precision is not None else get_float_precision() range_values = [0.0] * ((len(filters.ranges) * 2) + 2) - for item in fifo_queue: - age = flt(date_diff(to_date, item[1])) - qty = flt(item[0]) if not item_dict["has_serial_no"] else 1.0 - stock_value = flt(item[2]) - - for i, age_limit in enumerate(filters.ranges): - if age <= flt(age_limit): - i *= 2 - range_values[i] = flt(range_values[i] + qty, precision) - range_values[i + 1] = flt(range_values[i + 1] + stock_value, precision) - if range_values[i] == 0.0 and round_off_if_near_zero(range_values[i + 1], 2) == 0: - range_values[i + 1] = 0.0 - break - else: - range_values[-2] = flt(range_values[-2] + qty, precision) - range_values[-1] = flt(range_values[-1] + stock_value, precision) - if range_values[-2] == 0.0 and round_off_if_near_zero(range_values[-1], 2) == 0: - range_values[-1] = 0.0 + for slot in fifo_queue: + bucket_index = get_age_bucket_index(filters.ranges, slot, to_date) + qty = 1.0 if item_dict["has_serial_no"] else flt(slot[FIFO_QTY_INDEX]) + stock_value = flt(slot[FIFO_VALUE_INDEX]) + add_to_range_bucket(range_values, bucket_index, qty, stock_value, precision) return range_values +def get_age_bucket_index(age_ranges: list, slot: list, to_date: str) -> int: + age = flt(date_diff(to_date, slot[FIFO_DATE_INDEX])) + + for index, age_limit in enumerate(age_ranges): + if age <= flt(age_limit): + return index * 2 + + return len(age_ranges) * 2 + + +def add_to_range_bucket( + range_values: list, bucket_index: int, qty: float, stock_value: float, precision: int +) -> None: + range_values[bucket_index] = flt(range_values[bucket_index] + qty, precision) + range_values[bucket_index + 1] = flt(range_values[bucket_index + 1] + stock_value, precision) + + if range_values[bucket_index] == 0.0 and round_off_if_near_zero(range_values[bucket_index + 1], 2) == 0: + range_values[bucket_index + 1] = 0.0 + + def get_columns(filters: Filters) -> list[dict]: range_columns = [] setup_ageing_columns(filters, range_columns) @@ -187,14 +232,14 @@ def get_chart_data(data: list, filters: Filters) -> dict: if filters.get("show_warehouse_wise_stock"): return {} - data.sort(key=lambda row: row[6], reverse=True) + data.sort(key=lambda row: row[AVERAGE_AGE_COLUMN], reverse=True) - if len(data) > 10: - data = data[:10] + if len(data) > MAX_CHART_ITEMS: + data = data[:MAX_CHART_ITEMS] for row in data: labels.append(row[0]) - datapoints.append(row[6]) + datapoints.append(row[AVERAGE_AGE_COLUMN]) return { "data": {"labels": labels, "datasets": [{"name": _("Average Age"), "values": datapoints}]}, @@ -205,9 +250,9 @@ def get_chart_data(data: list, filters: Filters) -> dict: def setup_ageing_columns(filters: Filters, range_columns: list): prev_range_value = 0 ranges = [] - for range in filters.ranges: - ranges.append(f"{prev_range_value} - {range}") - prev_range_value = cint(range) + 1 + for age_range in filters.ranges: + ranges.append(f"{prev_range_value} - {age_range}") + prev_range_value = cint(age_range) + 1 ranges.append(f"{prev_range_value} - Above") @@ -221,6 +266,14 @@ def add_column(range_columns: list, label: str, fieldname: str, fieldtype: str = range_columns.append(dict(label=label, fieldname=fieldname, fieldtype=fieldtype, width=width)) +def is_batch_slot(slot: list) -> bool: + return len(slot) == BATCH_SLOT_SIZE + + +def is_qty_slot(slot: list) -> bool: + return isinstance(slot[FIFO_QTY_INDEX], int | float) + + class FIFOSlots: "Returns FIFO computed slots of inwarded stock as per date." @@ -235,7 +288,7 @@ class FIFOSlots: def generate(self) -> dict: """ - Returns dict of the foll.g structure: + Returns dict of the following structure: Key = Item A / (Item A, Warehouse A) Key: { 'details' -> Dict: ** item details **, @@ -243,105 +296,128 @@ class FIFOSlots: consumed/updated and maintained via FIFO. ** } """ - from erpnext.stock.serial_batch_bundle import get_serial_nos_from_bundle - stock_ledger_entries = self.sle - - bundle_wise_serial_nos = frappe._dict({}) - bundle_wise_batch_nos = frappe._dict({}) - if stock_ledger_entries is None: - bundle_wise_serial_nos = self.__get_bundle_wise_serial_nos() - bundle_wise_batch_nos = self.__get_bundle_wise_batch_nos() + bundle_wise_serial_nos, bundle_wise_batch_nos = self._get_bundle_wise_details(stock_ledger_entries) # prepare single sle voucher detail lookup self.prepare_stock_reco_voucher_wise_count() with frappe.db.unbuffered_cursor(): if stock_ledger_entries is None: - stock_ledger_entries = self.__get_stock_ledger_entries() + stock_ledger_entries = self._get_stock_ledger_entries() - for d in stock_ledger_entries: - key, fifo_queue, transferred_item_key = self.__init_key_stores(d) - prev_balance_qty = self.item_details[key].get("qty_after_transaction", 0) - - if d.voucher_type == "Stock Reconciliation" and ( - not d.batch_no or d.serial_no or d.serial_and_batch_bundle - ): - if d.voucher_detail_no in self.stock_reco_voucher_wise_count: - # for legacy recon with single sle has qty_after_transaction and stock_value_difference without outward entry - # for exisitng handle emptying the existing queue and details. - d.stock_value_difference = flt(d.qty_after_transaction * d.valuation_rate) - d.actual_qty = d.qty_after_transaction - self.item_details[key]["qty_after_transaction"] = 0 - self.item_details[key]["total_qty"] = 0 - fifo_queue.clear() - else: - d.actual_qty = flt(d.qty_after_transaction) - flt(prev_balance_qty) - - elif d.voucher_type == "Stock Reconciliation": - # get difference in qty shift as actual qty - d.actual_qty = flt(d.qty_after_transaction) - flt(prev_balance_qty) - - serial_nos = get_serial_nos(d.serial_no) if d.serial_no else [] - batch_nos = ( - [ - [ - d.batch_no.upper(), - self.__get_batchwise_valuation(d.batch_no), - abs(d.actual_qty), - abs(d.stock_value_difference), - ] - ] - if d.batch_no - else [] - ) - if d.serial_and_batch_bundle: - if d.has_serial_no: - if bundle_wise_serial_nos: - serial_nos = bundle_wise_serial_nos.get(d.serial_and_batch_bundle) or [] - else: - serial_nos = sorted(get_serial_nos_from_bundle(d.serial_and_batch_bundle)) or [] - elif d.has_batch_no: - if bundle_wise_batch_nos: - batch_nos = bundle_wise_batch_nos.get(d.serial_and_batch_bundle) or [] - else: - batch_nos = ( - self.__get_bundle_wise_batch_nos(d.serial_and_batch_bundle).get( - d.serial_and_batch_bundle - ) - or [] - ) - - serial_nos = self.uppercase_serial_nos(serial_nos) - if d.actual_qty > 0: - self.__compute_incoming_stock(d, fifo_queue, transferred_item_key, serial_nos, batch_nos) - else: - self.__compute_outgoing_stock(d, fifo_queue, transferred_item_key, serial_nos, batch_nos) - - self.__update_balances(d, key) - - # handle serial nos misconsumption - if d.has_serial_no: - qty_after = cint(self.item_details[key]["qty_after_transaction"]) - if qty_after <= 0: - fifo_queue.clear() - elif len(fifo_queue) > qty_after: - fifo_queue[:] = fifo_queue[:qty_after] + for row in stock_ledger_entries: + self._process_stock_ledger_entry(row, bundle_wise_serial_nos, bundle_wise_batch_nos) # Note that stock_ledger_entries is an iterator, you can not reuse it like a list del stock_ledger_entries if not self.filters.get("show_warehouse_wise_stock"): # (Item 1, WH 1), (Item 1, WH 2) => (Item 1) - self.item_details = self.__aggregate_details_by_item(self.item_details) + self.item_details = self._aggregate_details_by_item(self.item_details) return self.item_details + def _get_bundle_wise_details(self, stock_ledger_entries: list | None) -> tuple[dict, dict]: + if stock_ledger_entries is not None: + return frappe._dict({}), frappe._dict({}) + + return self._get_bundle_wise_serial_nos(), self._get_bundle_wise_batch_nos() + + def _process_stock_ledger_entry( + self, row: dict, bundle_wise_serial_nos: dict, bundle_wise_batch_nos: dict + ) -> None: + key, fifo_queue, transferred_item_key = self._init_key_stores(row) + prev_balance_qty = self.item_details[key].get("qty_after_transaction", 0) + + self._set_stock_reconciliation_actual_qty(row, key, fifo_queue, prev_balance_qty) + serial_nos, batch_nos = self._get_serial_and_batch_nos( + row, bundle_wise_serial_nos, bundle_wise_batch_nos + ) + + if row.actual_qty > 0: + self._compute_incoming_stock(row, fifo_queue, transferred_item_key, serial_nos, batch_nos) + else: + self._compute_outgoing_stock(row, fifo_queue, transferred_item_key, serial_nos, batch_nos) + + self._update_balances(row, key) + self._trim_serial_fifo_queue(row, key, fifo_queue) + + def _set_stock_reconciliation_actual_qty( + self, row: dict, key: tuple, fifo_queue: list, prev_balance_qty: float + ) -> None: + if row.voucher_type != "Stock Reconciliation": + return + + if not row.batch_no or row.serial_no or row.serial_and_batch_bundle: + if row.voucher_detail_no in self.stock_reco_voucher_wise_count: + # Legacy reconciliation with a single SLE has qty_after_transaction and + # stock_value_difference without an outward entry, so reset the queue first. + row.stock_value_difference = flt(row.qty_after_transaction * row.valuation_rate) + row.actual_qty = row.qty_after_transaction + self.item_details[key]["qty_after_transaction"] = 0 + self.item_details[key]["total_qty"] = 0 + fifo_queue.clear() + return + + # Stock reconciliation stores the final balance; FIFO needs the movement delta. + row.actual_qty = flt(row.qty_after_transaction) - flt(prev_balance_qty) + + def _get_serial_and_batch_nos( + self, row: dict, bundle_wise_serial_nos: dict, bundle_wise_batch_nos: dict + ) -> tuple[list, list]: + from erpnext.stock.serial_batch_bundle import get_serial_nos_from_bundle + + serial_nos = get_serial_nos(row.serial_no) if row.serial_no else [] + batch_nos = self._get_row_batch_nos(row) + + if row.serial_and_batch_bundle: + if row.has_serial_no: + if bundle_wise_serial_nos: + serial_nos = bundle_wise_serial_nos.get(row.serial_and_batch_bundle) or [] + else: + serial_nos = sorted(get_serial_nos_from_bundle(row.serial_and_batch_bundle)) or [] + elif row.has_batch_no: + if bundle_wise_batch_nos: + batch_nos = bundle_wise_batch_nos.get(row.serial_and_batch_bundle) or [] + else: + batch_nos = ( + self._get_bundle_wise_batch_nos(row.serial_and_batch_bundle).get( + row.serial_and_batch_bundle + ) + or [] + ) + + return self.uppercase_serial_nos(serial_nos), batch_nos + + def _get_row_batch_nos(self, row: dict) -> list: + if not row.batch_no: + return [] + + return [ + [ + row.batch_no.upper(), + self._get_batchwise_valuation(row.batch_no), + abs(row.actual_qty), + abs(row.stock_value_difference), + ] + ] + + def _trim_serial_fifo_queue(self, row: dict, key: tuple, fifo_queue: list) -> None: + if not row.has_serial_no: + return + + qty_after = cint(self.item_details[key]["qty_after_transaction"]) + if qty_after <= 0: + fifo_queue.clear() + elif len(fifo_queue) > qty_after: + fifo_queue[:] = fifo_queue[:qty_after] + def uppercase_serial_nos(self, serial_nos): "Convert serial nos to uppercase for uniformity." return [sn.upper() for sn in serial_nos] - def __get_batchwise_valuation(self, batch_no: str): + def _get_batchwise_valuation(self, batch_no: str): if batch_no not in self.batchwise_valuation_by_batch: self.batchwise_valuation_by_batch[batch_no] = frappe.db.get_value( "Batch", batch_no, "use_batchwise_valuation" @@ -349,7 +425,7 @@ class FIFOSlots: return self.batchwise_valuation_by_batch[batch_no] - def __init_key_stores(self, row: dict) -> tuple: + def _init_key_stores(self, row: dict) -> tuple: "Initialise keys and FIFO Queue." key = (row.name, row.warehouse) @@ -361,290 +437,389 @@ class FIFOSlots: return key, fifo_queue, transferred_item_key - def __compute_incoming_stock( + def _compute_incoming_stock( self, row: dict, fifo_queue: list, transfer_key: tuple, serial_nos: list, batch_nos: list ): "Update FIFO Queue on inward stock." - - def set_fifo_queue_for_serial_items(): - valuation = row.stock_value_difference / row.actual_qty - for serial_no in serial_nos: - if self.serial_no_details.get(serial_no): - fifo_queue.append([serial_no, self.serial_no_details.get(serial_no), valuation]) - else: - self.serial_no_details.setdefault(serial_no, row.posting_date) - fifo_queue.append([serial_no, row.posting_date, valuation]) - - def set_fifo_queue_for_batch_items(): - for batch_no, use_batchwise_valuation, qty, stock_value_difference in batch_nos: - qty, stock_value_difference = neutralize_negative_batch_stock( - batch_no, use_batchwise_valuation, qty, stock_value_difference - ) - - if not qty: - continue - - if self.batch_no_details.get(batch_no): - fifo_queue.append( - [ - batch_no, - use_batchwise_valuation, - qty, - self.batch_no_details.get(batch_no), - stock_value_difference, - ] - ) - else: - self.batch_no_details.setdefault(batch_no, row.posting_date) - fifo_queue.append( - [batch_no, use_batchwise_valuation, qty, row.posting_date, stock_value_difference] - ) - - def neutralize_negative_batch_stock(batch_no, use_batchwise_valuation, qty, stock_value_difference): - qty = flt(qty) - stock_value_difference = flt(stock_value_difference) - - if not qty: - return qty, stock_value_difference - - for slot in list(fifo_queue): - if ( - len(slot) != 5 - or slot[0] != batch_no - or slot[1] != use_batchwise_valuation - or flt(slot[2]) >= 0 - ): - continue - - qty_to_adjust = min(qty, abs(flt(slot[2]))) - value_to_adjust = ( - stock_value_difference - if qty_to_adjust == qty - else flt(stock_value_difference * (qty_to_adjust / qty)) - ) - - slot[2] = flt(slot[2]) + qty_to_adjust - slot[3] = row.posting_date - slot[4] = flt(slot[4]) + value_to_adjust - - qty = flt(qty - qty_to_adjust) - stock_value_difference = flt(stock_value_difference - value_to_adjust) - - if not flt(slot[2]) and not flt(slot[4]): - fifo_queue.remove(slot) - - if not qty: - break - - return qty, stock_value_difference - transfer_data = self.transferred_item_details.get(transfer_key) if transfer_data: # inward/outward from same voucher, item & warehouse # eg: Repack with same item, Stock reco for batch item # consume transfer data and add stock to fifo queue - self.__adjust_incoming_transfer_qty(transfer_data, fifo_queue, row, batch_nos) + self._adjust_incoming_transfer_qty( + transfer_data, + fifo_queue, + row, + batch_nos, + serial_nos=serial_nos if row.get("has_serial_no") else None, + ) + elif serial_nos and row.get("has_serial_no"): + self._add_serial_fifo_slots(row, fifo_queue, serial_nos) + elif batch_nos and row.get("has_batch_no"): + self._add_batch_fifo_slots(row, fifo_queue, batch_nos) + elif fifo_queue and flt(fifo_queue[0][FIFO_QTY_INDEX]) <= 0: + self._add_to_negative_fifo_head(row, fifo_queue) else: - if serial_nos and row.get("has_serial_no"): - set_fifo_queue_for_serial_items() - elif batch_nos and row.get("has_batch_no"): - set_fifo_queue_for_batch_items() - elif fifo_queue and flt(fifo_queue[0][0]) <= 0: - # neutralize 0/negative stock by adding positive stock - fifo_queue[0][0] += flt(row.actual_qty) - fifo_queue[0][1] = row.posting_date - fifo_queue[0][2] += flt(row.stock_value_difference) - else: - fifo_queue.append([flt(row.actual_qty), row.posting_date, flt(row.stock_value_difference)]) + fifo_queue.append([flt(row.actual_qty), row.posting_date, flt(row.stock_value_difference)]) - def __compute_outgoing_stock( + def _add_serial_fifo_slots(self, row: dict, fifo_queue: list, serial_nos: list) -> None: + valuation = row.stock_value_difference / row.actual_qty + for serial_no in serial_nos: + posting_date = self.serial_no_details.setdefault(serial_no, row.posting_date) + fifo_queue.append([serial_no, posting_date, valuation]) + + def _add_batch_fifo_slots(self, row: dict, fifo_queue: list, batch_nos: list) -> None: + for batch_no, use_batchwise_valuation, qty, stock_value_difference in batch_nos: + qty, stock_value_difference = self._neutralize_negative_batch_stock( + fifo_queue, row, batch_no, use_batchwise_valuation, qty, stock_value_difference + ) + + if not qty: + continue + + posting_date = self.batch_no_details.setdefault(batch_no, row.posting_date) + fifo_queue.append([batch_no, use_batchwise_valuation, qty, posting_date, stock_value_difference]) + + def _neutralize_negative_batch_stock( + self, + fifo_queue: list, + row: dict, + batch_no: str, + use_batchwise_valuation: bool, + qty: float, + stock_value_difference: float, + ) -> tuple[float, float]: + qty = flt(qty) + stock_value_difference = flt(stock_value_difference) + + if not qty: + return qty, stock_value_difference + + for slot in list(fifo_queue): + if not self._is_matching_negative_batch_slot(slot, batch_no, use_batchwise_valuation): + continue + + qty_to_adjust = min(qty, abs(flt(slot[BATCH_SLOT_QTY_INDEX]))) + value_to_adjust = ( + stock_value_difference + if qty_to_adjust == qty + else flt(stock_value_difference * (qty_to_adjust / qty)) + ) + + slot[BATCH_SLOT_QTY_INDEX] = flt(slot[BATCH_SLOT_QTY_INDEX]) + qty_to_adjust + slot[BATCH_SLOT_DATE_INDEX] = row.posting_date + slot[BATCH_SLOT_VALUE_INDEX] = flt(slot[BATCH_SLOT_VALUE_INDEX]) + value_to_adjust + + qty = flt(qty - qty_to_adjust) + stock_value_difference = flt(stock_value_difference - value_to_adjust) + + if not flt(slot[BATCH_SLOT_QTY_INDEX]) and not flt(slot[BATCH_SLOT_VALUE_INDEX]): + fifo_queue.remove(slot) + + if not qty: + break + + return qty, stock_value_difference + + def _is_matching_negative_batch_slot( + self, slot: list, batch_no: str, use_batchwise_valuation: bool, include_zero_qty: bool = False + ) -> bool: + if not is_batch_slot(slot): + return False + + qty = flt(slot[BATCH_SLOT_QTY_INDEX]) + + return ( + slot[BATCH_SLOT_BATCH_INDEX] == batch_no + and slot[BATCH_SLOT_VALUATION_INDEX] == use_batchwise_valuation + and (qty <= 0 if include_zero_qty else qty < 0) + ) + + def _add_to_negative_fifo_head(self, row: dict, fifo_queue: list) -> None: + fifo_queue[0][FIFO_QTY_INDEX] += flt(row.actual_qty) + fifo_queue[0][FIFO_DATE_INDEX] = row.posting_date + fifo_queue[0][FIFO_VALUE_INDEX] += flt(row.stock_value_difference) + + def _compute_outgoing_stock( self, row: dict, fifo_queue: list, transfer_key: tuple, serial_nos: list, batch_nos: list ): "Update FIFO Queue on outward stock." if serial_nos: - fifo_queue[:] = [serial_no for serial_no in fifo_queue if serial_no[0] not in serial_nos] + self._consume_serial_fifo_slots(fifo_queue, serial_nos) elif batch_nos: - for batch_no, use_batchwise_valuation, qty, stock_value_difference in batch_nos: - items_to_remove = [] - - for slot in fifo_queue: - slot_batch_no, slot_use_batchwise_valuation, slot_qty, _, slot_stock_value = slot - - if flt(slot_qty) <= 0: - continue - - # Batchwise valuation: consume only from same batch - if use_batchwise_valuation: - if slot_batch_no != batch_no: - continue - # Non-batchwise valuation: consume from any non-batchwise batch - else: - if slot_use_batchwise_valuation: - continue - - if flt(slot_qty) <= qty: - qty -= flt(slot_qty) - stock_value_difference -= flt(slot_stock_value) - self.transferred_item_details[transfer_key].append( - [flt(slot_qty), slot[3], flt(slot_stock_value)] - ) - items_to_remove.append(slot) - else: - slot[2] = flt(slot_qty) - qty - # preserve ledger valuation (moving average / SLE value), not slot proportional value - slot[4] = flt(slot_stock_value) - stock_value_difference - self.transferred_item_details[transfer_key].append( - [qty, slot[3], stock_value_difference] - ) - qty = 0 - stock_value_difference = 0 - break - - for item in items_to_remove: - fifo_queue.remove(item) - - if qty: - fifo_queue.append( - [ - batch_no, - use_batchwise_valuation, - -(qty), - row.posting_date, - -(stock_value_difference), - ] - ) - self.transferred_item_details[transfer_key].append( - [qty, row.posting_date, stock_value_difference] - ) + self._consume_batch_fifo_slots(row, fifo_queue, transfer_key, batch_nos) else: - qty_to_pop = abs(row.actual_qty) - stock_value = abs(row.stock_value_difference) + self._consume_fifo_slots(row, fifo_queue, transfer_key) - while qty_to_pop: - slot = fifo_queue[0] if fifo_queue else [0, None, 0] - if 0 < flt(slot[0]) <= qty_to_pop: - # qty to pop >= slot qty - # if +ve and not enough or exactly same balance in current slot, consume whole slot - qty_to_pop -= flt(slot[0]) - stock_value -= flt(slot[2]) - self.transferred_item_details[transfer_key].append(fifo_queue.pop(0)) - elif not fifo_queue: - # negative stock, no balance but qty yet to consume - fifo_queue.append([-(qty_to_pop), row.posting_date, -(stock_value)]) + def _consume_serial_fifo_slots(self, fifo_queue: list, serial_nos: list) -> None: + fifo_queue[:] = [slot for slot in fifo_queue if slot[FIFO_QTY_INDEX] not in serial_nos] + + def _consume_batch_fifo_slots( + self, row: dict, fifo_queue: list, transfer_key: tuple, batch_nos: list + ) -> None: + for batch_no, use_batchwise_valuation, qty, stock_value_difference in batch_nos: + items_to_remove = [] + + for slot in fifo_queue: + if not self._can_consume_batch_slot(slot, batch_no, use_batchwise_valuation): + continue + + slot_qty = flt(slot[BATCH_SLOT_QTY_INDEX]) + slot_stock_value = flt(slot[BATCH_SLOT_VALUE_INDEX]) + + if slot_qty <= qty: + qty -= slot_qty + stock_value_difference -= slot_stock_value self.transferred_item_details[transfer_key].append( - [qty_to_pop, row.posting_date, stock_value] + [slot_qty, slot[BATCH_SLOT_DATE_INDEX], slot_stock_value] ) - qty_to_pop = 0 - stock_value = 0 + items_to_remove.append(slot) else: - # qty to pop < slot qty, ample balance - # consume actual_qty from first slot - slot[0] = flt(slot[0]) - qty_to_pop - slot[2] = flt(slot[2]) - stock_value - self.transferred_item_details[transfer_key].append([qty_to_pop, slot[1], stock_value]) - qty_to_pop = 0 - stock_value = 0 + slot[BATCH_SLOT_QTY_INDEX] = slot_qty - qty + # Preserve ledger valuation (moving average / SLE value), not slot proportional value. + slot[BATCH_SLOT_VALUE_INDEX] = slot_stock_value - stock_value_difference + self.transferred_item_details[transfer_key].append( + [qty, slot[BATCH_SLOT_DATE_INDEX], stock_value_difference] + ) + qty = 0 + stock_value_difference = 0 + break - def __adjust_incoming_transfer_qty( - self, transfer_data: dict, fifo_queue: list, row: dict, batch_nos: list | None = None + for item in items_to_remove: + fifo_queue.remove(item) + + if qty: + self._append_negative_batch_slot( + row, + fifo_queue, + transfer_key, + batch_no, + use_batchwise_valuation, + qty, + stock_value_difference, + ) + + def _can_consume_batch_slot(self, slot: list, batch_no: str, use_batchwise_valuation: bool) -> bool: + if not is_batch_slot(slot): + return False + + if flt(slot[BATCH_SLOT_QTY_INDEX]) <= 0: + return False + + if use_batchwise_valuation: + return slot[BATCH_SLOT_BATCH_INDEX] == batch_no + + return not slot[BATCH_SLOT_VALUATION_INDEX] + + def _append_negative_batch_slot( + self, + row: dict, + fifo_queue: list, + transfer_key: tuple, + batch_no: str, + use_batchwise_valuation: bool, + qty: float, + stock_value_difference: float, + ) -> None: + fifo_queue.append( + [batch_no, use_batchwise_valuation, -(qty), row.posting_date, -(stock_value_difference)] + ) + self.transferred_item_details[transfer_key].append([qty, row.posting_date, stock_value_difference]) + + def _consume_fifo_slots(self, row: dict, fifo_queue: list, transfer_key: tuple) -> None: + qty_to_pop = abs(row.actual_qty) + stock_value = abs(row.stock_value_difference) + + while qty_to_pop: + slot = fifo_queue[0] if fifo_queue else [0, None, 0] + slot_qty = flt(slot[FIFO_QTY_INDEX]) + slot_value = flt(slot[FIFO_VALUE_INDEX]) + + if 0 < slot_qty <= qty_to_pop: + qty_to_pop -= slot_qty + stock_value -= slot_value + self.transferred_item_details[transfer_key].append(fifo_queue.pop(0)) + elif not fifo_queue: + fifo_queue.append([-(qty_to_pop), row.posting_date, -(stock_value)]) + self.transferred_item_details[transfer_key].append( + [qty_to_pop, row.posting_date, stock_value] + ) + qty_to_pop = 0 + stock_value = 0 + else: + slot[FIFO_QTY_INDEX] = slot_qty - qty_to_pop + slot[FIFO_VALUE_INDEX] = slot_value - stock_value + self.transferred_item_details[transfer_key].append( + [qty_to_pop, slot[FIFO_DATE_INDEX], stock_value] + ) + qty_to_pop = 0 + stock_value = 0 + + def _adjust_incoming_transfer_qty( + self, + transfer_data: dict, + fifo_queue: list, + row: dict, + batch_nos: list | None = None, + serial_nos: list | None = None, ): "Add previously removed stock back to FIFO Queue." transfer_qty_to_pop = flt(row.actual_qty) stock_value = flt(row.stock_value_difference) batch_nos = [list(batch_no) for batch_no in batch_nos or []] - - def is_batch_slot(slot): - return len(slot) == 5 - - def get_incoming_slots(qty, posting_date, value): - if not batch_nos: - return [[qty, posting_date, value]] - - incoming_slots = [] - remaining_qty = flt(qty) - remaining_value = flt(value) - - while remaining_qty and batch_nos: - batch_no, use_batchwise_valuation, batch_qty, _ = batch_nos[0] - batch_qty = flt(batch_qty) - slot_qty = min(batch_qty, remaining_qty) - slot_value = ( - remaining_value - if slot_qty == remaining_qty - else flt(remaining_value * (slot_qty / remaining_qty)) - ) - - incoming_slots.append([batch_no, use_batchwise_valuation, slot_qty, posting_date, slot_value]) - - batch_nos[0][2] = flt(batch_qty - slot_qty) - if not batch_nos[0][2]: - batch_nos.pop(0) - - remaining_qty = flt(remaining_qty - slot_qty) - remaining_value = flt(remaining_value - slot_value) - - if remaining_qty: - incoming_slots.append([remaining_qty, posting_date, remaining_value]) - - return incoming_slots - - def add_to_fifo_queue(slot): - matching_negative_batch_slot = next( - ( - existing_slot - for existing_slot in fifo_queue - if is_batch_slot(existing_slot) - and is_batch_slot(slot) - and flt(existing_slot[2]) <= 0 - and existing_slot[0] == slot[0] - and existing_slot[1] == slot[1] - ), - None, - ) - - if ( - fifo_queue - and not is_batch_slot(fifo_queue[0]) - and not is_batch_slot(slot) - and flt(fifo_queue[0][0]) <= 0 - ): - fifo_queue[0][0] += flt(slot[0]) - fifo_queue[0][1] = slot[1] - fifo_queue[0][2] += flt(slot[2]) - elif matching_negative_batch_slot: - matching_negative_batch_slot[2] += flt(slot[2]) - matching_negative_batch_slot[3] = slot[3] - matching_negative_batch_slot[4] += flt(slot[4]) - else: - fifo_queue.append(slot) + serial_nos = list(serial_nos or []) while transfer_qty_to_pop: - if transfer_data and 0 < flt(transfer_data[0][0]) <= transfer_qty_to_pop: + if transfer_data and 0 < flt(transfer_data[0][FIFO_QTY_INDEX]) <= transfer_qty_to_pop: # bucket qty is not enough, consume whole - transfer_qty = flt(transfer_data[0][0]) - transfer_date = transfer_data[0][1] - transfer_value = flt(transfer_data[0][2]) + transfer_qty = flt(transfer_data[0][FIFO_QTY_INDEX]) + transfer_date = transfer_data[0][FIFO_DATE_INDEX] + transfer_value = flt(transfer_data[0][FIFO_VALUE_INDEX]) transfer_qty_to_pop -= transfer_qty stock_value -= transfer_value - for slot in get_incoming_slots(transfer_qty, transfer_date, transfer_value): - add_to_fifo_queue(slot) + self._add_incoming_transfer_slots( + fifo_queue, batch_nos, transfer_qty, transfer_date, transfer_value, serial_nos + ) transfer_data.pop(0) elif not transfer_data: # transfer bucket is empty, extra incoming qty - for slot in get_incoming_slots(transfer_qty_to_pop, row.posting_date, stock_value): - add_to_fifo_queue(slot) + self._add_incoming_transfer_slots( + fifo_queue, batch_nos, transfer_qty_to_pop, row.posting_date, stock_value, serial_nos + ) transfer_qty_to_pop = 0 stock_value = 0 else: # ample bucket qty to consume - transfer_data[0][0] -= transfer_qty_to_pop - transfer_data[0][2] -= stock_value - for slot in get_incoming_slots(transfer_qty_to_pop, transfer_data[0][1], stock_value): - add_to_fifo_queue(slot) + transfer_data[0][FIFO_QTY_INDEX] -= transfer_qty_to_pop + transfer_data[0][FIFO_VALUE_INDEX] -= stock_value + self._add_incoming_transfer_slots( + fifo_queue, + batch_nos, + transfer_qty_to_pop, + transfer_data[0][FIFO_DATE_INDEX], + stock_value, + serial_nos, + ) transfer_qty_to_pop = 0 stock_value = 0 - def __update_balances(self, row: dict, key: tuple | str): + def _add_incoming_transfer_slots( + self, + fifo_queue: list, + batch_nos: list, + qty: float, + posting_date: str, + value: float, + serial_nos: list | None = None, + ) -> None: + for slot in self._get_incoming_transfer_slots(batch_nos, qty, posting_date, value, serial_nos): + self._add_transfer_slot_to_fifo_queue(fifo_queue, slot) + + def _get_incoming_transfer_slots( + self, + batch_nos: list, + qty: float, + posting_date: str, + value: float, + serial_nos: list | None = None, + ) -> list: + if serial_nos: + return self._get_serial_incoming_transfer_slots(serial_nos, qty, posting_date, value) + + if not batch_nos: + return [[qty, posting_date, value]] + + incoming_slots = [] + remaining_qty = flt(qty) + remaining_value = flt(value) + + while remaining_qty and batch_nos: + batch_no, use_batchwise_valuation, batch_qty, _ = batch_nos[0] + batch_qty = flt(batch_qty) + slot_qty = min(batch_qty, remaining_qty) + slot_value = ( + remaining_value + if slot_qty == remaining_qty + else flt(remaining_value * (slot_qty / remaining_qty)) + ) + + incoming_slots.append([batch_no, use_batchwise_valuation, slot_qty, posting_date, slot_value]) + + batch_nos[0][2] = flt(batch_qty - slot_qty) + if not batch_nos[0][2]: + batch_nos.pop(0) + + remaining_qty = flt(remaining_qty - slot_qty) + remaining_value = flt(remaining_value - slot_value) + + if remaining_qty: + incoming_slots.append([remaining_qty, posting_date, remaining_value]) + + return incoming_slots + + def _get_serial_incoming_transfer_slots( + self, serial_nos: list, qty: float, posting_date: str, value: float + ) -> list: + incoming_slots = [] + remaining_value = flt(value) + serial_count = min(cint(qty), len(serial_nos)) + + for index in range(serial_count): + serial_no = serial_nos.pop(0) + serial_value = remaining_value if index == serial_count - 1 else flt(value / serial_count) + serial_posting_date = self.serial_no_details.setdefault(serial_no, posting_date) + + incoming_slots.append([serial_no, serial_posting_date, serial_value]) + remaining_value = flt(remaining_value - serial_value) + + return incoming_slots + + def _add_transfer_slot_to_fifo_queue(self, fifo_queue: list, slot: list) -> None: + matching_negative_batch_slot = self._get_matching_negative_batch_slot(fifo_queue, slot) + + if ( + fifo_queue + and is_qty_slot(fifo_queue[0]) + and is_qty_slot(slot) + and flt(fifo_queue[0][FIFO_QTY_INDEX]) <= 0 + ): + fifo_queue[0][FIFO_QTY_INDEX] += flt(slot[FIFO_QTY_INDEX]) + fifo_queue[0][FIFO_DATE_INDEX] = slot[FIFO_DATE_INDEX] + fifo_queue[0][FIFO_VALUE_INDEX] += flt(slot[FIFO_VALUE_INDEX]) + elif matching_negative_batch_slot: + matching_negative_batch_slot[BATCH_SLOT_QTY_INDEX] += flt(slot[BATCH_SLOT_QTY_INDEX]) + matching_negative_batch_slot[BATCH_SLOT_DATE_INDEX] = slot[BATCH_SLOT_DATE_INDEX] + matching_negative_batch_slot[BATCH_SLOT_VALUE_INDEX] += flt(slot[BATCH_SLOT_VALUE_INDEX]) + if self._is_empty_batch_slot(matching_negative_batch_slot): + fifo_queue.remove(matching_negative_batch_slot) + else: + fifo_queue.append(slot) + + def _is_empty_batch_slot(self, slot: list) -> bool: + return ( + not flt(slot[BATCH_SLOT_QTY_INDEX]) + and round_off_if_near_zero(slot[BATCH_SLOT_VALUE_INDEX], 2) == 0 + ) + + def _get_matching_negative_batch_slot(self, fifo_queue: list, slot: list) -> list | None: + if not is_batch_slot(slot): + return None + + return next( + ( + existing_slot + for existing_slot in fifo_queue + if self._is_matching_negative_batch_slot( + existing_slot, + slot[BATCH_SLOT_BATCH_INDEX], + slot[BATCH_SLOT_VALUATION_INDEX], + include_zero_qty=True, + ) + ), + None, + ) + + def _update_balances(self, row: dict, key: tuple | str): self.item_details[key]["qty_after_transaction"] = row.qty_after_transaction if "total_qty" not in self.item_details[key]: self.item_details[key]["total_qty"] = row.actual_qty @@ -655,7 +830,7 @@ class FIFOSlots: self.item_details[key]["has_batch_no"] = row.has_batch_no self.item_details[key]["details"].valuation_rate = row.valuation_rate - def __aggregate_details_by_item(self, wh_wise_data: dict) -> dict: + def _aggregate_details_by_item(self, wh_wise_data: dict) -> dict: "Aggregate Item-Wh wise data into single Item entry." item_aggregated_data = {} for key, row in wh_wise_data.items(): @@ -680,9 +855,9 @@ class FIFOSlots: return item_aggregated_data - def __get_stock_ledger_entries(self) -> Iterator[dict]: + def _get_stock_ledger_entries(self) -> Iterator[dict]: sle = frappe.qb.DocType("Stock Ledger Entry") - item = self.__get_item_query() # used as derived table in sle query + item = self._get_item_query() # used as derived table in sle query to_date = get_datetime(self.filters.get("to_date") + " 23:59:59") sle_query = ( @@ -719,7 +894,7 @@ class FIFOSlots: ) if self.filters.get("warehouse"): - sle_query = self.__get_warehouse_conditions(sle, sle_query) + sle_query = self._get_warehouse_conditions(sle, sle_query) elif self.filters.get("warehouse_type"): warehouses = frappe.get_all( "Warehouse", @@ -734,7 +909,7 @@ class FIFOSlots: return sle_query.run(as_dict=True, as_iterator=True) - def __get_bundle_wise_serial_nos(self) -> dict: + def _get_bundle_wise_serial_nos(self) -> dict: bundle = frappe.qb.DocType("Serial and Batch Bundle") entry = frappe.qb.DocType("Serial and Batch Entry") @@ -757,7 +932,7 @@ class FIFOSlots: query = query.where(bundle[field] == self.filters.get(field)) if self.filters.get("warehouse"): - query = self.__get_warehouse_conditions(bundle, query) + query = self._get_warehouse_conditions(bundle, query) bundle_wise_serial_nos = frappe._dict({}) for bundle_name, serial_no in query.run(): @@ -765,7 +940,7 @@ class FIFOSlots: return bundle_wise_serial_nos - def __get_bundle_wise_batch_nos(self, sabb_name=None) -> dict: + def _get_bundle_wise_batch_nos(self, sabb_name=None) -> dict: bundle = frappe.qb.DocType("Serial and Batch Bundle") entry = frappe.qb.DocType("Serial and Batch Entry") batch = frappe.qb.DocType("Batch") @@ -797,7 +972,7 @@ class FIFOSlots: query = query.where(bundle[field] == self.filters.get(field)) if self.filters.get("warehouse"): - query = self.__get_warehouse_conditions(bundle, query) + query = self._get_warehouse_conditions(bundle, query) if sabb_name: query = query.where(bundle.name == sabb_name) @@ -810,7 +985,7 @@ class FIFOSlots: return bundle_wise_batch_nos - def __get_item_query(self) -> str: + def _get_item_query(self) -> str: item_table = frappe.qb.DocType("Item") item = frappe.qb.from_("Item").select( @@ -832,7 +1007,7 @@ class FIFOSlots: return item - def __get_warehouse_conditions(self, sle, sle_query) -> str: + def _get_warehouse_conditions(self, sle, sle_query) -> str: warehouse = frappe.qb.DocType("Warehouse") lft, rgt = frappe.db.get_value("Warehouse", self.filters.get("warehouse"), ["lft", "rgt"]) diff --git a/erpnext/stock/report/stock_ageing/test_stock_ageing.py b/erpnext/stock/report/stock_ageing/test_stock_ageing.py index dee556e1e88..3fdae7ca281 100644 --- a/erpnext/stock/report/stock_ageing/test_stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/test_stock_ageing.py @@ -893,6 +893,33 @@ class TestStockAgeing(ERPNextTestSuite): self.assertEqual(report_data[0][7:15], [8.0, 80.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]) + def test_serial_transfer_replay_preserves_serial_slots(self): + fifo_slots = FIFOSlots(self.filters, []) + transfer_key = ("001", "Serial Item", "WH 1") + fifo_slots.transferred_item_details[transfer_key] = [[2, "2021-12-01", 20]] + + row = frappe._dict( + name="Serial Item", + actual_qty=2, + stock_value_difference=20, + posting_date="2021-12-05", + has_serial_no=True, + ) + fifo_queue = [] + + fifo_slots._compute_incoming_stock(row, fifo_queue, transfer_key, ["SN-A", "SN-B"], []) + + self.assertEqual(fifo_queue, [["SN-A", "2021-12-01", 10.0], ["SN-B", "2021-12-01", 10.0]]) + self.assertFalse(fifo_slots.transferred_item_details[transfer_key]) + + def test_batch_transfer_replay_removes_zeroed_negative_slot(self): + fifo_slots = FIFOSlots(self.filters, []) + fifo_queue = [["SA-ZERO-BATCH", 1, -4, "2021-12-01", -40]] + + fifo_slots._add_transfer_slot_to_fifo_queue(fifo_queue, ["SA-ZERO-BATCH", 1, 4, "2021-12-02", 40]) + + self.assertEqual(fifo_queue, []) + def test_batchwise_valuation(self): from erpnext.stock.doctype.item.test_item import make_item From 7ae6535be99a550ba91183e3e3898e3929a0582e Mon Sep 17 00:00:00 2001 From: MochaMind Date: Sun, 24 May 2026 18:17:38 +0530 Subject: [PATCH 124/249] chore: update POT file (#55235) --- erpnext/locale/main.pot | 2278 ++++++++++++++++++++------------------- 1 file changed, 1140 insertions(+), 1138 deletions(-) diff --git a/erpnext/locale/main.pot b/erpnext/locale/main.pot index b8e61b6b453..58b7dd7d723 100644 --- a/erpnext/locale/main.pot +++ b/erpnext/locale/main.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ERPNext VERSION\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-17 10:04+0000\n" -"PO-Revision-Date: 2026-05-17 10:04+0000\n" +"POT-Creation-Date: 2026-05-24 10:11+0000\n" +"PO-Revision-Date: 2026-05-24 10:11+0000\n" "Last-Translator: hello@frappe.io\n" "Language-Team: hello@frappe.io\n" "MIME-Version: 1.0\n" @@ -267,7 +267,7 @@ msgstr "" msgid "% of materials delivered against this Sales Order" msgstr "" -#: erpnext/controllers/accounts_controller.py:2387 +#: erpnext/controllers/accounts_controller.py:2388 msgid "'Account' in the Accounting section of Customer {0}" msgstr "" @@ -283,7 +283,7 @@ msgstr "" msgid "'Days Since Last Order' must be greater than or equal to zero" msgstr "" -#: erpnext/controllers/accounts_controller.py:2392 +#: erpnext/controllers/accounts_controller.py:2393 msgid "'Default {0} Account' in Company {1}" msgstr "" @@ -345,8 +345,8 @@ msgstr "" msgid "'{0}' has been already added." msgstr "" -#: erpnext/setup/doctype/company/company.py:303 -#: erpnext/setup/doctype/company/company.py:314 +#: erpnext/setup/doctype/company/company.py:307 +#: erpnext/setup/doctype/company/company.py:318 msgid "'{0}' should be in company currency {1}." msgstr "" @@ -516,8 +516,8 @@ msgstr "" msgid "11-50" msgstr "" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:95 -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:101 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:107 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:113 msgid "1{0}" msgstr "" @@ -606,8 +606,8 @@ msgstr "" msgid "90 Above" msgstr "" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1348 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1349 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1271 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1272 msgid "<0" msgstr "" @@ -782,7 +782,7 @@ msgstr "" msgid "
  • Clearance date must be after cheque date for row(s): {0}
  • " msgstr "" -#: erpnext/controllers/accounts_controller.py:2270 +#: erpnext/controllers/accounts_controller.py:2271 msgid "
  • Item {0} in row(s) {1} billed more than {2}
  • " msgstr "" @@ -799,7 +799,7 @@ msgstr "" msgid "
  • {}
  • " msgstr "" -#: erpnext/controllers/accounts_controller.py:2267 +#: erpnext/controllers/accounts_controller.py:2268 msgid "

    Cannot overbill for the following Items:

    " msgstr "" @@ -844,7 +844,7 @@ msgstr "" msgid "

    Price List Rate has not been set as editable in Selling Settings. In this scenario, setting Update Price List Based On to Price List Rate will prevent auto-updation of Item Price.

    Are you sure you want to continue?" msgstr "" -#: erpnext/controllers/accounts_controller.py:2279 +#: erpnext/controllers/accounts_controller.py:2280 msgid "

    To allow over-billing, please set allowance in Accounts Settings.

    " msgstr "" @@ -988,7 +988,7 @@ msgstr "" msgid "A - C" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:355 +#: erpnext/selling/doctype/customer/customer.py:345 msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group" msgstr "" @@ -1152,11 +1152,11 @@ msgstr "" msgid "Abbreviation" msgstr "" -#: erpnext/setup/doctype/company/company.py:238 +#: erpnext/setup/doctype/company/company.py:241 msgid "Abbreviation already used for another company" msgstr "" -#: erpnext/setup/doctype/company/company.py:235 +#: erpnext/setup/doctype/company/company.py:238 msgid "Abbreviation is mandatory" msgstr "" @@ -1164,7 +1164,7 @@ msgstr "" msgid "Abbreviation: {0} must appear only once" msgstr "" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1345 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1268 msgid "Above" msgstr "" @@ -1218,7 +1218,7 @@ msgid "Accepted Qty in Stock UOM" msgstr "" #. Label of the qty (Float) field in DocType 'Purchase Receipt Item' -#: erpnext/public/js/controllers/transaction.js:2839 +#: erpnext/public/js/controllers/transaction.js:2841 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json msgid "Accepted Quantity" msgstr "" @@ -1254,7 +1254,7 @@ msgstr "" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:784 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "" @@ -1373,7 +1373,7 @@ msgid "Account Manager" msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1009 -#: erpnext/controllers/accounts_controller.py:2396 +#: erpnext/controllers/accounts_controller.py:2397 msgid "Account Missing" msgstr "" @@ -1391,7 +1391,7 @@ msgstr "" msgid "Account Name" msgstr "" -#: erpnext/accounts/doctype/account/account.py:373 +#: erpnext/accounts/doctype/account/account.py:374 msgid "Account Not Found" msgstr "" @@ -1404,7 +1404,7 @@ msgstr "" msgid "Account Number" msgstr "" -#: erpnext/accounts/doctype/account/account.py:359 +#: erpnext/accounts/doctype/account/account.py:360 msgid "Account Number {0} already used in account {1}" msgstr "" @@ -1443,7 +1443,7 @@ msgstr "" #. Label of the account_type (Select) field in DocType 'Payment Ledger Entry' #. Label of the account_type (Select) field in DocType 'Party Type' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account.py:206 +#: erpnext/accounts/doctype/account/account.py:207 #: erpnext/accounts/doctype/account/account_tree.js:154 #: erpnext/accounts/doctype/bank_account/bank_account.json #: erpnext/accounts/doctype/bank_account_type/bank_account_type.json @@ -1459,11 +1459,11 @@ msgstr "" msgid "Account Value" msgstr "" -#: erpnext/accounts/doctype/account/account.py:328 +#: erpnext/accounts/doctype/account/account.py:329 msgid "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'" msgstr "" -#: erpnext/accounts/doctype/account/account.py:322 +#: erpnext/accounts/doctype/account/account.py:323 msgid "Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'" msgstr "" @@ -1530,24 +1530,24 @@ msgstr "" msgid "Account where the cost of this item will be debited on purchase" msgstr "" -#: erpnext/accounts/doctype/account/account.py:427 +#: erpnext/accounts/doctype/account/account.py:428 msgid "Account with child nodes cannot be converted to ledger" msgstr "" -#: erpnext/accounts/doctype/account/account.py:279 +#: erpnext/accounts/doctype/account/account.py:280 msgid "Account with child nodes cannot be set as ledger" msgstr "" -#: erpnext/accounts/doctype/account/account.py:438 +#: erpnext/accounts/doctype/account/account.py:439 msgid "Account with existing transaction can not be converted to group." msgstr "" -#: erpnext/accounts/doctype/account/account.py:467 +#: erpnext/accounts/doctype/account/account.py:468 msgid "Account with existing transaction can not be deleted" msgstr "" -#: erpnext/accounts/doctype/account/account.py:273 -#: erpnext/accounts/doctype/account/account.py:429 +#: erpnext/accounts/doctype/account/account.py:274 +#: erpnext/accounts/doctype/account/account.py:430 msgid "Account with existing transaction cannot be converted to ledger" msgstr "" @@ -1555,11 +1555,11 @@ msgstr "" msgid "Account {0} added multiple times" msgstr "" -#: erpnext/accounts/doctype/account/account.py:291 +#: erpnext/accounts/doctype/account/account.py:292 msgid "Account {0} cannot be converted to Group as it is already set as {1} for {2}." msgstr "" -#: erpnext/accounts/doctype/account/account.py:288 +#: erpnext/accounts/doctype/account/account.py:289 msgid "Account {0} cannot be disabled as it is already set as {1} for {2}." msgstr "" @@ -1567,11 +1567,11 @@ msgstr "" msgid "Account {0} does not belong to company {1}" msgstr "" -#: erpnext/setup/doctype/company/company.py:285 +#: erpnext/setup/doctype/company/company.py:289 msgid "Account {0} does not belong to company: {1}" msgstr "" -#: erpnext/accounts/doctype/account/account.py:589 +#: erpnext/accounts/doctype/account/account.py:590 msgid "Account {0} does not exist" msgstr "" @@ -1587,15 +1587,15 @@ msgstr "" msgid "Account {0} doesn't belong to Company {1}" msgstr "" -#: erpnext/accounts/doctype/account/account.py:546 +#: erpnext/accounts/doctype/account/account.py:547 msgid "Account {0} exists in parent company {1}." msgstr "" -#: erpnext/accounts/doctype/account/account.py:411 +#: erpnext/accounts/doctype/account/account.py:412 msgid "Account {0} is added in the child company {1}" msgstr "" -#: erpnext/setup/doctype/company/company.py:274 +#: erpnext/setup/doctype/company/company.py:278 msgid "Account {0} is disabled." msgstr "" @@ -1603,7 +1603,7 @@ msgstr "" msgid "Account {0} is frozen" msgstr "" -#: erpnext/controllers/accounts_controller.py:1471 +#: erpnext/controllers/accounts_controller.py:1472 msgid "Account {0} is invalid. Account Currency must be {1}" msgstr "" @@ -1611,19 +1611,19 @@ msgstr "" msgid "Account {0} should be of type Expense" msgstr "" -#: erpnext/accounts/doctype/account/account.py:152 +#: erpnext/accounts/doctype/account/account.py:153 msgid "Account {0}: Parent account {1} can not be a ledger" msgstr "" -#: erpnext/accounts/doctype/account/account.py:158 +#: erpnext/accounts/doctype/account/account.py:159 msgid "Account {0}: Parent account {1} does not belong to company: {2}" msgstr "" -#: erpnext/accounts/doctype/account/account.py:146 +#: erpnext/accounts/doctype/account/account.py:147 msgid "Account {0}: Parent account {1} does not exist" msgstr "" -#: erpnext/accounts/doctype/account/account.py:149 +#: erpnext/accounts/doctype/account/account.py:150 msgid "Account {0}: You can not assign itself as parent account" msgstr "" @@ -1639,7 +1639,7 @@ msgstr "" msgid "Account: {0} is not permitted under Payment Entry" msgstr "" -#: erpnext/controllers/accounts_controller.py:3287 +#: erpnext/controllers/accounts_controller.py:3281 msgid "Account: {0} with currency: {1} can not be selected" msgstr "" @@ -1924,8 +1924,8 @@ msgstr "" msgid "Accounting Entry for Asset" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1148 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1168 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1949,8 +1949,8 @@ msgstr "" #: erpnext/controllers/stock_controller.py:733 #: erpnext/controllers/stock_controller.py:750 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1100 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1114 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "" @@ -1959,7 +1959,7 @@ msgstr "" msgid "Accounting Entry for {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:2437 +#: erpnext/controllers/accounts_controller.py:2438 msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}" msgstr "" @@ -2029,12 +2029,12 @@ msgstr "" #: erpnext/buying/doctype/supplier/supplier.json #: erpnext/selling/doctype/customer/customer.json #: erpnext/setup/doctype/company/company.json -#: erpnext/setup/doctype/company/company.py:444 +#: erpnext/setup/doctype/company/company.py:448 #: erpnext/setup/doctype/customer_group/customer_group.json #: erpnext/setup/doctype/email_digest/email_digest.json #: erpnext/setup/doctype/incoterm/incoterm.json #: erpnext/setup/doctype/supplier_group/supplier_group.json -#: erpnext/setup/install.py:395 +#: erpnext/setup/install.py:427 msgid "Accounts" msgstr "" @@ -2064,8 +2064,8 @@ msgstr "" #. Entry' #. Name of a report #. Label of a Workspace Sidebar Item -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:154 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:256 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:158 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:261 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/report/accounts_payable/accounts_payable.json #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:126 @@ -2165,15 +2165,15 @@ msgstr "" msgid "Accounts to Merge" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:158 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:265 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:162 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:270 msgid "Accrued Expenses" msgstr "" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:63 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:112 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:67 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117 #: erpnext/accounts/report/account_balance/account_balance.js:37 msgid "Accumulated Depreciation" msgstr "" @@ -2338,7 +2338,7 @@ msgstr "" #. Label of the enable_serial_and_batch_no_for_item (Check) field in DocType #. 'Stock Settings' -#: erpnext/stock/doctype/item/item.js:419 +#: erpnext/stock/doctype/item/item.js:412 #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Activate Serial / Batch No for Item" msgstr "" @@ -2462,7 +2462,7 @@ msgstr "" msgid "Actual End Date (via Timesheet)" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:229 +#: erpnext/manufacturing/doctype/work_order/work_order.py:230 msgid "Actual End Date cannot be before Actual Start Date" msgstr "" @@ -2593,7 +2593,7 @@ msgstr "" msgid "Ad-hoc Qty" msgstr "" -#: erpnext/stock/doctype/item/item.js:688 +#: erpnext/stock/doctype/item/item.js:675 #: erpnext/stock/doctype/price_list/price_list.js:8 msgid "Add / Edit Prices" msgstr "" @@ -3092,7 +3092,7 @@ msgstr "" msgid "Additional Information updated successfully." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:836 +#: erpnext/manufacturing/doctype/work_order/work_order.js:818 msgid "Additional Material Transfer" msgstr "" @@ -3115,7 +3115,7 @@ msgstr "" msgid "Additional Transferred Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:710 +#: erpnext/manufacturing/doctype/work_order/work_order.py:711 msgid "" "Additional Transferred Qty {0}\n" "\t\t\t\t\tcannot be greater than {1}.\n" @@ -3274,11 +3274,6 @@ msgstr "" msgid "Address used to determine Tax Category in transactions" msgstr "" -#. Label of the adjust_qty (Float) field in DocType 'Sales Forecast Item' -#: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json -msgid "Adjust Qty" -msgstr "" - #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1160 msgid "Adjustment Against" msgstr "" @@ -3291,8 +3286,8 @@ msgstr "" msgid "Administrative Assistant" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:103 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:168 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:107 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:173 msgid "Administrative Expenses" msgstr "" @@ -3360,7 +3355,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/controllers/accounts_controller.py:287 +#: erpnext/controllers/accounts_controller.py:288 #: erpnext/setup/doctype/company/company.json msgid "Advance Payments" msgstr "" @@ -3622,11 +3617,11 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:154 #: erpnext/accounts/report/accounts_payable/accounts_payable.html:138 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:139 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1279 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1202 msgid "Age (Days)" msgstr "" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:228 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:216 msgid "Age ({0})" msgstr "" @@ -3776,21 +3771,21 @@ msgstr "" #: erpnext/patches/v11_0/update_department_lft_rgt.py:9 #: erpnext/patches/v11_0/update_department_lft_rgt.py:11 #: erpnext/patches/v11_0/update_department_lft_rgt.py:16 -#: erpnext/setup/doctype/company/company.py:437 -#: erpnext/setup/doctype/company/company.py:440 -#: erpnext/setup/doctype/company/company.py:445 -#: erpnext/setup/doctype/company/company.py:451 -#: erpnext/setup/doctype/company/company.py:457 -#: erpnext/setup/doctype/company/company.py:463 -#: erpnext/setup/doctype/company/company.py:469 -#: erpnext/setup/doctype/company/company.py:475 -#: erpnext/setup/doctype/company/company.py:481 -#: erpnext/setup/doctype/company/company.py:487 -#: erpnext/setup/doctype/company/company.py:493 -#: erpnext/setup/doctype/company/company.py:499 -#: erpnext/setup/doctype/company/company.py:505 -#: erpnext/setup/doctype/company/company.py:511 -#: erpnext/setup/doctype/company/company.py:517 +#: erpnext/setup/doctype/company/company.py:441 +#: erpnext/setup/doctype/company/company.py:444 +#: erpnext/setup/doctype/company/company.py:449 +#: erpnext/setup/doctype/company/company.py:455 +#: erpnext/setup/doctype/company/company.py:461 +#: erpnext/setup/doctype/company/company.py:467 +#: erpnext/setup/doctype/company/company.py:473 +#: erpnext/setup/doctype/company/company.py:479 +#: erpnext/setup/doctype/company/company.py:485 +#: erpnext/setup/doctype/company/company.py:491 +#: erpnext/setup/doctype/company/company.py:497 +#: erpnext/setup/doctype/company/company.py:503 +#: erpnext/setup/doctype/company/company.py:509 +#: erpnext/setup/doctype/company/company.py:515 +#: erpnext/setup/doctype/company/company.py:521 msgid "All Departments" msgstr "" @@ -3870,7 +3865,7 @@ msgstr "" msgid "All Territories" msgstr "" -#: erpnext/setup/doctype/company/company.py:382 +#: erpnext/setup/doctype/company/company.py:386 msgid "All Warehouses" msgstr "" @@ -3892,15 +3887,15 @@ msgstr "" msgid "All items have already been Invoiced/Returned" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:1236 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:1277 msgid "All items have already been received" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:138 msgid "All items have already been transferred for this Work Order." msgstr "" -#: erpnext/public/js/controllers/transaction.js:2948 +#: erpnext/public/js/controllers/transaction.js:2950 msgid "All items in this document already have a linked Quality Inspection." msgstr "" @@ -3922,11 +3917,11 @@ msgstr "" msgid "All the items have been already returned." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1274 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1256 msgid "All the required items (raw materials) will be fetched from BOM and populated in this table. Here you can also change the Source Warehouse for any item. And during the production, you can track transferred raw materials from this table." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:872 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:913 msgid "All these items have already been Invoiced/Returned" msgstr "" @@ -4042,7 +4037,7 @@ msgstr "" #. Label of the allow_account_creation_against_child_company (Check) field in #. DocType 'Company' -#: erpnext/accounts/doctype/account/account.py:544 +#: erpnext/accounts/doctype/account/account.py:545 #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:68 #: erpnext/setup/doctype/company/company.json msgid "Allow Account Creation Against Child Company" @@ -4106,7 +4101,7 @@ msgstr "" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#: erpnext/controllers/selling_controller.py:858 +#: erpnext/controllers/selling_controller.py:859 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" @@ -4496,8 +4491,8 @@ msgid "Also you can't switch back to FIFO after setting the valuation method to msgstr "" #: erpnext/manufacturing/doctype/bom/bom.js:288 -#: erpnext/manufacturing/doctype/work_order/work_order.js:165 -#: erpnext/manufacturing/doctype/work_order/work_order.js:180 +#: erpnext/manufacturing/doctype/work_order/work_order.js:146 +#: erpnext/manufacturing/doctype/work_order/work_order.js:161 #: erpnext/public/js/utils.js:587 #: erpnext/stock/doctype/stock_entry/stock_entry.js:322 msgid "Alternate Item" @@ -4738,7 +4733,7 @@ msgstr "" msgid "Amount" msgstr "" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:22 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:34 msgid "Amount (AED)" msgstr "" @@ -4872,11 +4867,11 @@ msgid "Amount to Bill" msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1259 -msgid "Amount {0} {1} against {2} {3}" +msgid "Amount {0} {1} adjusted against {2} {3}" msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1270 -msgid "Amount {0} {1} deducted against {2}" +msgid "Amount {0} {1} as adjustment to {2}" msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1234 @@ -4922,7 +4917,7 @@ msgstr "" msgid "An Item Group is a way to classify items based on types." msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:558 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:601 msgid "An error has been appeared while reposting item valuation via {0}" msgstr "" @@ -5478,7 +5473,7 @@ msgstr "" msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}." msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1839 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1841 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}." msgstr "" @@ -5793,8 +5788,8 @@ msgstr "" #. Option for the 'Account Type' (Select) field in DocType 'Account' #. Label of the asset_received_but_not_billed (Link) field in DocType 'Company' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:165 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:279 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:169 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:284 #: erpnext/accounts/report/account_balance/account_balance.js:38 #: erpnext/setup/doctype/company/company.json msgid "Asset Received But Not Billed" @@ -6058,7 +6053,7 @@ msgstr "" msgid "Assets {assets_link} created for {item_code}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:240 +#: erpnext/manufacturing/doctype/job_card/job_card.js:709 msgid "Assign Job to Employee" msgstr "" @@ -6119,7 +6114,7 @@ msgstr "" msgid "At least one of the Selling or Buying must be selected" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:317 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:57 msgid "At least one raw material item must be present in the stock entry for the type {0}" msgstr "" @@ -6127,20 +6122,16 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 -msgid "At least one warehouse is mandatory" -msgstr "" - -#: erpnext/stock/doctype/stock_entry/stock_entry.py:779 -msgid "At row #{0}: the Difference Account must not be a Stock type account, please change the Account Type for the account {1} or select a different account" +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:169 +msgid "At row #{0}: the Difference Account must not be a Stock type account..." msgstr "" #: erpnext/manufacturing/doctype/routing/routing.py:50 msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:790 -msgid "At row #{0}: you have selected the Difference Account {1}, which is a Cost of Goods Sold type account. Please select a different account" +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:180 +msgid "At row #{0}: you have selected the Difference Account {1}..." msgstr "" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1184 @@ -6571,7 +6562,7 @@ msgstr "" #: erpnext/public/js/utils.js:647 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json -#: erpnext/stock/report/stock_ageing/stock_ageing.py:177 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:165 msgid "Available Qty" msgstr "" @@ -6660,10 +6651,6 @@ msgstr "" msgid "Available for use date is required" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 -msgid "Available quantity is {0}, you need {1}" -msgstr "" - #: erpnext/stock/dashboard/item_dashboard.js:251 msgid "Available {0}" msgstr "" @@ -6672,8 +6659,8 @@ msgstr "" msgid "Available-for-use Date should be after purchase date" msgstr "" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:178 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:212 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:166 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:200 #: erpnext/stock/report/stock_balance/stock_balance.py:594 msgid "Average Age" msgstr "" @@ -6779,7 +6766,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:216 +#: erpnext/manufacturing/doctype/work_order/work_order.js:197 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/report/bom_explorer/bom_explorer.js:8 #: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:67 @@ -6802,7 +6789,7 @@ msgstr "" msgid "BOM 1" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1811 +#: erpnext/manufacturing/doctype/bom/bom.py:1832 msgid "BOM 1 {0} and BOM 2 {1} should not be same" msgstr "" @@ -6874,11 +6861,6 @@ msgstr "" msgid "BOM ID" msgstr "" -#. Label of the bom_info_section (Section Break) field in DocType 'Stock Entry' -#: erpnext/stock/doctype/stock_entry/stock_entry.json -msgid "BOM Info" -msgstr "" - #. Name of a DocType #: erpnext/manufacturing/doctype/bom_item/bom_item.json msgid "BOM Item" @@ -7032,7 +7014,7 @@ msgstr "" msgid "BOM Website Operation" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:156 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "" @@ -7100,7 +7082,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:386 +#: erpnext/manufacturing/doctype/work_order/work_order.js:367 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Backflush Materials From WIP Warehouse" msgstr "" @@ -7385,8 +7367,8 @@ msgid "Bank Balance" msgstr "" #. Label of the bank_charges (Currency) field in DocType 'Invoice Discounting' -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:133 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:219 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:137 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:224 #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json msgid "Bank Charges" msgstr "" @@ -7501,8 +7483,8 @@ msgstr "" msgid "Bank Name" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:179 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:309 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:183 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:314 msgid "Bank Overdraft Account" msgstr "" @@ -7911,7 +7893,7 @@ msgstr "" #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:89 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:115 -#: erpnext/public/js/controllers/transaction.js:2865 +#: erpnext/public/js/controllers/transaction.js:2867 #: erpnext/public/js/utils/barcode_scanner.js:281 #: erpnext/public/js/utils/serial_no_batch_selector.js:450 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -8006,7 +7988,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:368 +#: erpnext/manufacturing/doctype/work_order/work_order.js:349 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Batch Size" @@ -8023,7 +8005,7 @@ msgstr "" msgid "Batch and Serial No" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:937 +#: erpnext/manufacturing/doctype/work_order/work_order.py:938 msgid "Batch not created for item {} since it does not have a batch series." msgstr "" @@ -8046,12 +8028,12 @@ msgstr "" msgid "Batch {0} is not available in warehouse {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:103 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:98 msgid "Batch {0} of Item {1} is disabled." msgstr "" @@ -8106,7 +8088,7 @@ msgstr "" #. Label of the bill_date (Date) field in DocType 'Journal Entry' #. Label of the bill_date (Date) field in DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/journal_entry/journal_entry.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1264 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1187 #: erpnext/accounts/report/purchase_register/purchase_register.py:214 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Bill Date" @@ -8115,7 +8097,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:1263 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1186 #: erpnext/accounts/report/purchase_register/purchase_register.py:213 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Bill No" @@ -8129,11 +8111,13 @@ msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace +#. Label of the bom_info_section (Section Break) field in DocType 'Stock Entry' #. Label of a Workspace Sidebar Item #: erpnext/manufacturing/doctype/bom/bom.py:1382 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/material_request/material_request.js:139 #: erpnext/stock/doctype/stock_entry/stock_entry.js:774 +#: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/workspace_sidebar/subcontracting.json msgid "Bill of Materials" msgstr "" @@ -8234,7 +8218,7 @@ msgstr "" msgid "Billing Address Name" msgstr "" -#: erpnext/controllers/accounts_controller.py:574 +#: erpnext/controllers/accounts_controller.py:575 msgid "Billing Address does not belong to the {0}" msgstr "" @@ -8841,8 +8825,8 @@ msgstr "" msgid "Buildable Qty" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:61 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:102 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:65 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:107 msgid "Buildings" msgstr "" @@ -9060,8 +9044,8 @@ msgstr "" msgid "CRM Settings" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:67 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:71 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:122 msgid "CWIP Account" msgstr "" @@ -9316,7 +9300,7 @@ msgstr "" msgid "Can be approved by {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2583 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2581 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state." msgstr "" @@ -9350,12 +9334,12 @@ msgid "Can only make payment against unbilled {0}" msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 -#: erpnext/controllers/accounts_controller.py:3196 +#: erpnext/controllers/accounts_controller.py:3190 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" msgstr "" -#: erpnext/setup/doctype/company/company.py:206 +#: erpnext/setup/doctype/company/company.py:209 #: erpnext/stock/doctype/stock_settings/stock_settings.py:181 msgid "Can't change the valuation method, as there are transactions against some items which do not have its own valuation method" msgstr "" @@ -9397,7 +9381,7 @@ msgstr "" msgid "Cannot Calculate Arrival Time as Driver Address is Missing." msgstr "" -#: erpnext/setup/doctype/company/company.py:225 +#: erpnext/setup/doctype/company/company.py:228 msgid "Cannot Change Inventory Account Setting" msgstr "" @@ -9455,7 +9439,7 @@ msgstr "" msgid "Cannot cancel as processing of cancelled documents is pending." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1115 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1116 msgid "Cannot cancel because submitted Stock Entry {0} exists" msgstr "" @@ -9475,7 +9459,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:554 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:418 msgid "Cannot cancel transaction for Completed Work Order." msgstr "" @@ -9483,7 +9467,7 @@ msgstr "" msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "" -#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:73 +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:74 msgid "Cannot change Reference Document Type." msgstr "" @@ -9495,7 +9479,7 @@ msgstr "" msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "" -#: erpnext/setup/doctype/company/company.py:330 +#: erpnext/setup/doctype/company/company.py:334 msgid "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency." msgstr "" @@ -9511,11 +9495,11 @@ msgstr "" msgid "Cannot convert Task to non-group because the following child Tasks exist: {0}." msgstr "" -#: erpnext/accounts/doctype/account/account.py:440 +#: erpnext/accounts/doctype/account/account.py:441 msgid "Cannot convert to Group because Account Type is selected." msgstr "" -#: erpnext/accounts/doctype/account/account.py:276 +#: erpnext/accounts/doctype/account/account.py:277 msgid "Cannot covert to Group because Account Type is selected." msgstr "" @@ -9523,7 +9507,7 @@ msgstr "" msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2023 +#: erpnext/selling/doctype/sales_order/sales_order.py:2045 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "" @@ -9557,12 +9541,12 @@ msgstr "" msgid "Cannot delete Serial No {0}, as it is used in stock transactions" msgstr "" -#: erpnext/controllers/accounts_controller.py:3809 +#: erpnext/controllers/accounts_controller.py:3815 msgid "Cannot delete an item which has been ordered" msgstr "" #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:197 -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:784 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:785 msgid "Cannot delete protected core DocType: {0}" msgstr "" @@ -9574,7 +9558,7 @@ msgstr "" msgid "Cannot disable Serial and Batch No for Item, as there are existing records for serial / batch." msgstr "" -#: erpnext/setup/doctype/company/company.py:560 +#: erpnext/setup/doctype/company/company.py:564 msgid "Cannot disable perpetual inventory, as there are existing Stock Ledger Entries for the company {0}. Please cancel the stock transactions first and try again." msgstr "" @@ -9582,20 +9566,20 @@ msgstr "" msgid "Cannot disable {0} as it may lead to incorrect stock valuation." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:727 +#: erpnext/manufacturing/doctype/work_order/work_order.py:728 msgid "Cannot disassemble more than produced quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:40 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" -#: erpnext/setup/doctype/company/company.py:222 +#: erpnext/setup/doctype/company/company.py:225 msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:783 -#: erpnext/selling/doctype/sales_order/sales_order.py:806 +#: erpnext/selling/doctype/sales_order/sales_order.py:786 +#: erpnext/selling/doctype/sales_order/sales_order.py:809 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "" @@ -9611,7 +9595,7 @@ msgstr "" msgid "Cannot find Item with this Barcode" msgstr "" -#: erpnext/controllers/accounts_controller.py:3761 +#: erpnext/controllers/accounts_controller.py:3767 msgid "Cannot find a default warehouse for item {0}. Please set one in the Item Master or in Stock Settings." msgstr "" @@ -9619,15 +9603,15 @@ msgstr "" msgid "Cannot merge {0} '{1}' into '{2}' as both have existing accounting entries in different currencies for company '{3}'." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:577 +#: erpnext/manufacturing/doctype/work_order/work_order.py:578 msgid "Cannot produce more Item {0} than Sales Order quantity {1} {2}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1472 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1473 msgid "Cannot produce more item for {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1476 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1477 msgid "Cannot produce more than {0} items for {1}" msgstr "" @@ -9635,12 +9619,12 @@ msgstr "" msgid "Cannot receive from customer against negative outstanding" msgstr "" -#: erpnext/controllers/accounts_controller.py:4083 +#: erpnext/controllers/accounts_controller.py:4089 msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 -#: erpnext/controllers/accounts_controller.py:3211 +#: erpnext/controllers/accounts_controller.py:3205 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" msgstr "" @@ -9653,14 +9637,14 @@ msgstr "" msgid "Cannot retrieve link token. Check Error Log for more information" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:368 +#: erpnext/selling/doctype/customer/customer.py:358 msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 -#: erpnext/controllers/accounts_controller.py:3201 +#: erpnext/controllers/accounts_controller.py:3195 #: erpnext/public/js/controllers/accounts.js:112 #: erpnext/public/js/controllers/taxes_and_totals.js:550 msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row" @@ -9682,11 +9666,11 @@ msgstr "" msgid "Cannot set multiple account rows for the same company" msgstr "" -#: erpnext/controllers/accounts_controller.py:4049 +#: erpnext/controllers/accounts_controller.py:4055 msgid "Cannot set quantity less than delivered quantity." msgstr "" -#: erpnext/controllers/accounts_controller.py:4050 +#: erpnext/controllers/accounts_controller.py:4056 msgid "Cannot set quantity less than received quantity." msgstr "" @@ -9698,7 +9682,7 @@ msgstr "" msgid "Cannot start deletion. Another deletion {0} is already queued/running. Please wait for it to complete." msgstr "" -#: erpnext/controllers/accounts_controller.py:4077 +#: erpnext/controllers/accounts_controller.py:4083 msgid "Cannot update rate as item {0} is already ordered or purchased against this quotation" msgstr "" @@ -9731,7 +9715,7 @@ msgstr "" msgid "Capacity Planning" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1101 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1102 msgid "Capacity Planning Error, planned start time can not be same as end time" msgstr "" @@ -9750,13 +9734,13 @@ msgstr "" msgid "Capacity must be greater than 0" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:44 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:77 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:48 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:82 msgid "Capital Equipment" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:190 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:333 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:194 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:338 msgid "Capital Stock" msgstr "" @@ -10088,7 +10072,7 @@ msgstr "" msgid "Change this date manually to setup the next synchronization start date" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:158 +#: erpnext/selling/doctype/customer/customer.py:148 msgid "Changed customer name to '{}' as '{}' already exists." msgstr "" @@ -10096,7 +10080,7 @@ msgstr "" msgid "Changes in {0}" msgstr "" -#: erpnext/stock/doctype/item/item.js:385 +#: erpnext/stock/doctype/item/item.js:378 msgid "Changing Customer Group for the selected Customer is not allowed." msgstr "" @@ -10111,7 +10095,7 @@ msgid "Channel Partner" msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2258 -#: erpnext/controllers/accounts_controller.py:3264 +#: erpnext/controllers/accounts_controller.py:3258 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount" msgstr "" @@ -10165,7 +10149,7 @@ msgstr "" #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:52 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/public/js/setup_wizard.js:43 -#: erpnext/setup/doctype/company/company.js:123 +#: erpnext/setup/doctype/company/company.js:139 #: erpnext/setup/doctype/company/company.json #: erpnext/setup/workspace/home/home.json #: erpnext/workspace_sidebar/accounts_setup.json @@ -10308,7 +10292,7 @@ msgstr "" #. Label of the reference_date (Date) field in DocType 'Payment Entry' #: erpnext/accounts/doctype/payment_entry/payment_entry.json -#: erpnext/public/js/controllers/transaction.js:2776 +#: erpnext/public/js/controllers/transaction.js:2778 msgid "Cheque/Reference Date" msgstr "" @@ -10366,7 +10350,7 @@ msgstr "" #. Label of the child_row_reference (Data) field in DocType 'Quality #. Inspection' -#: erpnext/public/js/controllers/transaction.js:2871 +#: erpnext/public/js/controllers/transaction.js:2873 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json msgid "Child Row Reference" msgstr "" @@ -10560,11 +10544,11 @@ msgstr "" msgid "Closed Documents" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2506 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2504 msgid "Closed Work Order can not be stopped or Re-opened" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:542 +#: erpnext/selling/doctype/sales_order/sales_order.py:547 msgid "Closed order cannot be cancelled. Unclose to cancel." msgstr "" @@ -10816,8 +10800,8 @@ msgstr "" msgid "Commission Rate (%)" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:104 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:172 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:108 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:177 msgid "Commission on Sales" msgstr "" @@ -10851,7 +10835,7 @@ msgstr "" msgid "Communication Medium Type" msgstr "" -#: erpnext/setup/install.py:107 +#: erpnext/setup/install.py:108 msgid "Compact Item Print" msgstr "" @@ -11250,8 +11234,8 @@ msgstr "" #: erpnext/setup/doctype/employee/employee_tree.js:8 #: erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json -#: erpnext/setup/doctype/vehicle/vehicle.json erpnext/setup/install.py:166 -#: erpnext/setup/install.py:175 erpnext/setup/workspace/home/home.json +#: erpnext/setup/doctype/vehicle/vehicle.json erpnext/setup/install.py:198 +#: erpnext/setup/install.py:207 erpnext/setup/workspace/home/home.json #: erpnext/stock/dashboard_chart_source/stock_value_by_item_group/stock_value_by_item_group.js:8 #: erpnext/stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.js:8 #: erpnext/stock/doctype/bin/bin.json @@ -11393,11 +11377,11 @@ msgstr "" msgid "Company Address Name" msgstr "" -#: erpnext/controllers/accounts_controller.py:4411 +#: erpnext/controllers/accounts_controller.py:4399 msgid "Company Address is missing. You don't have permission to create an Address. Please contact your System Manager." msgstr "" -#: erpnext/controllers/accounts_controller.py:4399 +#: erpnext/controllers/accounts_controller.py:4387 msgid "Company Address is missing. You don't have permission to update it. Please contact your System Manager." msgstr "" @@ -11500,7 +11484,7 @@ msgstr "" msgid "Company and account filters not set!" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2580 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2661 msgid "Company currencies of both the companies should match for Inter Company Transactions." msgstr "" @@ -11535,7 +11519,7 @@ msgstr "" msgid "Company link field name used for filtering (optional - leave empty to delete all records)" msgstr "" -#: erpnext/setup/doctype/company/company.js:222 +#: erpnext/setup/doctype/company/company.js:238 msgid "Company name not same" msgstr "" @@ -11574,12 +11558,12 @@ msgstr "" msgid "Company {0} added multiple times" msgstr "" -#: erpnext/accounts/doctype/account/account.py:509 +#: erpnext/accounts/doctype/account/account.py:510 #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:1308 msgid "Company {0} does not exist" msgstr "" -#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:83 +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:105 msgid "Company {0} is added more than once" msgstr "" @@ -11621,7 +11605,7 @@ msgstr "" msgid "Competitors" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:277 +#: erpnext/manufacturing/doctype/job_card/job_card.js:661 #: erpnext/manufacturing/doctype/workstation/workstation.js:151 msgid "Complete Job" msgstr "" @@ -11668,12 +11652,12 @@ msgstr "" msgid "Completed Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1390 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1391 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:331 -#: erpnext/manufacturing/doctype/job_card/job_card.js:452 +#: erpnext/manufacturing/doctype/job_card/job_card.js:259 +#: erpnext/manufacturing/doctype/job_card/job_card.js:393 #: erpnext/manufacturing/doctype/workstation/workstation.js:296 msgid "Completed Quantity" msgstr "" @@ -11862,7 +11846,7 @@ msgstr "" msgid "Consider Minimum Order Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1096 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1078 msgid "Consider Process Loss" msgstr "" @@ -12056,7 +12040,7 @@ msgstr "" msgid "Consumed Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1766 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1767 msgid "Consumed Qty cannot be greater than Reserved Qty for item {0}" msgstr "" @@ -12085,7 +12069,7 @@ msgstr "" msgid "Consumed Stock Total Value" msgstr "" -#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.py:135 +#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.py:136 msgid "Consumed quantity of item {0} exceeds transferred quantity." msgstr "" @@ -12213,7 +12197,7 @@ msgstr "" msgid "Contact Person" msgstr "" -#: erpnext/controllers/accounts_controller.py:586 +#: erpnext/controllers/accounts_controller.py:587 msgid "Contact Person does not belong to the {0}" msgstr "" @@ -12407,15 +12391,15 @@ msgstr "" msgid "Conversion factor for item {0} has been reset to 1.0 as the uom {1} is same as stock uom {2}." msgstr "" -#: erpnext/controllers/accounts_controller.py:2977 +#: erpnext/controllers/accounts_controller.py:2971 msgid "Conversion rate cannot be 0" msgstr "" -#: erpnext/controllers/accounts_controller.py:2984 +#: erpnext/controllers/accounts_controller.py:2978 msgid "Conversion rate is 1.00, but document currency is different from company currency" msgstr "" -#: erpnext/controllers/accounts_controller.py:2980 +#: erpnext/controllers/accounts_controller.py:2974 msgid "Conversion rate must be 1.00 if document currency is same as company currency" msgstr "" @@ -12492,13 +12476,13 @@ msgstr "" msgid "Corrective Action" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:509 +#: erpnext/manufacturing/doctype/job_card/job_card.js:447 msgid "Corrective Job Card" msgstr "" #. Label of the corrective_operation_section (Tab Break) field in DocType 'Job #. Card' -#: erpnext/manufacturing/doctype/job_card/job_card.js:516 +#: erpnext/manufacturing/doctype/job_card/job_card.js:456 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "Corrective Operation" msgstr "" @@ -12665,7 +12649,7 @@ msgstr "" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:28 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:47 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:30 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1249 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1172 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:47 #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:42 #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 @@ -12798,7 +12782,7 @@ msgstr "" msgid "Cost Center: {0} does not exist" msgstr "" -#: erpnext/setup/doctype/company/company.js:113 +#: erpnext/setup/doctype/company/company.js:129 msgid "Cost Centers" msgstr "" @@ -12841,17 +12825,13 @@ msgstr "" #. Label of the cost_of_good_sold_section (Section Break) field in DocType #. 'Item Default' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:84 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:143 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:88 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:148 #: erpnext/accounts/report/account_balance/account_balance.js:43 #: erpnext/stock/doctype/item_default/item_default.json msgid "Cost of Goods Sold" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:793 -msgid "Cost of Goods Sold Account in Items Table" -msgstr "" - #: erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:40 msgid "Cost of Issued Items" msgstr "" @@ -12931,7 +12911,7 @@ msgstr "" msgid "Could not auto create Customer due to the following missing mandatory field(s):" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:692 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:733 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again" msgstr "" @@ -13120,7 +13100,7 @@ msgstr "" msgid "Create Item" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:206 +#: erpnext/manufacturing/doctype/work_order/work_order.js:187 msgid "Create Job Card" msgstr "" @@ -13219,7 +13199,7 @@ msgstr "" msgid "Create Payment Request" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:818 +#: erpnext/manufacturing/doctype/work_order/work_order.js:800 msgid "Create Pick List" msgstr "" @@ -13364,7 +13344,7 @@ msgstr "" msgid "Create Tasks" msgstr "" -#: erpnext/setup/doctype/company/company.js:157 +#: erpnext/setup/doctype/company/company.js:173 msgid "Create Tax Template" msgstr "" @@ -13402,12 +13382,12 @@ msgstr "" msgid "Create Users" msgstr "" -#: erpnext/stock/doctype/item/item.js:984 +#: erpnext/stock/doctype/item/item.js:971 msgid "Create Variant" msgstr "" -#: erpnext/stock/doctype/item/item.js:798 -#: erpnext/stock/doctype/item/item.js:842 +#: erpnext/stock/doctype/item/item.js:785 +#: erpnext/stock/doctype/item/item.js:829 msgid "Create Variants" msgstr "" @@ -13438,12 +13418,12 @@ msgstr "" msgid "Create a new rule to automatically classify transactions." msgstr "" -#: erpnext/stock/doctype/item/item.js:825 -#: erpnext/stock/doctype/item/item.js:977 +#: erpnext/stock/doctype/item/item.js:812 +#: erpnext/stock/doctype/item/item.js:964 msgid "Create a variant with the template image." msgstr "" -#: erpnext/stock/stock_ledger.py:2071 +#: erpnext/stock/stock_ledger.py:2037 msgid "Create an incoming stock transaction for the Item." msgstr "" @@ -13477,7 +13457,7 @@ msgstr "" msgid "Created By Migration" msgstr "" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:220 msgid "Created {0} scorecards for {1} between:" msgstr "" @@ -13510,7 +13490,7 @@ msgstr "" msgid "Creating Delivery Schedule..." msgstr "" -#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:140 +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:162 msgid "Creating Dimensions..." msgstr "" @@ -13705,7 +13685,7 @@ msgstr "" msgid "Credit Limit" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:650 +#: erpnext/selling/doctype/customer/customer.py:640 msgid "Credit Limit Crossed" msgstr "" @@ -13752,7 +13732,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:176 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1273 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1196 #: erpnext/controllers/sales_and_purchase_return.py:453 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:303 #: erpnext/stock/doctype/delivery_note/delivery_note.js:89 @@ -13780,7 +13760,7 @@ msgstr "" msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:689 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:730 msgid "Credit Note {0} has been created automatically" msgstr "" @@ -13788,7 +13768,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:376 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:384 -#: erpnext/controllers/accounts_controller.py:2376 +#: erpnext/controllers/accounts_controller.py:2377 msgid "Credit To" msgstr "" @@ -13797,20 +13777,20 @@ msgstr "" msgid "Credit in Company Currency" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:616 -#: erpnext/selling/doctype/customer/customer.py:673 +#: erpnext/selling/doctype/customer/customer.py:606 +#: erpnext/selling/doctype/customer/customer.py:663 msgid "Credit limit has been crossed for customer {0} ({1}/{2})" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:395 +#: erpnext/selling/doctype/customer/customer.py:385 msgid "Credit limit is already defined for the Company {0}" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:672 +#: erpnext/selling/doctype/customer/customer.py:662 msgid "Credit limit reached for customer {0}" msgstr "" -#: erpnext/accounts/utils.py:2827 +#: erpnext/accounts/utils.py:2826 msgid "Credit limit warning — submission may be blocked: {0}" msgstr "" @@ -13818,8 +13798,8 @@ msgstr "" msgid "Creditor Turnover Ratio" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:155 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:257 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:159 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:262 msgid "Creditors" msgstr "" @@ -13989,7 +13969,7 @@ msgstr "" msgid "Currency and Price List" msgstr "" -#: erpnext/accounts/doctype/account/account.py:346 +#: erpnext/accounts/doctype/account/account.py:347 msgid "Currency can not be changed after making entries using some other currency" msgstr "" @@ -13999,7 +13979,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1604 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1672 -#: erpnext/accounts/utils.py:2546 +#: erpnext/accounts/utils.py:2545 msgid "Currency for {0} must be {1}" msgstr "" @@ -14082,8 +14062,8 @@ msgstr "" msgid "Current Level" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:153 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:255 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:157 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:260 msgid "Current Liabilities" msgstr "" @@ -14441,8 +14421,8 @@ msgstr "" msgid "Customer Addresses And Contacts" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:159 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:269 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:163 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:274 msgid "Customer Advances" msgstr "" @@ -14456,7 +14436,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:1243 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1166 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json msgid "Customer Contact" @@ -14561,7 +14541,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/doctype/tax_rule/tax_rule.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:115 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1301 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1224 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:96 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:187 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56 @@ -14621,7 +14601,7 @@ msgstr "" msgid "Customer Items" msgstr "" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1292 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1215 msgid "Customer LPO" msgstr "" @@ -14673,7 +14653,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1232 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1155 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:157 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:92 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:35 @@ -14779,7 +14759,7 @@ msgstr "" msgid "Customer Provided Item Cost" msgstr "" -#: erpnext/setup/doctype/company/company.py:486 +#: erpnext/setup/doctype/company/company.py:490 msgid "Customer Service" msgstr "" @@ -14837,8 +14817,8 @@ msgid "Customer required for 'Customerwise Discount'" msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1142 -#: erpnext/selling/doctype/sales_order/sales_order.py:438 -#: erpnext/stock/doctype/delivery_note/delivery_note.py:436 +#: erpnext/selling/doctype/sales_order/sales_order.py:446 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:437 msgid "Customer {0} does not belong to project {1}" msgstr "" @@ -14950,7 +14930,7 @@ msgstr "" msgid "DFS" msgstr "" -#: erpnext/projects/doctype/project/project.py:679 +#: erpnext/projects/doctype/project/project.py:717 msgid "Daily Project Summary for {0}" msgstr "" @@ -15041,7 +15021,7 @@ msgstr "" msgid "Date of Commencement" msgstr "" -#: erpnext/setup/doctype/company/company.js:94 +#: erpnext/setup/doctype/company/company.js:110 msgid "Date of Commencement should be greater than Date of Incorporation" msgstr "" @@ -15267,7 +15247,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:178 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1276 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1199 #: erpnext/controllers/sales_and_purchase_return.py:457 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:304 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:45 @@ -15297,7 +15277,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1013 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1024 -#: erpnext/controllers/accounts_controller.py:2376 +#: erpnext/controllers/accounts_controller.py:2377 msgid "Debit To" msgstr "" @@ -15456,14 +15436,14 @@ msgstr "" #. Label of the default_advance_paid_account (Link) field in DocType 'Company' #: erpnext/setup/doctype/company/company.json -#: erpnext/setup/doctype/company/company.py:315 +#: erpnext/setup/doctype/company/company.py:319 msgid "Default Advance Paid Account" msgstr "" #. Label of the default_advance_received_account (Link) field in DocType #. 'Company' #: erpnext/setup/doctype/company/company.json -#: erpnext/setup/doctype/company/company.py:304 +#: erpnext/setup/doctype/company/company.py:308 msgid "Default Advance Received Account" msgstr "" @@ -15482,15 +15462,15 @@ msgstr "" msgid "Default BOM ({0}) must be active for this item or its template" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2268 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2270 msgid "Default BOM for {0} not found" msgstr "" -#: erpnext/controllers/accounts_controller.py:4121 +#: erpnext/controllers/accounts_controller.py:4109 msgid "Default BOM not found for FG Item {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2265 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2267 msgid "Default BOM not found for Item {0} and Project {1}" msgstr "" @@ -15661,6 +15641,16 @@ msgstr "" msgid "Default Item Manufacturer" msgstr "" +#. Label of the default_letter_head (Link) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json +msgid "Default Letter Head (DocType)" +msgstr "" + +#. Label of the default_letter_head_report (Link) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json +msgid "Default Letter Head (Report)" +msgstr "" + #. Label of the default_manufacturer_part_no (Data) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Default Manufacturer Part No" @@ -15895,7 +15885,7 @@ msgstr "" msgid "Default settings for your stock-related transactions" msgstr "" -#: erpnext/setup/doctype/company/company.js:191 +#: erpnext/setup/doctype/company/company.js:207 msgid "Default tax templates for sales, purchase and items are created." msgstr "" @@ -16068,12 +16058,12 @@ msgstr "" #. Label of the delete_transactions_status (Select) field in DocType #. 'Transaction Deletion Record' -#: erpnext/setup/doctype/company/company.js:168 +#: erpnext/setup/doctype/company/company.js:184 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json msgid "Delete Transactions" msgstr "" -#: erpnext/setup/doctype/company/company.js:237 +#: erpnext/setup/doctype/company/company.js:253 msgid "Delete all the Transactions for this Company" msgstr "" @@ -16094,8 +16084,8 @@ msgstr "" msgid "Deleting {0} and all associated Common Code documents..." msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1101 -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1120 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1102 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1121 msgid "Deletion in Progress!" msgstr "" @@ -16206,11 +16196,11 @@ msgstr "" msgid "Delivered Qty (in Stock UOM)" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:596 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:589 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16291,7 +16281,7 @@ msgstr "" #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:129 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:415 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:36 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:45 #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js:22 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:21 @@ -16355,7 +16345,7 @@ msgstr "" msgid "Delivery Note {0} is not submitted" msgstr "" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1296 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1219 #: erpnext/stock/doctype/delivery_trip/delivery_trip.js:75 msgid "Delivery Notes" msgstr "" @@ -16441,10 +16431,6 @@ msgstr "" msgid "Delivery to" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:457 -msgid "Delivery warehouse required for stock item {0}" -msgstr "" - #. Label of the sales_orders_and_material_requests_tab (Tab Break) field in #. DocType 'Master Production Schedule' #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json @@ -16564,8 +16550,8 @@ msgstr "" #. Label of the depreciation_tab (Tab Break) field in DocType 'Asset' #. Group in Asset's connections #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:105 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:176 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:109 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:181 #: erpnext/accounts/report/account_balance/account_balance.js:44 #: erpnext/accounts/report/cash_flow/cash_flow.py:162 #: erpnext/assets/doctype/asset/asset.json @@ -16658,7 +16644,7 @@ msgstr "" msgid "Depreciation Posting Date" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:917 +#: erpnext/assets/doctype/asset/asset.js:919 msgid "Depreciation Posting Date cannot be before Available-for-use Date" msgstr "" @@ -16816,11 +16802,11 @@ msgstr "" msgid "Difference Account" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:782 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:172 msgid "Difference Account in Items Table" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:771 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:160 msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "" @@ -16936,15 +16922,15 @@ msgstr "" msgid "Direct Expense" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:82 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:141 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:86 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:146 msgid "Direct Expenses" msgstr "" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:141 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:237 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:145 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:242 msgid "Direct Income" msgstr "" @@ -17025,6 +17011,11 @@ msgstr "" msgid "Disable Serial No And Batch Selector" msgstr "" +#. Label of the disable_sdbnb_in_sr (Check) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json +msgid "Disable Stock Delivered But Not Billed in Sales Return" +msgstr "" + #. Label of the disable_transaction_threshold (Check) field in DocType 'Tax #. Withholding Category' #: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json @@ -17061,11 +17052,11 @@ msgstr "" msgid "Disabled items cannot be selected in any transaction." msgstr "" -#: erpnext/controllers/accounts_controller.py:904 +#: erpnext/controllers/accounts_controller.py:905 msgid "Disabled pricing rules since this {} is an internal transfer" msgstr "" -#: erpnext/controllers/accounts_controller.py:918 +#: erpnext/controllers/accounts_controller.py:919 msgid "Disabled tax included prices since this {} is an internal transfer" msgstr "" @@ -17081,7 +17072,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' -#: erpnext/manufacturing/doctype/work_order/work_order.js:1074 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1056 #: erpnext/stock/doctype/stock_entry/stock_entry.js:370 #: erpnext/stock/doctype/stock_entry/stock_entry.js:413 #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -17089,15 +17080,15 @@ msgstr "" msgid "Disassemble" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:232 +#: erpnext/manufacturing/doctype/work_order/work_order.js:213 msgid "Disassemble Order" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:104 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:463 +#: erpnext/manufacturing/doctype/work_order/work_order.js:445 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17384,7 +17375,7 @@ msgstr "" msgid "Dislikes" msgstr "" -#: erpnext/setup/doctype/company/company.py:480 +#: erpnext/setup/doctype/company/company.py:484 msgid "Dispatch" msgstr "" @@ -17579,8 +17570,8 @@ msgstr "" msgid "Distributor" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:191 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:338 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:195 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:343 msgid "Dividends Paid" msgstr "" @@ -17642,7 +17633,7 @@ msgstr "" msgid "Do not update variants on save" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:955 +#: erpnext/assets/doctype/asset/asset.js:957 msgid "Do you really want to restore this scrapped asset?" msgstr "" @@ -17666,7 +17657,7 @@ msgstr "" msgid "Do you want to submit the material request" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:111 +#: erpnext/manufacturing/doctype/job_card/job_card.js:108 msgid "Do you want to submit the stock entry?" msgstr "" @@ -17733,11 +17724,11 @@ msgstr "" msgid "Document Type " msgstr "" -#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:65 +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:66 msgid "Document Type already used as a dimension" msgstr "" -#: erpnext/setup/install.py:198 +#: erpnext/setup/install.py:230 msgid "Documentation" msgstr "" @@ -17900,12 +17891,6 @@ msgstr "" msgid "Driving License Category" msgstr "" -#. Label of the drop_ar_procedures (Button) field in DocType 'Accounts -#. Settings' -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -msgid "Drop Procedures" -msgstr "" - #. Label of the drop_ship (Section Break) field in DocType 'POS Invoice Item' #. Label of the drop_ship (Section Break) field in DocType 'Sales Invoice Item' #. Label of the drop_ship (Tab Break) field in DocType 'Purchase Order' @@ -17926,12 +17911,6 @@ msgstr "" msgid "Drop some files here, or click to select files" msgstr "" -#. Description of the 'Drop Procedures' (Button) field in DocType 'Accounts -#. Settings' -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -msgid "Drops existing SQL Procedures and Function setup by Accounts Receivable report" -msgstr "" - #: erpnext/accounts/party.py:700 msgid "Due Date cannot be after {0}" msgstr "" @@ -18090,8 +18069,8 @@ msgstr "" msgid "Duration in Days" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:170 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:286 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:174 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:291 #: erpnext/setup/setup_wizard/operations/taxes_setup.py:256 msgid "Duties and Taxes" msgstr "" @@ -18174,7 +18153,7 @@ msgstr "" msgid "Each Transaction" msgstr "" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:184 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:172 msgid "Earliest" msgstr "" @@ -18288,6 +18267,10 @@ msgstr "" msgid "Either target qty or target amount is mandatory." msgstr "" +#: erpnext/manufacturing/doctype/job_card/job_card.js:675 +msgid "Elapsed Time" +msgstr "" + #. Option for the 'Fuel Type' (Select) field in DocType 'Vehicle' #: erpnext/setup/doctype/vehicle/vehicle.json msgid "Electric" @@ -18307,8 +18290,8 @@ msgstr "" msgid "Electricity down" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:48 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:82 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:52 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:87 msgid "Electronic Equipment" msgstr "" @@ -18512,8 +18495,8 @@ msgstr "" msgid "Employee Advances" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:184 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:322 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:188 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:327 msgid "Employee Benefits Obligation" msgstr "" @@ -18596,7 +18579,7 @@ msgstr "" msgid "Employee {0} does not belong to the company {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:376 +#: erpnext/manufacturing/doctype/job_card/job_card.py:377 msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "" @@ -18612,7 +18595,7 @@ msgstr "" msgid "Empty" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:756 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:757 msgid "Empty To Delete List" msgstr "" @@ -18809,12 +18792,6 @@ msgstr "" msgid "Enable discount accounting for selling" msgstr "" -#. Description of the 'Delivered by Supplier (Drop Ship)' (Check) field in -#. DocType 'Item' -#: erpnext/stock/doctype/item/item.json -msgid "Enable for drop shipping - supplier delivers directly to the customer without passing through your warehouse." -msgstr "" - #. Description of the 'Include Item In Manufacturing' (Check) field in DocType #. 'Item' #: erpnext/stock/doctype/item/item.json @@ -18944,8 +18921,8 @@ msgstr "" #. Label of the end_time (Time) field in DocType 'Stock Reposting Settings' #. Label of the end_time (Time) field in DocType 'Service Day' #. Label of the end_time (Datetime) field in DocType 'Call Log' -#: erpnext/manufacturing/doctype/job_card/job_card.js:389 -#: erpnext/manufacturing/doctype/job_card/job_card.js:459 +#: erpnext/manufacturing/doctype/job_card/job_card.js:332 +#: erpnext/manufacturing/doctype/job_card/job_card.js:400 #: erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json #: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json #: erpnext/support/doctype/service_day/service_day.json @@ -19044,8 +19021,8 @@ msgstr "" msgid "Enter Serial Nos" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:416 -#: erpnext/manufacturing/doctype/job_card/job_card.js:485 +#: erpnext/manufacturing/doctype/job_card/job_card.js:361 +#: erpnext/manufacturing/doctype/job_card/job_card.js:423 #: erpnext/manufacturing/doctype/workstation/workstation.js:312 msgid "Enter Value" msgstr "" @@ -19070,7 +19047,7 @@ msgstr "" msgid "Enter amount to be redeemed." msgstr "" -#: erpnext/stock/doctype/item/item.js:1146 +#: erpnext/stock/doctype/item/item.js:1133 msgid "Enter an Item Code, the name will be auto-filled the same as Item Code on clicking inside the Item Name field." msgstr "" @@ -19082,7 +19059,7 @@ msgstr "" msgid "Enter customer's phone number" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:926 +#: erpnext/assets/doctype/asset/asset.js:928 msgid "Enter date to scrap asset" msgstr "" @@ -19127,7 +19104,7 @@ msgstr "" msgid "Enter the name of the bank or lending institution before submitting." msgstr "" -#: erpnext/stock/doctype/item/item.js:1172 +#: erpnext/stock/doctype/item/item.js:1159 msgid "Enter the opening stock units." msgstr "" @@ -19135,7 +19112,7 @@ msgstr "" msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1236 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1218 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set." msgstr "" @@ -19147,8 +19124,8 @@ msgstr "" msgid "Entertainment & Leisure" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:106 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:181 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:110 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:186 msgid "Entertainment Expenses" msgstr "" @@ -19172,8 +19149,8 @@ msgstr "" #. Option for the 'Root Type' (Select) field in DocType 'Account Category' #. Option for the 'Root Type' (Select) field in DocType 'Ledger Merge' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:189 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:332 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:193 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:337 #: erpnext/accounts/doctype/account_category/account_category.json #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/report/account_balance/account_balance.js:29 @@ -19234,7 +19211,7 @@ msgstr "" msgid "Error while processing deferred accounting for {0}" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:554 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:597 msgid "Error while reposting item valuation" msgstr "" @@ -19311,7 +19288,7 @@ msgstr "" msgid "Example: If the transaction amount is 200, then this will be calculated as {} = {}" msgstr "" -#: erpnext/stock/stock_ledger.py:2334 +#: erpnext/stock/stock_ledger.py:2300 msgid "Example: Serial No {0} reserved in {1}." msgstr "" @@ -19321,7 +19298,7 @@ msgstr "" msgid "Exception Budget Approver Role" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:47 msgid "Excess Disassembly" msgstr "" @@ -19329,7 +19306,7 @@ msgstr "" msgid "Excess Materials Consumed" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1133 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1141 msgid "Excess Transfer" msgstr "" @@ -19360,17 +19337,17 @@ msgstr "" #. Invoice Advance' #. Label of the exchange_gain_loss (Currency) field in DocType 'Sales Invoice #. Advance' -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:131 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:217 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:135 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:222 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json #: erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json -#: erpnext/setup/doctype/company/company.py:673 +#: erpnext/setup/doctype/company/company.py:678 msgid "Exchange Gain/Loss" msgstr "" -#: erpnext/controllers/accounts_controller.py:1777 -#: erpnext/controllers/accounts_controller.py:1862 +#: erpnext/controllers/accounts_controller.py:1778 +#: erpnext/controllers/accounts_controller.py:1863 msgid "Exchange Gain/Loss amount has been booked through {0}" msgstr "" @@ -19509,7 +19486,7 @@ msgstr "" msgid "Executive Search" msgstr "" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:67 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:79 msgid "Exempt Supplies" msgstr "" @@ -19596,7 +19573,7 @@ msgstr "" msgid "Expected Delivery Date" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:419 +#: erpnext/selling/doctype/sales_order/sales_order.py:429 msgid "Expected Delivery Date should be after Sales Order Date" msgstr "" @@ -19680,7 +19657,7 @@ msgstr "" msgid "Expense" msgstr "" -#: erpnext/controllers/stock_controller.py:947 +#: erpnext/controllers/stock_controller.py:948 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "" @@ -19758,23 +19735,23 @@ msgstr "" msgid "Expense for this item will be recognized over a period of months. Eg: prepaid insurance or annual software license" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:81 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:140 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:85 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:145 msgid "Expenses" msgstr "" -#. Option for the 'Account Type' (Select) field in DocType 'Account' -#: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:88 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:148 -#: erpnext/accounts/report/account_balance/account_balance.js:49 -msgid "Expenses Included In Asset Valuation" -msgstr "" - #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:92 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:153 +#: erpnext/accounts/report/account_balance/account_balance.js:49 +msgid "Expenses Included In Asset Valuation" +msgstr "" + +#. Option for the 'Account Type' (Select) field in DocType 'Account' +#: erpnext/accounts/doctype/account/account.json +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:96 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:158 #: erpnext/accounts/report/account_balance/account_balance.js:51 msgid "Expenses Included In Valuation" msgstr "" @@ -19853,7 +19830,7 @@ msgstr "" msgid "Extra Consumed Qty" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:263 +#: erpnext/manufacturing/doctype/job_card/job_card.py:264 msgid "Extra Job Card Quantity" msgstr "" @@ -19990,7 +19967,7 @@ msgstr "" msgid "Failed to setup defaults" msgstr "" -#: erpnext/setup/doctype/company/company.py:855 +#: erpnext/setup/doctype/company/company.py:860 msgid "Failed to setup defaults for country {0}. Please contact support." msgstr "" @@ -20145,21 +20122,29 @@ msgstr "" msgid "Field in Bank Transaction" msgstr "" +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:95 +msgid "Fieldname Conflict" +msgstr "" + +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:87 +msgid "Fieldname {0} already exists in the following doctypes: {1}. A separate dimension field will not be added to these doctypes. GL Entries will use the value of the existing field as the dimension value." +msgstr "" + #. Description of the 'Do not update variants on save' (Check) field in DocType #. 'Item Variant Settings' #: erpnext/stock/doctype/item_variant_settings/item_variant_settings.json msgid "Fields will be copied over only at time of creation." msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1068 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1069 msgid "File does not belong to this Transaction Deletion Record" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1062 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1063 msgid "File not found" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1076 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1077 msgid "File not found on server" msgstr "" @@ -20367,9 +20352,9 @@ msgstr "" msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) " msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:902 -#: erpnext/manufacturing/doctype/work_order/work_order.js:917 -#: erpnext/manufacturing/doctype/work_order/work_order.js:926 +#: erpnext/manufacturing/doctype/work_order/work_order.js:884 +#: erpnext/manufacturing/doctype/work_order/work_order.js:899 +#: erpnext/manufacturing/doctype/work_order/work_order.js:908 msgid "Finish" msgstr "" @@ -20426,15 +20411,15 @@ msgstr "" msgid "Finished Good Item Quantity" msgstr "" -#: erpnext/controllers/accounts_controller.py:4107 +#: erpnext/controllers/accounts_controller.py:4095 msgid "Finished Good Item is not specified for service item {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:4124 +#: erpnext/controllers/accounts_controller.py:4112 msgid "Finished Good Item {0} Qty can not be zero" msgstr "" -#: erpnext/controllers/accounts_controller.py:4118 +#: erpnext/controllers/accounts_controller.py:4106 msgid "Finished Good Item {0} must be a sub-contracted item" msgstr "" @@ -20480,7 +20465,7 @@ msgid "Finished Good {0} must be a sub-contracted item." msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1475 -#: erpnext/setup/doctype/company/company.py:385 +#: erpnext/setup/doctype/company/company.py:389 msgid "Finished Goods" msgstr "" @@ -20521,7 +20506,7 @@ msgstr "" msgid "Finished Goods based Operating Cost" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:862 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "" @@ -20699,8 +20684,8 @@ msgstr "" msgid "Fixed Asset item {0} cannot be used in BOMs." msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:43 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:76 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:47 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:81 msgid "Fixed Assets" msgstr "" @@ -20773,7 +20758,7 @@ msgstr "" msgid "Following Material Requests have been raised automatically based on Item's re-order level" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:843 +#: erpnext/selling/doctype/customer/customer.py:833 msgid "Following fields are mandatory to create address:" msgstr "" @@ -20830,7 +20815,7 @@ msgstr "" msgid "For Item" msgstr "" -#: erpnext/controllers/stock_controller.py:1606 +#: erpnext/controllers/stock_controller.py:1607 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "" @@ -20840,7 +20825,7 @@ msgid "For Job Card" msgstr "" #. Label of the for_operation (Link) field in DocType 'Job Card' -#: erpnext/manufacturing/doctype/job_card/job_card.js:529 +#: erpnext/manufacturing/doctype/job_card/job_card.js:465 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "For Operation" msgstr "" @@ -20861,17 +20846,13 @@ msgstr "" msgid "For Production" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 -msgid "For Quantity (Manufactured Qty) is mandatory" -msgstr "" - #. Label of the material_request_planning (Section Break) field in DocType #. 'Production Plan' #: erpnext/manufacturing/doctype/production_plan/production_plan.json msgid "For Raw Materials" msgstr "" -#: erpnext/controllers/accounts_controller.py:1442 +#: erpnext/controllers/accounts_controller.py:1443 msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}" msgstr "" @@ -20955,7 +20936,7 @@ msgstr "" msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2653 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2651 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})" msgstr "" @@ -20972,7 +20953,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "" @@ -20986,7 +20967,7 @@ msgstr "" msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1726 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1728 msgid "For row {0}: Enter Planned Qty" msgstr "" @@ -21005,7 +20986,7 @@ msgstr "" msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:773 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -21052,11 +21033,6 @@ msgstr "" msgid "Forecast Demand" msgstr "" -#. Label of the forecast_qty (Float) field in DocType 'Sales Forecast Item' -#: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json -msgid "Forecast Qty" -msgstr "" - #. Label of a Workspace Sidebar Item #: erpnext/workspace_sidebar/manufacturing.json msgid "Forecasting" @@ -21102,7 +21078,7 @@ msgstr "" msgid "Forum URL" msgstr "" -#: erpnext/setup/install.py:210 +#: erpnext/setup/install.py:242 msgid "Frappe School" msgstr "" @@ -21147,8 +21123,8 @@ msgstr "" msgid "Freeze Stocks Older Than (Days)" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:107 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:185 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:111 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:190 msgid "Freight and Forwarding Charges" msgstr "" @@ -21582,8 +21558,8 @@ msgstr "" msgid "Furlong" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:52 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:87 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:56 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:92 msgid "Furniture and Fixtures" msgstr "" @@ -21600,13 +21576,13 @@ msgid "Further nodes can be only created under 'Group' type nodes" msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:188 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1288 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1211 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:179 msgid "Future Payment Amount" msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:187 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1287 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1210 msgid "Future Payment Ref" msgstr "" @@ -21699,9 +21675,9 @@ msgstr "" msgid "Gain/Loss from Revaluation" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:134 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:220 -#: erpnext/setup/doctype/company/company.py:681 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:138 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:225 +#: erpnext/setup/doctype/company/company.py:686 msgid "Gain/Loss on Asset Disposal" msgstr "" @@ -22145,7 +22121,7 @@ msgstr "" msgid "Goods" msgstr "" -#: erpnext/setup/doctype/company/company.py:386 +#: erpnext/setup/doctype/company/company.py:390 #: erpnext/stock/doctype/stock_entry/stock_entry_list.js:21 msgid "Goods In Transit" msgstr "" @@ -22154,7 +22130,7 @@ msgstr "" msgid "Goods Transferred" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1379 msgid "Goods are already received against the outward entry {0}" msgstr "" @@ -22780,7 +22756,7 @@ msgstr "" msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}" msgstr "" -#: erpnext/stock/stock_ledger.py:2056 +#: erpnext/stock/stock_ledger.py:2022 msgid "Here are the options to proceed:" msgstr "" @@ -22808,7 +22784,7 @@ msgstr "" msgid "Hertz" msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:556 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:599 msgid "Hi," msgstr "" @@ -23007,7 +22983,7 @@ msgstr "" msgid "Hrs" msgstr "" -#: erpnext/setup/doctype/company/company.py:492 +#: erpnext/setup/doctype/company/company.py:496 msgid "Human Resources" msgstr "" @@ -23176,6 +23152,12 @@ msgstr "" msgid "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount" msgstr "" +#. Description of the 'Delivered by Supplier (Drop Ship)' (Check) field in +#. DocType 'Item' +#: erpnext/stock/doctype/item/item.json +msgid "If checked, this item is treated as drop-shipped by default in Sales Orders, Sales Invoices and Purchase Orders. The flag can be overridden on each transaction line." +msgstr "" + #: erpnext/public/js/setup_wizard.js:56 msgid "If checked, we will create demo data for you to explore the system. This demo data can be erased later." msgstr "" @@ -23396,7 +23378,7 @@ msgstr "" msgid "If no taxes are set, and Taxes and Charges Template is selected, the system will automatically apply the taxes from the chosen template." msgstr "" -#: erpnext/stock/stock_ledger.py:2066 +#: erpnext/stock/stock_ledger.py:2032 msgid "If not, you can Cancel / Submit this entry" msgstr "" @@ -23428,7 +23410,7 @@ msgstr "" msgid "If set, the system does not use the user's Email or the standard outgoing Email account for sending request for quotations." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1269 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1251 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected." msgstr "" @@ -23437,7 +23419,7 @@ msgstr "" msgid "If the account is frozen, entries are allowed to restricted users." msgstr "" -#: erpnext/stock/stock_ledger.py:2059 +#: erpnext/stock/stock_ledger.py:2025 msgid "If the item is transacting as a Zero Valuation Rate item in this entry, please enable 'Allow Zero Valuation Rate' in the {0} Item table." msgstr "" @@ -23447,7 +23429,7 @@ msgstr "" msgid "If the reorder check is set at the Group warehouse level, the available quantity becomes the sum of the projected quantities of all its child warehouses." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1288 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1270 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed." msgstr "" @@ -23524,7 +23506,7 @@ msgstr "" msgid "If yes, then this warehouse will be used to store rejected materials" msgstr "" -#: erpnext/stock/doctype/item/item.js:1158 +#: erpnext/stock/doctype/item/item.js:1145 msgid "If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item." msgstr "" @@ -23538,7 +23520,7 @@ msgstr "" msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox." msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1844 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1846 msgid "If you still want to proceed, please enable {0}." msgstr "" @@ -23622,7 +23604,7 @@ msgstr "" msgid "Ignore Existing Ordered Qty" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1836 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1838 msgid "Ignore Existing Projected Quantity" msgstr "" @@ -23713,8 +23695,8 @@ msgstr "" msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:135 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:229 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:139 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:234 msgid "Impairment" msgstr "" @@ -23996,7 +23978,7 @@ msgstr "" msgid "In this case, the amount will be calculated as 25% of the transaction amount. If the transaction amount is 200, then this will be calculated as 200 * 0.25 = 50." msgstr "" -#: erpnext/stock/doctype/item/item.js:1191 +#: erpnext/stock/doctype/item/item.js:1178 msgid "In this section, you can define Company-wide transaction-related defaults for this Item. Eg. Default Warehouse, Default Price List, Supplier, etc." msgstr "" @@ -24227,8 +24209,8 @@ msgstr "" #. Option for the 'Type' (Select) field in DocType 'Process Deferred #. Accounting' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:140 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:236 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:144 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:241 #: erpnext/accounts/doctype/account_category/account_category.json #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json @@ -24339,7 +24321,7 @@ msgstr "" msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:780 msgid "Incorrect Component Quantity" msgstr "" @@ -24473,15 +24455,15 @@ msgstr "" msgid "Indirect Expense" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:102 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:167 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:106 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:172 msgid "Indirect Expenses" msgstr "" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:145 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:242 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:149 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:247 msgid "Indirect Income" msgstr "" @@ -24549,14 +24531,14 @@ msgstr "" msgid "Inspected By" msgstr "" -#: erpnext/controllers/stock_controller.py:1500 -#: erpnext/manufacturing/doctype/job_card/job_card.py:833 +#: erpnext/controllers/stock_controller.py:1501 +#: erpnext/manufacturing/doctype/job_card/job_card.py:834 msgid "Inspection Rejected" msgstr "" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1470 -#: erpnext/controllers/stock_controller.py:1472 +#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1473 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "" @@ -24573,8 +24555,8 @@ msgstr "" msgid "Inspection Required before Purchase" msgstr "" -#: erpnext/controllers/stock_controller.py:1485 -#: erpnext/manufacturing/doctype/job_card/job_card.py:814 +#: erpnext/controllers/stock_controller.py:1486 +#: erpnext/manufacturing/doctype/job_card/job_card.py:815 msgid "Inspection Submission" msgstr "" @@ -24604,7 +24586,7 @@ msgstr "" msgid "Installation Note Item" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:643 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:684 msgid "Installation Note {0} has already been submitted" msgstr "" @@ -24643,11 +24625,11 @@ msgstr "" msgid "Insufficient Capacity" msgstr "" -#: erpnext/controllers/accounts_controller.py:4008 -#: erpnext/controllers/accounts_controller.py:4032 -#: erpnext/controllers/accounts_controller.py:4441 -#: erpnext/controllers/accounts_controller.py:4447 -#: erpnext/controllers/accounts_controller.py:4469 +#: erpnext/controllers/accounts_controller.py:4014 +#: erpnext/controllers/accounts_controller.py:4038 +#: erpnext/controllers/accounts_controller.py:4429 +#: erpnext/controllers/accounts_controller.py:4435 +#: erpnext/controllers/accounts_controller.py:4457 msgid "Insufficient Permissions" msgstr "" @@ -24655,13 +24637,12 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 -#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 -#: erpnext/stock/stock_ledger.py:2225 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1713 +#: erpnext/stock/stock_ledger.py:2191 msgid "Insufficient Stock" msgstr "" -#: erpnext/stock/stock_ledger.py:2240 +#: erpnext/stock/stock_ledger.py:2206 msgid "Insufficient Stock for Batch" msgstr "" @@ -24781,13 +24762,13 @@ msgstr "" msgid "Interest" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:132 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:218 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:136 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:223 msgid "Interest Expense" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:146 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:243 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:150 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:248 msgid "Interest Income" msgstr "" @@ -24795,8 +24776,8 @@ msgstr "" msgid "Interest and/or dunning fee" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:147 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:244 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:151 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:249 msgid "Interest on Fixed Deposits" msgstr "" @@ -24816,7 +24797,7 @@ msgstr "" msgid "Internal Customer Accounting" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:256 +#: erpnext/selling/doctype/customer/customer.py:246 msgid "Internal Customer for company {0} already exists" msgstr "" @@ -24824,7 +24805,7 @@ msgstr "" msgid "Internal Purchase Order" msgstr "" -#: erpnext/controllers/accounts_controller.py:804 +#: erpnext/controllers/accounts_controller.py:805 msgid "Internal Sale or Delivery Reference missing." msgstr "" @@ -24832,7 +24813,7 @@ msgstr "" msgid "Internal Sales Order" msgstr "" -#: erpnext/controllers/accounts_controller.py:806 +#: erpnext/controllers/accounts_controller.py:807 msgid "Internal Sales Reference Missing" msgstr "" @@ -24863,7 +24844,7 @@ msgstr "" msgid "Internal Transfer" msgstr "" -#: erpnext/controllers/accounts_controller.py:815 +#: erpnext/controllers/accounts_controller.py:816 msgid "Internal Transfer Reference Missing" msgstr "" @@ -24876,7 +24857,7 @@ msgstr "" msgid "Internal Work History" msgstr "" -#: erpnext/controllers/stock_controller.py:1567 +#: erpnext/controllers/stock_controller.py:1568 msgid "Internal transfers can only be done in company's default currency" msgstr "" @@ -24896,8 +24877,8 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1029 #: erpnext/assets/doctype/asset_category/asset_category.py:69 #: erpnext/assets/doctype/asset_category/asset_category.py:97 -#: erpnext/controllers/accounts_controller.py:3225 -#: erpnext/controllers/accounts_controller.py:3233 +#: erpnext/controllers/accounts_controller.py:3219 +#: erpnext/controllers/accounts_controller.py:3227 msgid "Invalid Account" msgstr "" @@ -24918,7 +24899,7 @@ msgstr "" msgid "Invalid Attribute" msgstr "" -#: erpnext/controllers/accounts_controller.py:626 +#: erpnext/controllers/accounts_controller.py:627 msgid "Invalid Auto Repeat Date" msgstr "" @@ -24931,7 +24912,7 @@ msgstr "" msgid "Invalid Barcode. There is no Item attached to this barcode." msgstr "" -#: erpnext/public/js/controllers/transaction.js:3132 +#: erpnext/public/js/controllers/transaction.js:3134 msgid "Invalid Blanket Order for the selected Customer and Item" msgstr "" @@ -24947,21 +24928,21 @@ msgstr "" msgid "Invalid Company Field" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2355 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2436 msgid "Invalid Company for Inter Company Transaction." msgstr "" #: erpnext/assets/doctype/asset/asset.py:362 #: erpnext/assets/doctype/asset/asset.py:369 -#: erpnext/controllers/accounts_controller.py:3248 +#: erpnext/controllers/accounts_controller.py:3242 msgid "Invalid Cost Center" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:369 +#: erpnext/selling/doctype/customer/customer.py:359 msgid "Invalid Customer Group" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:421 +#: erpnext/selling/doctype/sales_order/sales_order.py:431 msgid "Invalid Delivery Date" msgstr "" @@ -25021,7 +25002,7 @@ msgstr "" msgid "Invalid POS Invoices" msgstr "" -#: erpnext/accounts/doctype/account/account.py:387 +#: erpnext/accounts/doctype/account/account.py:388 msgid "Invalid Parent Account" msgstr "" @@ -25055,12 +25036,12 @@ msgstr "" msgid "Invalid Purchase Invoice" msgstr "" -#: erpnext/controllers/accounts_controller.py:4045 -#: erpnext/controllers/accounts_controller.py:4059 +#: erpnext/controllers/accounts_controller.py:4051 +#: erpnext/controllers/accounts_controller.py:4065 msgid "Invalid Qty" msgstr "" -#: erpnext/controllers/accounts_controller.py:1460 +#: erpnext/controllers/accounts_controller.py:1461 msgid "Invalid Quantity" msgstr "" @@ -25085,12 +25066,12 @@ msgstr "" msgid "Invalid Selling Price" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:937 msgid "Invalid Serial and Batch Bundle" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:43 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:65 msgid "Invalid Source and Target Warehouse" msgstr "" @@ -25115,7 +25096,7 @@ msgstr "" msgid "Invalid condition expression" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1057 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1058 msgid "Invalid file URL" msgstr "" @@ -25162,7 +25143,7 @@ msgstr "" msgid "Invalid {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2353 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2434 msgid "Invalid {0} for Inter Company Transaction." msgstr "" @@ -25172,7 +25153,7 @@ msgid "Invalid {0}: {1}" msgstr "" #. Label of the inventory_section (Tab Break) field in DocType 'Item' -#: erpnext/setup/install.py:385 erpnext/stock/doctype/item/item.json +#: erpnext/setup/install.py:417 erpnext/stock/doctype/item/item.json msgid "Inventory" msgstr "" @@ -25221,8 +25202,8 @@ msgstr "" msgid "Investment Banking" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:72 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:124 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:76 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:129 msgid "Investments" msgstr "" @@ -25272,7 +25253,7 @@ msgstr "" msgid "Invoice Document Type Selection Error" msgstr "" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1268 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1191 msgid "Invoice Grand Total" msgstr "" @@ -25377,7 +25358,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:171 #: erpnext/accounts/report/accounts_payable/accounts_payable.html:139 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:140 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1270 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1193 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:166 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:194 msgid "Invoiced Amount" @@ -25398,7 +25379,7 @@ msgstr "" #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json #: erpnext/accounts/doctype/pos_profile/pos_profile.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2404 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2485 #: erpnext/buying/doctype/supplier/supplier.json #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62 msgid "Invoices" @@ -25494,8 +25475,7 @@ msgstr "" msgid "Is Billable" msgstr "" -#. Label of the is_billing_contact (Check) field in DocType 'Contact' -#: erpnext/erpnext_integrations/custom/contact.json +#: erpnext/setup/install.py:170 msgid "Is Billing Contact" msgstr "" @@ -25937,8 +25917,7 @@ msgstr "" msgid "Is Transporter" msgstr "" -#. Label of the is_your_company_address (Check) field in DocType 'Address' -#: erpnext/accounts/custom/address.json +#: erpnext/setup/install.py:161 msgid "Is Your Company Address" msgstr "" @@ -26044,7 +26023,7 @@ msgstr "" #. Description of the 'Is Rate Adjustment Entry (Debit Note)' (Check) field in #. DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -msgid "Issue a debit note with 0 qty against an existing Sales Invoice" +msgid "Issue a debit note against an existing Sales Invoice to adjust the rate. The quantity will be retained from the original invoice." msgstr "" #. Option for the 'Current State' (Select) field in DocType 'Share Balance' @@ -26079,7 +26058,7 @@ msgstr "" msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "" -#: erpnext/public/js/controllers/transaction.js:2533 +#: erpnext/public/js/controllers/transaction.js:2535 msgid "It is needed to fetch Item Details." msgstr "" @@ -26451,7 +26430,7 @@ msgstr "" #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:86 #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:119 #: erpnext/projects/doctype/timesheet/timesheet.js:214 -#: erpnext/public/js/controllers/transaction.js:2827 +#: erpnext/public/js/controllers/transaction.js:2829 #: erpnext/public/js/stock_reservation.js:112 #: erpnext/public/js/stock_reservation.js:318 erpnext/public/js/utils.js:579 #: erpnext/public/js/utils.js:736 @@ -26513,7 +26492,7 @@ msgstr "" #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:433 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:7 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:138 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:126 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:104 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:25 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:26 @@ -26712,7 +26691,7 @@ msgstr "" #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:37 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:99 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:148 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:136 #: erpnext/stock/report/stock_analytics/stock_analytics.js:8 #: erpnext/stock/report/stock_analytics/stock_analytics.py:52 #: erpnext/stock/report/stock_balance/stock_balance.js:32 @@ -26935,7 +26914,7 @@ msgstr "" #: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:371 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:92 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:138 -#: erpnext/public/js/controllers/transaction.js:2833 +#: erpnext/public/js/controllers/transaction.js:2835 #: erpnext/public/js/utils.js:826 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:1324 @@ -26975,7 +26954,7 @@ msgstr "" #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:145 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:133 #: erpnext/stock/report/stock_analytics/stock_analytics.py:45 #: erpnext/stock/report/stock_balance/stock_balance.py:480 #: erpnext/stock/report/stock_ledger/stock_ledger.py:292 @@ -27019,10 +26998,6 @@ msgstr "" msgid "Item Price" msgstr "" -#: erpnext/stock/get_item_details.py:1136 -msgid "Item Price Added for {0} in Price List {1}" -msgstr "" - #. Label of the item_price_settings_section (Section Break) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -27038,8 +27013,9 @@ msgstr "" msgid "Item Price Stock" msgstr "" -#: erpnext/stock/get_item_details.py:1160 -msgid "Item Price added for {0} in Price List {1}" +#: erpnext/stock/get_item_details.py:1155 +#: erpnext/stock/get_item_details.py:1179 +msgid "Item Price added for {0} in Price List - {1}" msgstr "" #: erpnext/stock/doctype/item_price/item_price.py:140 @@ -27050,7 +27026,7 @@ msgstr "" msgid "Item Price created at rate {0}" msgstr "" -#: erpnext/stock/get_item_details.py:1119 +#: erpnext/stock/get_item_details.py:1138 msgid "Item Price updated for {0} in Price List {1}" msgstr "" @@ -27237,7 +27213,7 @@ msgstr "" msgid "Item Variant Settings" msgstr "" -#: erpnext/stock/doctype/item/item.js:1007 +#: erpnext/stock/doctype/item/item.js:994 msgid "Item Variant {0} already exists with same attributes" msgstr "" @@ -27342,7 +27318,7 @@ msgstr "" msgid "Item and Warranty Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:297 msgid "Item for row {0} does not match Material Request" msgstr "" @@ -27372,11 +27348,7 @@ msgstr "" msgid "Item operation" msgstr "" -#: erpnext/controllers/accounts_controller.py:4099 -msgid "Item qty can not be updated as raw materials are already processed." -msgstr "" - -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:605 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "" @@ -27399,7 +27371,7 @@ msgstr "" msgid "Item variant {0} exists with same attributes" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:563 msgid "Item with name {0} not found in the Purchase Order" msgstr "" @@ -27428,7 +27400,7 @@ msgstr "" msgid "Item {0} does not exist." msgstr "" -#: erpnext/controllers/selling_controller.py:855 +#: erpnext/controllers/selling_controller.py:856 msgid "Item {0} entered multiple times." msgstr "" @@ -27440,11 +27412,11 @@ msgstr "" msgid "Item {0} has been disabled" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:790 +#: erpnext/selling/doctype/sales_order/sales_order.py:793 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:582 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" @@ -27468,7 +27440,7 @@ msgstr "" msgid "Item {0} is disabled" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:568 msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." msgstr "" @@ -27488,7 +27460,7 @@ msgstr "" msgid "Item {0} is not a template item." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1302 msgid "Item {0} is not active or end of life has been reached" msgstr "" @@ -27504,7 +27476,7 @@ msgstr "" msgid "Item {0} must be a non-stock item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:59 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "" @@ -27520,7 +27492,7 @@ msgstr "" msgid "Item {0}: {1} qty produced. " msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1384 msgid "Item {} does not exist." msgstr "" @@ -27566,7 +27538,7 @@ msgstr "" msgid "Item-wise sales Register" msgstr "" -#: erpnext/stock/get_item_details.py:724 +#: erpnext/stock/get_item_details.py:743 msgid "Item/Item Code required to get Item Tax Template." msgstr "" @@ -27590,7 +27562,7 @@ msgstr "" msgid "Items Filter" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1688 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1690 #: erpnext/selling/doctype/sales_order/sales_order.js:1757 msgid "Items Required" msgstr "" @@ -27614,11 +27586,11 @@ msgstr "" msgid "Items and Pricing" msgstr "" -#: erpnext/controllers/accounts_controller.py:4255 +#: erpnext/controllers/accounts_controller.py:4243 msgid "Items cannot be updated as Subcontracting Inward Order(s) exist against this Subcontracted Sales Order." msgstr "" -#: erpnext/controllers/accounts_controller.py:4248 +#: erpnext/controllers/accounts_controller.py:4236 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}." msgstr "" @@ -27630,7 +27602,7 @@ msgstr "" msgid "Items not found." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:601 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "" @@ -27640,7 +27612,7 @@ msgstr "" msgid "Items to Be Repost" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1687 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1689 msgid "Items to Manufacture are required to pull the Raw Materials associated with it." msgstr "" @@ -27705,9 +27677,9 @@ msgstr "" #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/job_card/job_card.py:998 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1004 #: erpnext/manufacturing/doctype/operation/operation.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:415 +#: erpnext/manufacturing/doctype/work_order/work_order.js:396 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:29 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:86 @@ -27769,7 +27741,7 @@ msgstr "" msgid "Job Card and Capacity Planning" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1474 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1491 msgid "Job Card {0} has been completed" msgstr "" @@ -27845,7 +27817,7 @@ msgstr "" msgid "Job Worker Warehouse" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2708 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2706 msgid "Job card {0} created" msgstr "" @@ -28065,7 +28037,7 @@ msgstr "" msgid "Kilowatt-Hour" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1000 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1006 msgid "Kindly cancel the Manufacturing Entries first against the work order {0}." msgstr "" @@ -28193,7 +28165,7 @@ msgstr "" msgid "Last Fiscal Year" msgstr "" -#: erpnext/accounts/doctype/account/account.py:660 +#: erpnext/accounts/doctype/account/account.py:661 msgid "Last GL Entry update was done {}. This operation is not allowed while system is actively being used. Please wait for 5 minutes before retrying." msgstr "" @@ -28275,7 +28247,7 @@ msgstr "" msgid "Last transacted" msgstr "" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:185 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:173 msgid "Latest" msgstr "" @@ -28526,12 +28498,12 @@ msgstr "" msgid "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization." msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:111 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:190 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:115 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:195 msgid "Legal Expenses" msgstr "" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:19 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:31 msgid "Legend" msgstr "" @@ -28754,8 +28726,8 @@ msgstr "" msgid "Loan Start Date and Loan Period are mandatory to save the Invoice Discounting" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:176 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:300 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:180 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:305 msgid "Loans (Liabilities)" msgstr "" @@ -28800,8 +28772,8 @@ msgstr "" msgid "Logo" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:183 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:318 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:187 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:323 msgid "Long-term Provisions" msgstr "" @@ -29045,10 +29017,10 @@ msgstr "" msgid "Machine operator errors" msgstr "" -#: erpnext/setup/doctype/company/company.py:719 -#: erpnext/setup/doctype/company/company.py:734 -#: erpnext/setup/doctype/company/company.py:735 -#: erpnext/setup/doctype/company/company.py:736 +#: erpnext/setup/doctype/company/company.py:724 +#: erpnext/setup/doctype/company/company.py:739 +#: erpnext/setup/doctype/company/company.py:740 +#: erpnext/setup/doctype/company/company.py:741 msgid "Main" msgstr "" @@ -29291,9 +29263,9 @@ msgstr "" #. Label of the make (Data) field in DocType 'Vehicle' #: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 -#: erpnext/manufacturing/doctype/job_card/job_card.js:550 -#: erpnext/manufacturing/doctype/work_order/work_order.js:857 -#: erpnext/manufacturing/doctype/work_order/work_order.js:891 +#: erpnext/manufacturing/doctype/job_card/job_card.js:480 +#: erpnext/manufacturing/doctype/work_order/work_order.js:839 +#: erpnext/manufacturing/doctype/work_order/work_order.js:873 #: erpnext/setup/doctype/vehicle/vehicle.json msgid "Make" msgstr "" @@ -29313,7 +29285,7 @@ msgstr "" msgid "Make Difference Entry" msgstr "" -#: erpnext/stock/doctype/item/item.js:696 +#: erpnext/stock/doctype/item/item.js:683 msgid "Make Lead Time" msgstr "" @@ -29351,12 +29323,12 @@ msgstr "" msgid "Make Serial No / Batch from Work Order" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:109 +#: erpnext/manufacturing/doctype/job_card/job_card.js:106 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:256 msgid "Make Stock Entry" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:424 +#: erpnext/manufacturing/doctype/job_card/job_card.js:369 msgid "Make Subcontracting PO" msgstr "" @@ -29372,11 +29344,11 @@ msgstr "" msgid "Make project from a template." msgstr "" -#: erpnext/stock/doctype/item/item.js:804 +#: erpnext/stock/doctype/item/item.js:791 msgid "Make {0} Variant" msgstr "" -#: erpnext/stock/doctype/item/item.js:806 +#: erpnext/stock/doctype/item/item.js:793 msgid "Make {0} Variants" msgstr "" @@ -29384,8 +29356,8 @@ msgstr "" msgid "Making Journal Entries against advance accounts: {0} is not recommended. These Journals won't be available for Reconciliation." msgstr "" -#: erpnext/setup/doctype/company/company.js:161 -#: erpnext/setup/doctype/company/company.js:172 +#: erpnext/setup/doctype/company/company.js:177 +#: erpnext/setup/doctype/company/company.js:188 msgid "Manage" msgstr "" @@ -29404,7 +29376,7 @@ msgstr "" msgid "Manage your orders" msgstr "" -#: erpnext/setup/doctype/company/company.py:498 +#: erpnext/setup/doctype/company/company.py:502 msgid "Management" msgstr "" @@ -29420,7 +29392,7 @@ msgstr "" msgid "Mandatory Accounting Dimension" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1881 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1962 msgid "Mandatory Field" msgstr "" @@ -29519,8 +29491,8 @@ msgstr "" #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:696 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:713 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json @@ -29624,7 +29596,7 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:29 -#: erpnext/setup/doctype/company/company.json erpnext/setup/install.py:390 +#: erpnext/setup/doctype/company/company.json erpnext/setup/install.py:422 #: erpnext/setup/setup_wizard/data/industry_type.txt:31 #: erpnext/stock/doctype/batch/batch.json erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/item_lead_time/item_lead_time.json @@ -29669,10 +29641,6 @@ msgstr "" msgid "Manufacturing Manager" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 -msgid "Manufacturing Quantity is mandatory" -msgstr "" - #. Label of the manufacturing_section_section (Section Break) field in DocType #. 'Sales Order Item' #: erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -29853,12 +29821,12 @@ msgstr "" msgid "Market Segment" msgstr "" -#: erpnext/setup/doctype/company/company.py:450 +#: erpnext/setup/doctype/company/company.py:454 msgid "Marketing" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:112 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:191 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:116 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:196 msgid "Marketing Expenses" msgstr "" @@ -29937,7 +29905,7 @@ msgstr "" msgid "Material" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:882 +#: erpnext/manufacturing/doctype/work_order/work_order.js:864 msgid "Material Consumption" msgstr "" @@ -29945,7 +29913,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:697 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "" @@ -30026,7 +29994,7 @@ msgstr "" #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:33 #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:184 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/manufacturing/doctype/job_card/job_card.js:166 +#: erpnext/manufacturing/doctype/job_card/job_card.js:214 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:159 #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json @@ -30123,11 +30091,11 @@ msgstr "" msgid "Material Request Type" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1158 +#: erpnext/selling/doctype/sales_order/sales_order.py:1171 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1969 +#: erpnext/selling/doctype/sales_order/sales_order.py:1991 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "" @@ -30195,7 +30163,7 @@ msgstr "" #. Option for the 'Purpose' (Select) field in DocType 'Pick List' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' -#: erpnext/manufacturing/doctype/job_card/job_card.js:180 +#: erpnext/manufacturing/doctype/job_card/job_card.js:225 #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/setup/setup_wizard/operations/install_fixtures.py:83 #: erpnext/stock/doctype/item/item.json @@ -30261,12 +30229,12 @@ msgstr "" msgid "Materials To Be Transferred" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1543 +#: erpnext/controllers/subcontracting_controller.py:1545 msgid "Materials are already received against the {0} {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:184 -#: erpnext/manufacturing/doctype/job_card/job_card.py:854 +#: erpnext/manufacturing/doctype/job_card/job_card.py:185 +#: erpnext/manufacturing/doctype/job_card/job_card.py:855 msgid "Materials needs to be transferred to the work in progress warehouse for the job card {0}" msgstr "" @@ -30337,9 +30305,9 @@ msgstr "" msgid "Max discount allowed for item: {0} is {1}%" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1058 -#: erpnext/manufacturing/doctype/work_order/work_order.js:1065 -#: erpnext/manufacturing/doctype/work_order/work_order.js:1088 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1040 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1047 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1070 #: erpnext/stock/doctype/pick_list/pick_list.js:203 #: erpnext/stock/doctype/stock_entry/stock_entry.js:382 msgid "Max: {0}" @@ -30371,11 +30339,11 @@ msgstr "" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:1049 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:1038 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "" @@ -30436,7 +30404,7 @@ msgstr "" msgid "Megawatt" msgstr "" -#: erpnext/stock/stock_ledger.py:2072 +#: erpnext/stock/stock_ledger.py:2038 msgid "Mention Valuation Rate in the Item master." msgstr "" @@ -30494,7 +30462,7 @@ msgstr "" msgid "Merged" msgstr "" -#: erpnext/accounts/doctype/account/account.py:603 +#: erpnext/accounts/doctype/account/account.py:604 msgid "Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency" msgstr "" @@ -30524,7 +30492,7 @@ msgstr "" msgid "Messages greater than 160 characters will be split into multiple messages" msgstr "" -#: erpnext/setup/install.py:137 +#: erpnext/setup/install.py:138 msgid "Messaging CRM Campaign" msgstr "" @@ -30725,7 +30693,7 @@ msgstr "" msgid "Min Qty should be greater than Recurse Over Qty" msgstr "" -#: erpnext/stock/doctype/item/item.js:958 +#: erpnext/stock/doctype/item/item.js:945 msgid "Min Value: {0}, Max Value: {1}, in Increments of: {2}" msgstr "" @@ -30816,8 +30784,8 @@ msgstr "" msgid "Miscellaneous" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:116 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:224 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:120 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:229 msgid "Miscellaneous Expenses" msgstr "" @@ -30825,15 +30793,15 @@ msgstr "" msgid "Mismatch" msgstr "" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1385 msgid "Missing" msgstr "" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:97 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:201 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:594 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2421 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3029 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2502 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3110 #: erpnext/assets/doctype/asset_category/asset_category.py:126 msgid "Missing Account" msgstr "" @@ -30863,7 +30831,7 @@ msgstr "" msgid "Missing Finance Book" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:872 msgid "Missing Finished Good" msgstr "" @@ -30871,7 +30839,7 @@ msgstr "" msgid "Missing Formula" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:787 msgid "Missing Item" msgstr "" @@ -30908,7 +30876,7 @@ msgid "Missing required filter: {0}" msgstr "" #: erpnext/manufacturing/doctype/bom/bom.py:1228 -#: erpnext/manufacturing/doctype/work_order/work_order.py:1498 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1499 msgid "Missing value" msgstr "" @@ -31157,7 +31125,7 @@ msgstr "" msgid "Multiple Accounts (Journal Template)" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:440 +#: erpnext/selling/doctype/customer/customer.py:430 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually." msgstr "" @@ -31183,11 +31151,11 @@ msgstr "" msgid "Multiple company fields available: {0}. Please select manually." msgstr "" -#: erpnext/controllers/accounts_controller.py:1306 +#: erpnext/controllers/accounts_controller.py:1307 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:879 msgid "Multiple items cannot be marked as finished item" msgstr "" @@ -31196,7 +31164,7 @@ msgid "Music" msgstr "" #. Label of the must_be_whole_number (Check) field in DocType 'UOM' -#: erpnext/manufacturing/doctype/work_order/work_order.py:1445 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1446 #: erpnext/setup/doctype/uom/uom.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:267 #: erpnext/utilities/transaction_base.py:628 @@ -31283,7 +31251,7 @@ msgstr "" msgid "Naming Series updated" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:938 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:939 msgid "Naming series '{0}' for DocType '{1}' does not contain standard '.' or '{{' separator. Using fallback extraction." msgstr "" @@ -31642,7 +31610,7 @@ msgstr "" msgid "Net Weight UOM" msgstr "" -#: erpnext/controllers/accounts_controller.py:1666 +#: erpnext/controllers/accounts_controller.py:1667 msgid "Net total calculation precision loss" msgstr "" @@ -31819,7 +31787,7 @@ msgstr "" msgid "New Workplace" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:405 +#: erpnext/selling/doctype/customer/customer.py:395 msgid "New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}" msgstr "" @@ -31873,7 +31841,7 @@ msgstr "" msgid "No Account Data row found" msgstr "" -#: erpnext/setup/doctype/company/test_company.py:93 +#: erpnext/setup/doctype/company/test_company.py:94 msgid "No Account matched these filters: {}" msgstr "" @@ -31886,7 +31854,7 @@ msgstr "" msgid "No Answer" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2526 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2607 msgid "No Customer found for Inter Company Transactions which represents company {0}" msgstr "" @@ -31899,7 +31867,7 @@ msgstr "" msgid "No Delivery Note selected for Customer {}" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:755 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:756 msgid "No DocTypes in To Delete list. Please generate or import the list before submitting." msgstr "" @@ -31915,7 +31883,7 @@ msgstr "" msgid "No Item with Serial No {0}" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1459 +#: erpnext/controllers/subcontracting_controller.py:1461 msgid "No Items selected for transfer." msgstr "" @@ -31979,7 +31947,7 @@ msgstr "" msgid "No Summary" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2510 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2591 msgid "No Supplier found for Inter Company Transactions which represents company {0}" msgstr "" @@ -31991,7 +31959,7 @@ msgstr "" msgid "No Tax withholding account set for Company {0} in Tax Withholding Category {1}." msgstr "" -#: erpnext/accounts/report/gross_profit/gross_profit.py:998 +#: erpnext/accounts/report/gross_profit/gross_profit.py:990 msgid "No Terms" msgstr "" @@ -32021,7 +31989,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:799 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "" @@ -32343,7 +32311,7 @@ msgstr "" msgid "No vouchers found for this transaction" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2574 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2655 msgid "No {0} found for Inter Company Transactions." msgstr "" @@ -32388,8 +32356,8 @@ msgstr "" msgid "Non stock items" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:182 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:317 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:186 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:322 msgid "Non-Current Liabilities" msgstr "" @@ -32490,7 +32458,7 @@ msgstr "" msgid "Not allow to set alternative item for the item {0}" msgstr "" -#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:59 +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:60 msgid "Not allowed to create accounting dimension for {0}" msgstr "" @@ -32544,7 +32512,7 @@ msgstr "" msgid "Note: Item {0} added multiple times" msgstr "" -#: erpnext/controllers/accounts_controller.py:712 +#: erpnext/controllers/accounts_controller.py:713 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified" msgstr "" @@ -32794,18 +32762,18 @@ msgstr "" msgid "Offer Date" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:56 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:92 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:60 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:97 msgid "Office Equipment" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:120 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:196 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:124 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:201 msgid "Office Maintenance Expenses" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:121 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:200 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:125 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:205 msgid "Office Rent" msgstr "" @@ -32933,7 +32901,7 @@ msgstr "" msgid "Once set, this invoice will be on hold till the set date" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:769 +#: erpnext/manufacturing/doctype/work_order/work_order.js:751 msgid "Once the Work Order is Closed. It can't be resumed." msgstr "" @@ -32973,7 +32941,7 @@ msgstr "" msgid "Only CSV and Excel files can be used to for importing data. Please check the file format you are trying to upload" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1071 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1072 msgid "Only CSV files are allowed" msgstr "" @@ -32992,7 +32960,7 @@ msgstr "" msgid "Only Include Allocated Payments" msgstr "" -#: erpnext/accounts/doctype/account/account.py:136 +#: erpnext/accounts/doctype/account/account.py:137 msgid "Only Parent can be of type {0}" msgstr "" @@ -33029,7 +32997,7 @@ msgstr "" msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:712 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "" @@ -33247,8 +33215,8 @@ msgstr "" msgid "Opening Balance Details" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:192 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:343 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:196 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:348 msgid "Opening Balance Equity" msgstr "" @@ -33304,7 +33272,7 @@ msgid "Opening Invoice Tool" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1651 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1990 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2071 msgid "Opening Invoice has rounding adjustment of {0}.

    '{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 "" @@ -33372,7 +33340,10 @@ msgid "Opening stock creation has been queued and will be created in the backgro msgstr "" #. Label of the operating_component (Link) field in DocType 'Workstation Cost' +#. Label of the operating_component (Data) field in DocType 'Landed Cost Taxes +#. and Charges' #: erpnext/manufacturing/doctype/workstation_cost/workstation_cost.json +#: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json msgid "Operating Component" msgstr "" @@ -33404,7 +33375,7 @@ msgstr "" msgid "Operating Cost Per BOM Quantity" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1731 +#: erpnext/manufacturing/doctype/bom/bom.py:1749 msgid "Operating Cost as per Work Order / BOM" msgstr "" @@ -33447,15 +33418,15 @@ msgstr "" #. Label of the operation_row_id (Int) field in DocType 'BOM Item' #. Label of the operation_id (Data) field in DocType 'Job Card' +#. Label of the operation_id (Data) field in DocType 'Landed Cost Taxes and +#. Charges' #: erpnext/manufacturing/doctype/bom_item/bom_item.json #: erpnext/manufacturing/doctype/job_card/job_card.json +#: erpnext/manufacturing/doctype/work_order/work_order.js:332 +#: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json msgid "Operation ID" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:351 -msgid "Operation Id" -msgstr "" - #. Label of the operation_row_id (Int) field in DocType 'Job Card' #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "Operation Row ID" @@ -33480,7 +33451,7 @@ msgstr "" msgid "Operation Time" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1504 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1505 msgid "Operation Time must be greater than 0 for Operation {0}" msgstr "" @@ -33495,11 +33466,11 @@ msgstr "" msgid "Operation time does not depend on quantity to produce" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:592 +#: erpnext/manufacturing/doctype/job_card/job_card.js:518 msgid "Operation {0} added multiple times in the work order {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1247 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1255 msgid "Operation {0} does not belong to the work order {1}" msgstr "" @@ -33515,9 +33486,9 @@ msgstr "" #. Label of the operations (Table) field in DocType 'Work Order' #. Label of the operation (Section Break) field in DocType 'Email Digest' #: erpnext/manufacturing/doctype/bom/bom.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:332 +#: erpnext/manufacturing/doctype/work_order/work_order.js:313 #: erpnext/manufacturing/doctype/work_order/work_order.json -#: erpnext/setup/doctype/company/company.py:468 +#: erpnext/setup/doctype/company/company.py:472 #: erpnext/setup/doctype/email_digest/email_digest.json #: erpnext/templates/generators/bom.html:61 msgid "Operations" @@ -33690,7 +33661,7 @@ msgstr "" msgid "Optimize Route" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1035 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1017 msgid "Optional. Select a specific manufacture entry to reverse." msgstr "" @@ -33840,7 +33811,7 @@ msgstr "" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1005 +#: erpnext/selling/doctype/sales_order/sales_order.py:1018 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "" @@ -34058,7 +34029,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/report/accounts_payable/accounts_payable.html:140 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:141 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1277 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1200 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:169 #: erpnext/accounts/report/purchase_register/purchase_register.py:289 #: erpnext/accounts/report/sales_register/sales_register.py:319 @@ -34124,7 +34095,7 @@ msgstr "" msgid "Over Picking Allowance" msgstr "" -#: erpnext/controllers/stock_controller.py:1737 +#: erpnext/controllers/stock_controller.py:1738 msgid "Over Receipt" msgstr "" @@ -34152,7 +34123,7 @@ msgstr "" msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role." msgstr "" -#: erpnext/controllers/accounts_controller.py:2184 +#: erpnext/controllers/accounts_controller.py:2185 msgid "Overbilling of {} ignored because you have {} role." msgstr "" @@ -34637,7 +34608,7 @@ msgstr "" msgid "Packed Items" msgstr "" -#: erpnext/controllers/stock_controller.py:1571 +#: erpnext/controllers/stock_controller.py:1572 msgid "Packed Items cannot be transferred internally" msgstr "" @@ -34674,7 +34645,7 @@ msgstr "" msgid "Packing Slip Item" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:659 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:700 msgid "Packing Slip(s) cancelled" msgstr "" @@ -34715,7 +34686,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:173 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1271 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1194 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:167 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:201 #: erpnext/accounts/report/pos_register/pos_register.py:209 @@ -34875,7 +34846,7 @@ msgstr "" msgid "Parent Company" msgstr "" -#: erpnext/setup/doctype/company/company.py:603 +#: erpnext/setup/doctype/company/company.py:607 msgid "Parent Company must be a group company" msgstr "" @@ -35215,7 +35186,7 @@ msgstr "" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:105 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:82 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:65 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1204 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1127 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:82 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:147 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 @@ -35242,7 +35213,7 @@ msgstr "" #. Name of a DocType #: erpnext/accounts/doctype/party_account/party_account.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1216 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1139 msgid "Party Account" msgstr "" @@ -35275,7 +35246,7 @@ msgstr "" msgid "Party Account No. (Bank Statement)" msgstr "" -#: erpnext/controllers/accounts_controller.py:2468 +#: erpnext/controllers/accounts_controller.py:2469 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same" msgstr "" @@ -35427,7 +35398,7 @@ msgstr "" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:92 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:69 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:52 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1198 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1121 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:69 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:141 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 @@ -35536,7 +35507,7 @@ msgstr "" msgid "Pause" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:263 +#: erpnext/manufacturing/doctype/job_card/job_card.js:660 msgid "Pause Job" msgstr "" @@ -35587,7 +35558,7 @@ msgid "Payable" msgstr "" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:50 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1214 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1137 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:209 #: erpnext/accounts/report/purchase_register/purchase_register.py:194 #: erpnext/accounts/report/purchase_register/purchase_register.py:235 @@ -35621,7 +35592,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:98 #: erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py:25 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:42 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:51 #: erpnext/buying/doctype/purchase_order/purchase_order.js:394 #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:24 #: erpnext/selling/doctype/sales_order/sales_order.js:1213 @@ -35768,7 +35739,7 @@ msgstr "" msgid "Payment Entry is already created" msgstr "" -#: erpnext/controllers/accounts_controller.py:1617 +#: erpnext/controllers/accounts_controller.py:1618 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice." msgstr "" @@ -36058,7 +36029,7 @@ msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/buying/doctype/purchase_order/purchase_order.json -#: erpnext/controllers/accounts_controller.py:2748 +#: erpnext/controllers/accounts_controller.py:2749 #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.json msgid "Payment Schedule" @@ -36087,7 +36058,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_schedule/payment_schedule.json #: erpnext/accounts/doctype/payment_term/payment_term.json #: erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1267 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1190 #: erpnext/accounts/report/gross_profit/gross_profit.py:449 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/public/js/controllers/transaction.js:498 @@ -36214,7 +36185,7 @@ msgstr "" msgid "Payment methods are mandatory. Please add at least one payment method." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3033 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3114 msgid "Payment methods refreshed. Please review before proceeding." msgstr "" @@ -36289,8 +36260,8 @@ msgstr "" msgid "Payroll Entry" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:156 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:262 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:160 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:267 msgid "Payroll Payable" msgstr "" @@ -36337,10 +36308,14 @@ msgstr "" msgid "Pending Amount" msgstr "" +#. Label of the pending_qty (Float) field in DocType 'Job Card' #. Label of the pending_qty (Float) field in DocType 'Production Plan Item' +#. Label of the pending_qty (Float) field in DocType 'Work Order Operation' #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:254 +#: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:356 +#: erpnext/manufacturing/doctype/work_order/work_order.js:337 +#: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:182 #: erpnext/selling/doctype/sales_order/sales_order.js:1726 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45 @@ -36349,9 +36324,18 @@ msgstr "" #: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:54 #: erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.py:44 +#: erpnext/manufacturing/doctype/job_card/job_card.js:273 msgid "Pending Quantity" msgstr "" +#: erpnext/manufacturing/doctype/job_card/job_card.js:70 +msgid "Pending Quantity cannot be greater than {0}" +msgstr "" + +#: erpnext/manufacturing/doctype/job_card/job_card.js:62 +msgid "Pending Quantity cannot be less than 0" +msgstr "" + #. Option for the 'Status' (Select) field in DocType 'Task' #. Option in a Select field in the tasks Web Form #: erpnext/projects/doctype/task/task.json @@ -36381,6 +36365,14 @@ msgstr "" msgid "Pending processing" msgstr "" +#: erpnext/manufacturing/doctype/job_card/job_card.py:1464 +msgid "Pending quantity cannot be greater than the for quantity." +msgstr "" + +#: erpnext/manufacturing/doctype/job_card/job_card.py:1458 +msgid "Pending quantity cannot be negative." +msgstr "" + #: erpnext/setup/setup_wizard/data/industry_type.txt:36 msgid "Pension Funds" msgstr "" @@ -37055,8 +37047,8 @@ msgstr "" msgid "Plant Floor" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:57 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:97 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:61 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:102 msgid "Plants and Machineries" msgstr "" @@ -37140,7 +37132,7 @@ msgstr "" msgid "Please add the account to root level Company - {0}" msgstr "" -#: erpnext/accounts/doctype/account/account.py:233 +#: erpnext/accounts/doctype/account/account.py:234 msgid "Please add the account to root level Company - {}" msgstr "" @@ -37148,7 +37140,7 @@ msgstr "" msgid "Please add {1} role to user {0}." msgstr "" -#: erpnext/controllers/stock_controller.py:1748 +#: erpnext/controllers/stock_controller.py:1749 msgid "Please adjust the qty or edit {0} to proceed." msgstr "" @@ -37156,7 +37148,7 @@ msgstr "" msgid "Please attach CSV file" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3174 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3255 msgid "Please cancel and amend the Payment Entry" msgstr "" @@ -37190,7 +37182,7 @@ msgstr "" msgid "Please check the 'Activate Serial and Batch No for Item' checkbox in the {0} to make Serial and Batch Bundle for the item." msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:562 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:605 msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again." msgstr "" @@ -37215,11 +37207,15 @@ msgstr "" msgid "Please click on 'Generate Schedule' to get schedule" msgstr "" +#: erpnext/manufacturing/doctype/job_card/job_card.js:58 +msgid "Please complete the job first before entering Pending Quantity" +msgstr "" + #: erpnext/accounts/doctype/bank_transaction_rule/bank_transaction_rule.py:80 msgid "Please configure accounts for the Bank Entry rule." msgstr "" -#: erpnext/selling/doctype/customer/customer.py:642 +#: erpnext/selling/doctype/customer/customer.py:632 msgid "Please contact any of the following users to extend the credit limits for {0}: {1}" msgstr "" @@ -37227,11 +37223,11 @@ msgstr "" msgid "Please contact any of the following users to {} this transaction." msgstr "" -#: erpnext/selling/doctype/customer/customer.py:635 +#: erpnext/selling/doctype/customer/customer.py:625 msgid "Please contact your administrator to extend the credit limits for {0}." msgstr "" -#: erpnext/accounts/doctype/account/account.py:384 +#: erpnext/accounts/doctype/account/account.py:385 msgid "Please convert the parent account in corresponding child company to a group account." msgstr "" @@ -37243,11 +37239,11 @@ msgstr "" msgid "Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled." msgstr "" -#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:74 +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:75 msgid "Please create a new Accounting Dimension if required." msgstr "" -#: erpnext/controllers/accounts_controller.py:805 +#: erpnext/controllers/accounts_controller.py:806 msgid "Please create purchase from internal sale or delivery document itself" msgstr "" @@ -37291,7 +37287,7 @@ msgstr "" msgid "Please enable {0} in the {1}." msgstr "" -#: erpnext/controllers/selling_controller.py:857 +#: erpnext/controllers/selling_controller.py:858 msgid "Please enable {} in {} to allow same item in multiple rows" msgstr "" @@ -37311,7 +37307,7 @@ msgstr "" msgid "Please ensure {} account {} is a Receivable account." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:757 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:145 msgid "Please enter Difference Account or set default Stock Adjustment Account for company {0}" msgstr "" @@ -37332,7 +37328,7 @@ msgstr "" msgid "Please enter Cost Center" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:425 +#: erpnext/selling/doctype/sales_order/sales_order.py:435 msgid "Please enter Delivery Date" msgstr "" @@ -37349,7 +37345,7 @@ msgstr "" msgid "Please enter Item Code to get Batch Number" msgstr "" -#: erpnext/public/js/controllers/transaction.js:2989 +#: erpnext/public/js/controllers/transaction.js:2991 msgid "Please enter Item Code to get batch no" msgstr "" @@ -37365,7 +37361,7 @@ msgstr "" msgid "Please enter Planned Qty for Item {0} at row {1}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:73 +#: erpnext/manufacturing/doctype/work_order/work_order.js:44 msgid "Please enter Production Item first" msgstr "" @@ -37422,7 +37418,7 @@ msgstr "" msgid "Please enter company name first" msgstr "" -#: erpnext/controllers/accounts_controller.py:2974 +#: erpnext/controllers/accounts_controller.py:2968 msgid "Please enter default currency in Company Master" msgstr "" @@ -37450,7 +37446,7 @@ msgstr "" msgid "Please enter serial nos" msgstr "" -#: erpnext/setup/doctype/company/company.js:214 +#: erpnext/setup/doctype/company/company.js:230 msgid "Please enter the company name to confirm" msgstr "" @@ -37518,11 +37514,11 @@ msgstr "" msgid "Please make sure the file you are using has 'Parent Account' column present in the header." msgstr "" -#: erpnext/setup/doctype/company/company.js:216 +#: erpnext/setup/doctype/company/company.js:232 msgid "Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone." msgstr "" -#: erpnext/stock/doctype/item/item.js:709 +#: erpnext/stock/doctype/item/item.js:696 msgid "Please mention 'Weight UOM' along with Weight." msgstr "" @@ -37581,7 +37577,7 @@ msgstr "" msgid "Please select Apply Discount On" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1884 +#: erpnext/selling/doctype/sales_order/sales_order.py:1906 msgid "Please select BOM against item {0}" msgstr "" @@ -37627,7 +37623,7 @@ msgstr "" msgid "Please select Customer first" msgstr "" -#: erpnext/setup/doctype/company/company.py:534 +#: erpnext/setup/doctype/company/company.py:538 msgid "Please select Existing Company for creating Chart of Accounts" msgstr "" @@ -37636,8 +37632,8 @@ msgstr "" msgid "Please select Finished Good Item for Service Item {0}" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:752 -#: erpnext/assets/doctype/asset/asset.js:767 +#: erpnext/assets/doctype/asset/asset.js:754 +#: erpnext/assets/doctype/asset/asset.js:769 msgid "Please select Item Code first" msgstr "" @@ -37669,7 +37665,7 @@ msgstr "" msgid "Please select Price List" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1886 +#: erpnext/selling/doctype/sales_order/sales_order.py:1908 msgid "Please select Qty against item {0}" msgstr "" @@ -37689,7 +37685,7 @@ msgstr "" msgid "Please select Stock Asset Account" msgstr "" -#: erpnext/controllers/accounts_controller.py:2823 +#: erpnext/controllers/accounts_controller.py:2824 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}" msgstr "" @@ -37706,7 +37702,7 @@ msgstr "" #: erpnext/manufacturing/doctype/bom/bom.js:727 #: erpnext/manufacturing/doctype/bom/bom.py:280 #: erpnext/public/js/controllers/accounts.js:277 -#: erpnext/public/js/controllers/transaction.js:3288 +#: erpnext/public/js/controllers/transaction.js:3290 msgid "Please select a Company first." msgstr "" @@ -37730,7 +37726,7 @@ msgstr "" msgid "Please select a Warehouse" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1601 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1618 msgid "Please select a Work Order first." msgstr "" @@ -37807,7 +37803,7 @@ msgstr "" msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:556 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37827,7 +37823,7 @@ msgstr "" msgid "Please select atleast one item to continue" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:399 +#: erpnext/manufacturing/doctype/work_order/work_order.js:380 msgid "Please select atleast one operation to create Job Card" msgstr "" @@ -37885,7 +37881,7 @@ msgstr "" msgid "Please select the Multiple Tier Program type for more than one collection rules." msgstr "" -#: erpnext/stock/doctype/item/item.js:371 +#: erpnext/stock/doctype/item/item.js:364 msgid "Please select the Warehouse first" msgstr "" @@ -37939,7 +37935,7 @@ msgstr "" msgid "Please set Account" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1881 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1962 msgid "Please set Account for Change Amount" msgstr "" @@ -38033,7 +38029,7 @@ msgstr "" msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}" msgstr "" -#: erpnext/projects/doctype/project/project.py:735 +#: erpnext/projects/doctype/project/project.py:773 msgid "Please set a default Holiday List for Company {0}" msgstr "" @@ -38070,23 +38066,23 @@ msgstr "" msgid "Please set both the Tax ID and Fiscal Code on Company {0}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2418 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2499 msgid "Please set default Cash or Bank account in Mode of Payment {0}" msgstr "" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:94 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:198 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3026 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3107 msgid "Please set default Cash or Bank account in Mode of Payment {}" msgstr "" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:96 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:200 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3028 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3109 msgid "Please set default Cash or Bank account in Mode of Payments {}" msgstr "" -#: erpnext/accounts/utils.py:2541 +#: erpnext/accounts/utils.py:2540 msgid "Please set default Exchange Gain/Loss Account in Company {}" msgstr "" @@ -38115,7 +38111,7 @@ msgstr "" msgid "Please set filter based on Item or Warehouse" msgstr "" -#: erpnext/controllers/accounts_controller.py:2384 +#: erpnext/controllers/accounts_controller.py:2385 msgid "Please set one of the following:" msgstr "" @@ -38123,7 +38119,7 @@ msgstr "" msgid "Please set opening number of booked depreciations" msgstr "" -#: erpnext/public/js/controllers/transaction.js:2676 +#: erpnext/public/js/controllers/transaction.js:2678 msgid "Please set recurring after saving" msgstr "" @@ -38135,15 +38131,15 @@ msgstr "" msgid "Please set the Default Cost Center in {0} company." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:686 +#: erpnext/manufacturing/doctype/work_order/work_order.js:668 msgid "Please set the Item Code first" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1664 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1681 msgid "Please set the Target Warehouse in the Job Card" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1668 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1685 msgid "Please set the WIP Warehouse in the Job Card" msgstr "" @@ -38182,7 +38178,7 @@ msgstr "" msgid "Please set {0} in Company {1} to account for Exchange Gain / Loss" msgstr "" -#: erpnext/controllers/accounts_controller.py:594 +#: erpnext/controllers/accounts_controller.py:595 msgid "Please set {0} to {1}, the same account that was used in the original invoice {2}." msgstr "" @@ -38204,7 +38200,7 @@ msgstr "" msgid "Please specify Company to proceed" msgstr "" -#: erpnext/controllers/accounts_controller.py:3207 +#: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:117 msgid "Please specify a valid Row ID for row {0} in table {1}" msgstr "" @@ -38322,8 +38318,8 @@ msgstr "" msgid "Post Title Key" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:122 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:201 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:126 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:206 msgid "Postal Expenses" msgstr "" @@ -38406,7 +38402,7 @@ msgstr "" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:16 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:15 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:18 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1196 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1119 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:15 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:38 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:7 @@ -38528,10 +38524,6 @@ msgstr "" msgid "Posting Time" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 -msgid "Posting date and posting time is mandatory" -msgstr "" - #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:841 msgid "Posting date does not match the selected transaction" msgstr "" @@ -38605,15 +38597,15 @@ msgstr "" msgid "Pre Sales" msgstr "" -#: erpnext/accounts/utils.py:2779 +#: erpnext/accounts/utils.py:2778 msgid "Pre-Submit Warning" msgstr "" -#: erpnext/accounts/utils.py:2828 +#: erpnext/accounts/utils.py:2827 msgid "Pre-Submit Warning: Credit Limit" msgstr "" -#: erpnext/accounts/utils.py:2840 +#: erpnext/accounts/utils.py:2839 msgid "Pre-Submit Warning: Packed Qty" msgstr "" @@ -38863,7 +38855,7 @@ msgstr "" msgid "Price List Currency" msgstr "" -#: erpnext/stock/get_item_details.py:1334 +#: erpnext/stock/get_item_details.py:1357 msgid "Price List Currency not selected" msgstr "" @@ -39218,7 +39210,7 @@ msgstr "" msgid "Print Receipt on Order Complete" msgstr "" -#: erpnext/setup/install.py:114 +#: erpnext/setup/install.py:115 msgid "Print UOM after Quantity" msgstr "" @@ -39227,8 +39219,8 @@ msgstr "" msgid "Print Without Amount" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:123 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:202 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:127 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:207 msgid "Print and Stationery" msgstr "" @@ -39236,7 +39228,7 @@ msgstr "" msgid "Print settings updated in respective print format" msgstr "" -#: erpnext/setup/install.py:121 +#: erpnext/setup/install.py:122 msgid "Print taxes with zero amount" msgstr "" @@ -39339,10 +39331,6 @@ msgstr "" msgid "Procedure" msgstr "" -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:47 -msgid "Procedures dropped" -msgstr "" - #. Label of the process_deferred_accounting (Link) field in DocType 'Journal #. Entry' #. Name of a DocType @@ -39396,7 +39384,7 @@ msgstr "" msgid "Process Loss Qty" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:346 +#: erpnext/manufacturing/doctype/job_card/job_card.js:289 msgid "Process Loss Quantity" msgstr "" @@ -39477,6 +39465,10 @@ msgstr "" msgid "Process in Single Transaction" msgstr "" +#: erpnext/manufacturing/doctype/job_card/job_card.py:1461 +msgid "Process loss quantity cannot be negative." +msgstr "" + #. Label of the processed_boms (Long Text) field in DocType 'BOM Update Log' #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json msgid "Processed BOMs" @@ -39638,7 +39630,7 @@ msgstr "" #. Label of a Card Break in the Manufacturing Workspace #: erpnext/manufacturing/doctype/workstation/workstation.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json -#: erpnext/setup/doctype/company/company.py:474 +#: erpnext/setup/doctype/company/company.py:478 msgid "Production" msgstr "" @@ -39852,7 +39844,7 @@ msgstr "" msgid "Progress (%)" msgstr "" -#: erpnext/projects/doctype/project/project.py:374 +#: erpnext/projects/doctype/project/project.py:412 msgid "Project Collaboration Invitation" msgstr "" @@ -39896,7 +39888,7 @@ msgstr "" msgid "Project Summary" msgstr "" -#: erpnext/projects/doctype/project/project.py:673 +#: erpnext/projects/doctype/project/project.py:711 msgid "Project Summary for {0}" msgstr "" @@ -40027,7 +40019,7 @@ msgstr "" #. Label of a Card Break in the Projects Workspace #. Title of a Workspace Sidebar #: erpnext/config/projects.py:7 erpnext/desktop_icon/projects.json -#: erpnext/projects/doctype/project/project.py:451 +#: erpnext/projects/doctype/project/project.py:489 #: erpnext/projects/workspace/projects/projects.json #: erpnext/selling/doctype/customer/customer_dashboard.py:26 #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:28 @@ -40173,7 +40165,7 @@ msgid "Prospects Engaged But Not Converted" msgstr "" #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:198 -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:785 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:786 msgid "Protected DocType" msgstr "" @@ -40188,7 +40180,7 @@ msgstr "" msgid "Providing" msgstr "" -#: erpnext/setup/doctype/company/company.py:573 +#: erpnext/setup/doctype/company/company.py:577 msgid "Provisional Account" msgstr "" @@ -40260,7 +40252,7 @@ msgstr "" #: erpnext/accounts/doctype/tax_rule/tax_rule.json #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/projects/doctype/project/project_dashboard.py:16 -#: erpnext/setup/doctype/company/company.py:462 erpnext/setup/install.py:404 +#: erpnext/setup/doctype/company/company.py:466 erpnext/setup/install.py:436 #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/item_lead_time/item_lead_time.json #: erpnext/stock/doctype/item_reorder/item_reorder.json @@ -40584,7 +40576,7 @@ msgstr "" msgid "Purchase Order {0} is not submitted" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:930 msgid "Purchase Orders" msgstr "" @@ -40614,7 +40606,7 @@ msgstr "" msgid "Purchase Orders to Receive" msgstr "" -#: erpnext/controllers/accounts_controller.py:2016 +#: erpnext/controllers/accounts_controller.py:2017 msgid "Purchase Orders {0} are un-linked" msgstr "" @@ -40748,7 +40740,7 @@ msgstr "" #. Label of the purchase_tax_template (Link) field in DocType 'Tax Rule' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/tax_rule/tax_rule.json -#: erpnext/setup/doctype/company/company.js:145 +#: erpnext/setup/doctype/company/company.js:161 #: erpnext/workspace_sidebar/taxes.json msgid "Purchase Tax Template" msgstr "" @@ -40855,10 +40847,6 @@ msgstr "" msgid "Purpose" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:574 -msgid "Purpose must be one of {0}" -msgstr "" - #. Label of the purposes (Table) field in DocType 'Maintenance Visit' #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json msgid "Purposes" @@ -40914,6 +40902,7 @@ msgstr "" #. Label of the qty (Float) field in DocType 'Delivery Schedule Item' #. Label of the qty (Float) field in DocType 'Product Bundle Item' #. Label of the qty (Float) field in DocType 'Landed Cost Item' +#. Label of the qty (Float) field in DocType 'Landed Cost Taxes and Charges' #. Option for the 'Distribute Charges Based On' (Select) field in DocType #. 'Landed Cost Voucher' #. Label of the qty (Float) field in DocType 'Packed Item' @@ -40962,6 +40951,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1506 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:255 #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json +#: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json #: erpnext/stock/doctype/packed_item/packed_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json @@ -41070,11 +41060,11 @@ msgstr "" msgid "Qty To Manufacture" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1441 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1442 msgid "Qty To Manufacture ({0}) cannot be a fraction for the UOM {2}. To allow this, disable '{1}' in the UOM {2}." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:260 +#: erpnext/manufacturing/doctype/job_card/job_card.py:261 msgid "Qty To Manufacture in the job card cannot be greater than Qty To Manufacture in the work order for the operation {0}.

    Solution: Either you can reduce the Qty To Manufacture in the job card or set the 'Overproduction Percentage For Work Order' in the {1}." msgstr "" @@ -41125,8 +41115,8 @@ msgstr "" msgid "Qty for which recursion isn't applicable." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1063 -#: erpnext/manufacturing/doctype/work_order/work_order.js:1086 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1045 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1068 msgid "Qty for {0}" msgstr "" @@ -41181,8 +41171,8 @@ msgstr "" msgid "Qty to Fetch" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:318 -#: erpnext/manufacturing/doctype/job_card/job_card.py:890 +#: erpnext/manufacturing/doctype/job_card/job_card.js:247 +#: erpnext/manufacturing/doctype/job_card/job_card.py:893 msgid "Qty to Manufacture" msgstr "" @@ -41418,17 +41408,17 @@ msgstr "" msgid "Quality Inspection Template Name" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:799 +#: erpnext/manufacturing/doctype/job_card/job_card.py:800 msgid "Quality Inspection is required for the item {0} before completing the job card {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:810 -#: erpnext/manufacturing/doctype/job_card/job_card.py:819 +#: erpnext/manufacturing/doctype/job_card/job_card.py:811 +#: erpnext/manufacturing/doctype/job_card/job_card.py:820 msgid "Quality Inspection {0} is not submitted for the item: {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:829 -#: erpnext/manufacturing/doctype/job_card/job_card.py:838 +#: erpnext/manufacturing/doctype/job_card/job_card.py:830 +#: erpnext/manufacturing/doctype/job_card/job_card.py:839 msgid "Quality Inspection {0} is rejected for the item: {1}" msgstr "" @@ -41442,7 +41432,7 @@ msgstr "" msgid "Quality Inspections" msgstr "" -#: erpnext/setup/doctype/company/company.py:504 +#: erpnext/setup/doctype/company/company.py:508 msgid "Quality Management" msgstr "" @@ -41709,7 +41699,7 @@ msgstr "" msgid "Quantity must be less than or equal to {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1116 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1098 #: erpnext/stock/doctype/pick_list/pick_list.js:209 msgid "Quantity must not be more than {0}" msgstr "" @@ -41719,21 +41709,21 @@ msgid "Quantity required for Item {0} in row {1}" msgstr "" #: erpnext/manufacturing/doctype/bom/bom.py:724 -#: erpnext/manufacturing/doctype/job_card/job_card.js:399 -#: erpnext/manufacturing/doctype/job_card/job_card.js:469 +#: erpnext/manufacturing/doctype/job_card/job_card.js:342 +#: erpnext/manufacturing/doctype/job_card/job_card.js:410 #: erpnext/manufacturing/doctype/workstation/workstation.js:303 msgid "Quantity should be greater than 0" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:361 +#: erpnext/manufacturing/doctype/work_order/work_order.js:342 msgid "Quantity to Manufacture" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2646 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2644 msgid "Quantity to Manufacture can not be zero for the operation {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1433 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1434 msgid "Quantity to Manufacture must be greater than 0." msgstr "" @@ -41875,11 +41865,11 @@ msgstr "" msgid "Quotation Trends" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:489 +#: erpnext/selling/doctype/sales_order/sales_order.py:494 msgid "Quotation {0} is cancelled" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:402 +#: erpnext/selling/doctype/sales_order/sales_order.py:413 msgid "Quotation {0} not of type {1}" msgstr "" @@ -42186,7 +42176,7 @@ msgstr "" msgid "Rate at which this tax is applied" msgstr "" -#: erpnext/controllers/accounts_controller.py:3925 +#: erpnext/controllers/accounts_controller.py:3931 msgid "Rate of '{}' items cannot be changed" msgstr "" @@ -42352,7 +42342,7 @@ msgstr "" msgid "Raw Materials Consumption" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:320 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:60 msgid "Raw Materials Missing" msgstr "" @@ -42391,12 +42381,6 @@ msgstr "" msgid "Raw Materials to Customer" msgstr "" -#. Option for the 'Data Fetch Method' (Select) field in DocType 'Accounts -#. Settings' -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -msgid "Raw SQL" -msgstr "" - #. Description of the 'Validate consumed quantity (as per BOM)' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -42405,7 +42389,7 @@ msgstr "" #: erpnext/buying/doctype/purchase_order/purchase_order.js:345 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:124 -#: erpnext/manufacturing/doctype/work_order/work_order.js:785 +#: erpnext/manufacturing/doctype/work_order/work_order.js:767 #: erpnext/selling/doctype/sales_order/sales_order.js:1012 #: erpnext/selling/doctype/sales_order/sales_order_list.js:70 #: erpnext/stock/doctype/material_request/material_request.js:243 @@ -42586,7 +42570,7 @@ msgid "Receivable / Payable Account" msgstr "" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:79 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1212 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1135 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:241 #: erpnext/accounts/report/sales_register/sales_register.py:217 #: erpnext/accounts/report/sales_register/sales_register.py:271 @@ -43047,7 +43031,7 @@ msgstr "" msgid "Reference #{0} dated {1}" msgstr "" -#: erpnext/public/js/controllers/transaction.js:2789 +#: erpnext/public/js/controllers/transaction.js:2791 msgid "Reference Date for Early Payment Discount" msgstr "" @@ -43211,11 +43195,11 @@ msgstr "" msgid "References" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:403 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:404 msgid "References to Sales Invoices are Incomplete" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:395 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:396 msgid "References to Sales Orders are Incomplete" msgstr "" @@ -43377,7 +43361,7 @@ msgid "Remaining Amount" msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:189 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1289 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1212 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:180 msgid "Remaining Balance" msgstr "" @@ -43435,7 +43419,7 @@ msgstr "" #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:11 #: erpnext/accounts/report/accounts_payable/accounts_payable.html:135 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1244 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 #: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 @@ -43499,7 +43483,7 @@ msgstr "" msgid "Rename Log" msgstr "" -#: erpnext/accounts/doctype/account/account.py:558 +#: erpnext/accounts/doctype/account/account.py:559 msgid "Rename Not Allowed" msgstr "" @@ -43516,7 +43500,7 @@ msgstr "" msgid "Rename jobs for doctype {0} have not been enqueued." msgstr "" -#: erpnext/accounts/doctype/account/account.py:550 +#: erpnext/accounts/doctype/account/account.py:551 msgid "Renaming it is only allowed via parent company {0}, to avoid mismatch." msgstr "" @@ -43636,11 +43620,11 @@ msgstr "" msgid "Report Template" msgstr "" -#: erpnext/accounts/doctype/account/account.py:462 +#: erpnext/accounts/doctype/account/account.py:463 msgid "Report Type is mandatory" msgstr "" -#: erpnext/setup/install.py:216 +#: erpnext/setup/install.py:248 msgid "Report an Issue" msgstr "" @@ -43885,7 +43869,7 @@ msgstr "" #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:430 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:434 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:88 #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:70 @@ -44066,7 +44050,7 @@ msgstr "" msgid "Research" msgstr "" -#: erpnext/setup/doctype/company/company.py:510 +#: erpnext/setup/doctype/company/company.py:514 msgid "Research & Development" msgstr "" @@ -44111,7 +44095,7 @@ msgstr "" msgid "Reservation Based On" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:943 +#: erpnext/manufacturing/doctype/work_order/work_order.js:925 #: erpnext/selling/doctype/sales_order/sales_order.js:107 #: erpnext/stock/doctype/pick_list/pick_list.js:153 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:179 @@ -44155,7 +44139,7 @@ msgstr "" msgid "Reserved" msgstr "" -#: erpnext/controllers/stock_controller.py:1329 +#: erpnext/controllers/stock_controller.py:1330 msgid "Reserved Batch Conflict" msgstr "" @@ -44225,14 +44209,14 @@ msgstr "" msgid "Reserved Quantity for Production" msgstr "" -#: erpnext/stock/stock_ledger.py:2340 +#: erpnext/stock/stock_ledger.py:2306 msgid "Reserved Serial No." msgstr "" #. Label of the reserved_stock (Float) field in DocType 'Bin' #. Name of a report #: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:24 -#: erpnext/manufacturing/doctype/work_order/work_order.js:959 +#: erpnext/manufacturing/doctype/work_order/work_order.js:941 #: erpnext/public/js/stock_reservation.js:236 #: erpnext/selling/doctype/sales_order/sales_order.js:128 #: erpnext/selling/doctype/sales_order/sales_order.js:495 @@ -44241,13 +44225,13 @@ msgstr "" #: erpnext/stock/doctype/pick_list/pick_list.js:173 #: erpnext/stock/report/reserved_stock/reserved_stock.json #: erpnext/stock/report/stock_balance/stock_balance.py:576 -#: erpnext/stock/stock_ledger.py:2324 +#: erpnext/stock/stock_ledger.py:2290 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:204 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:332 msgid "Reserved Stock" msgstr "" -#: erpnext/stock/stock_ledger.py:2369 +#: erpnext/stock/stock_ledger.py:2335 msgid "Reserved Stock for Batch" msgstr "" @@ -44513,7 +44497,7 @@ msgstr "" msgid "Resume" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:247 +#: erpnext/manufacturing/doctype/job_card/job_card.js:659 msgid "Resume Job" msgstr "" @@ -44538,8 +44522,8 @@ msgstr "" msgid "Retain Sample" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:196 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:348 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:200 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:353 msgid "Retained Earnings" msgstr "" @@ -44614,7 +44598,7 @@ msgstr "" msgid "Return Against Subcontracting Receipt" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:302 +#: erpnext/manufacturing/doctype/work_order/work_order.js:283 msgid "Return Components" msgstr "" @@ -44748,8 +44732,8 @@ msgstr "" msgid "Revaluation Journals" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:197 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:353 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:201 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:358 msgid "Revaluation Surplus" msgstr "" @@ -44977,11 +44961,11 @@ msgstr "" msgid "Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity" msgstr "" -#: erpnext/accounts/doctype/account/account.py:459 +#: erpnext/accounts/doctype/account/account.py:460 msgid "Root Type is mandatory" msgstr "" -#: erpnext/accounts/doctype/account/account.py:215 +#: erpnext/accounts/doctype/account/account.py:216 msgid "Root cannot be edited." msgstr "" @@ -45000,8 +44984,8 @@ msgstr "" #. Option for the 'Account Type' (Select) field in DocType 'Account' #. Label of the round_off_section (Section Break) field in DocType 'Company' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:124 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:206 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:128 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:211 #: erpnext/accounts/report/account_balance/account_balance.js:56 #: erpnext/setup/doctype/company/company.json msgid "Round Off" @@ -45181,17 +45165,17 @@ msgstr "" msgid "Row # {0}: Returned Item {1} does not exist in {2} {3}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:279 +#: erpnext/manufacturing/doctype/work_order/work_order.py:280 msgid "Row #1: Sequence ID must be 1 for Operation {0}." msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:565 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2073 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2154 msgid "Row #{0} (Payment Table): Amount must be negative" msgstr "" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:563 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2068 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2149 msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "" @@ -45216,7 +45200,7 @@ msgstr "" msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:1294 +#: erpnext/controllers/accounts_controller.py:1295 msgid "Row #{0}: Account {1} does not belong to company {2}" msgstr "" @@ -45277,31 +45261,31 @@ msgstr "" msgid "Row #{0}: Cannot create entry with different taxable AND withholding document links." msgstr "" -#: erpnext/controllers/accounts_controller.py:3802 +#: erpnext/controllers/accounts_controller.py:3808 msgid "Row #{0}: Cannot delete item {1} which has already been billed." msgstr "" -#: erpnext/controllers/accounts_controller.py:3776 +#: erpnext/controllers/accounts_controller.py:3782 msgid "Row #{0}: Cannot delete item {1} which has already been delivered" msgstr "" -#: erpnext/controllers/accounts_controller.py:3795 +#: erpnext/controllers/accounts_controller.py:3801 msgid "Row #{0}: Cannot delete item {1} which has already been received" msgstr "" -#: erpnext/controllers/accounts_controller.py:3782 +#: erpnext/controllers/accounts_controller.py:3788 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it." msgstr "" -#: erpnext/controllers/accounts_controller.py:3788 +#: erpnext/controllers/accounts_controller.py:3794 msgid "Row #{0}: Cannot delete item {1} which is already ordered against this Sales Order." msgstr "" -#: erpnext/controllers/accounts_controller.py:3936 +#: erpnext/controllers/accounts_controller.py:3942 msgid "Row #{0}: Cannot set Rate if the billed amount is greater than the amount for Item {1}." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1128 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1136 msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}" msgstr "" @@ -45351,11 +45335,11 @@ msgstr "" msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times in the Subcontracting Inward process." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:356 +#: erpnext/manufacturing/doctype/work_order/work_order.py:357 msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:381 +#: erpnext/manufacturing/doctype/work_order/work_order.py:382 msgid "Row #{0}: Customer Provided Item {1} does not exist in the Required Items table linked to the Subcontracting Inward Order." msgstr "" @@ -45363,7 +45347,7 @@ msgstr "" msgid "Row #{0}: Customer Provided Item {1} exceeds quantity available through Subcontracting Inward Order" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:369 +#: erpnext/manufacturing/doctype/work_order/work_order.py:370 msgid "Row #{0}: Customer Provided Item {1} has insufficient quantity in the Subcontracting Inward Order. Available quantity is {2}." msgstr "" @@ -45419,7 +45403,7 @@ msgstr "" msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:530 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:395 msgid "Row #{0}: Finished Good must be {1}" msgstr "" @@ -45448,7 +45432,7 @@ msgstr "" msgid "Row #{0}: From Date cannot be before To Date" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:880 +#: erpnext/manufacturing/doctype/job_card/job_card.py:881 msgid "Row #{0}: From Time and To Time fields are required" msgstr "" @@ -45456,7 +45440,7 @@ msgstr "" msgid "Row #{0}: Item added" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:78 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "" @@ -45525,7 +45509,7 @@ msgstr "" msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:675 +#: erpnext/selling/doctype/sales_order/sales_order.py:678 msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists" msgstr "" @@ -45537,10 +45521,6 @@ msgstr "" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 -msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." -msgstr "" - #: erpnext/controllers/subcontracting_inward_controller.py:208 #: erpnext/controllers/subcontracting_inward_controller.py:342 msgid "Row #{0}: Overconsumption of Customer Provided Item {1} against Work Order {2} is not allowed in the Subcontracting Inward process." @@ -45566,7 +45546,7 @@ msgstr "" msgid "Row #{0}: Please set reorder quantity" msgstr "" -#: erpnext/controllers/accounts_controller.py:617 +#: erpnext/controllers/accounts_controller.py:618 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master" msgstr "" @@ -45588,15 +45568,15 @@ msgstr "" msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "" -#: erpnext/controllers/stock_controller.py:1466 +#: erpnext/controllers/stock_controller.py:1467 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1481 +#: erpnext/controllers/stock_controller.py:1482 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1496 +#: erpnext/controllers/stock_controller.py:1497 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "" @@ -45604,7 +45584,7 @@ msgstr "" msgid "Row #{0}: Quantity cannot be a non-positive number. Please increase the quantity or remove the Item {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:1457 +#: erpnext/controllers/accounts_controller.py:1458 msgid "Row #{0}: Quantity for Item {1} cannot be zero." msgstr "" @@ -45620,8 +45600,8 @@ msgstr "" msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0." msgstr "" -#: erpnext/controllers/accounts_controller.py:872 -#: erpnext/controllers/accounts_controller.py:884 +#: erpnext/controllers/accounts_controller.py:873 +#: erpnext/controllers/accounts_controller.py:885 #: erpnext/utilities/transaction_base.py:172 #: erpnext/utilities/transaction_base.py:178 msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" @@ -45671,7 +45651,7 @@ msgid "" "\t\t\t\t\tthis validation." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:285 +#: erpnext/manufacturing/doctype/work_order/work_order.py:286 msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "" @@ -45691,19 +45671,19 @@ msgstr "" msgid "Row #{0}: Serial No(s) {1} are not a part of the linked Subcontracting Inward Order. Please select valid Serial No(s)." msgstr "" -#: erpnext/controllers/accounts_controller.py:645 +#: erpnext/controllers/accounts_controller.py:646 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date" msgstr "" -#: erpnext/controllers/accounts_controller.py:639 +#: erpnext/controllers/accounts_controller.py:640 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date" msgstr "" -#: erpnext/controllers/accounts_controller.py:633 +#: erpnext/controllers/accounts_controller.py:634 msgid "Row #{0}: Service Start and End Date is required for deferred accounting" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:497 +#: erpnext/selling/doctype/sales_order/sales_order.py:502 msgid "Row #{0}: Set Supplier for item {1}" msgstr "" @@ -45715,19 +45695,19 @@ msgstr "" msgid "Row #{0}: Source Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:390 +#: erpnext/manufacturing/doctype/work_order/work_order.py:391 msgid "Row #{0}: Source Warehouse {1} for item {2} cannot be a customer warehouse." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:345 +#: erpnext/manufacturing/doctype/work_order/work_order.py:346 msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:40 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:62 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "" @@ -45743,6 +45723,10 @@ msgstr "" msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}" msgstr "" +#: erpnext/stock/doctype/delivery_note/delivery_note.py:485 +msgid "Row #{0}: Stock Delivered But Not Billed account cannot be used for items linked to a Sales Invoice" +msgstr "" + #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:403 msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}." msgstr "" @@ -45759,7 +45743,7 @@ msgstr "" msgid "Row #{0}: Stock is already reserved for the Item {1}." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:557 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:598 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}." msgstr "" @@ -45836,7 +45820,7 @@ msgstr "" msgid "Row #{0}: {1} of {2} should be {3}. Please update the {1} or select a different account." msgstr "" -#: erpnext/controllers/accounts_controller.py:4042 +#: erpnext/controllers/accounts_controller.py:4048 msgid "Row #{0}:Quantity for Item {1} cannot be zero." msgstr "" @@ -45945,7 +45929,7 @@ msgstr "" msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:747 +#: erpnext/manufacturing/doctype/job_card/job_card.py:748 msgid "Row {0} : Operation is required against the raw material item {1}" msgstr "" @@ -45953,7 +45937,7 @@ msgstr "" msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:94 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "" @@ -45985,11 +45969,11 @@ msgstr "" msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:691 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "" -#: erpnext/stock/doctype/material_request/material_request.py:862 +#: erpnext/stock/doctype/material_request/material_request.py:861 msgid "Row {0}: Bill of Materials not found for the Item {1}" msgstr "" @@ -46007,7 +45991,7 @@ msgstr "" msgid "Row {0}: Conversion Factor is mandatory" msgstr "" -#: erpnext/controllers/accounts_controller.py:3245 +#: erpnext/controllers/accounts_controller.py:3239 msgid "Row {0}: Cost Center {1} does not belong to Company {2}" msgstr "" @@ -46027,7 +46011,7 @@ msgstr "" msgid "Row {0}: Debit entry can not be linked with a {1}" msgstr "" -#: erpnext/controllers/selling_controller.py:879 +#: erpnext/controllers/selling_controller.py:880 msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same" msgstr "" @@ -46035,7 +46019,7 @@ msgstr "" msgid "Row {0}: Delivery Warehouse cannot be same as Customer Warehouse for Item {1}." msgstr "" -#: erpnext/controllers/accounts_controller.py:2736 +#: erpnext/controllers/accounts_controller.py:2737 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date" msgstr "" @@ -46080,16 +46064,16 @@ msgstr "" msgid "Row {0}: From Time and To Time is mandatory." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:325 +#: erpnext/manufacturing/doctype/job_card/job_card.py:326 #: erpnext/projects/doctype/timesheet/timesheet.py:225 msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "" -#: erpnext/controllers/stock_controller.py:1562 +#: erpnext/controllers/stock_controller.py:1563 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:316 +#: erpnext/manufacturing/doctype/job_card/job_card.py:317 msgid "Row {0}: From time must be less than to time" msgstr "" @@ -46105,7 +46089,7 @@ msgstr "" msgid "Row {0}: Item Tax template updated as per validity and rate applied" msgstr "" -#: erpnext/controllers/selling_controller.py:644 +#: erpnext/controllers/selling_controller.py:645 msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer" msgstr "" @@ -46129,7 +46113,7 @@ msgstr "" msgid "Row {0}: Operation time should be greater than 0 for operation {1}" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:614 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:655 msgid "Row {0}: Packed Qty must be equal to {1} Qty." msgstr "" @@ -46197,7 +46181,7 @@ msgstr "" msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:621 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:195 msgid "Row {0}: Qty in Stock UOM can not be zero." msgstr "" @@ -46209,10 +46193,6 @@ msgstr "" msgid "Row {0}: Quantity cannot be negative." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 -msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" -msgstr "" - #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:886 msgid "Row {0}: Sales Invoice {1} is already created for {2}" msgstr "" @@ -46221,11 +46201,11 @@ msgstr "" msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:105 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1553 +#: erpnext/controllers/stock_controller.py:1554 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "" @@ -46237,11 +46217,11 @@ msgstr "" msgid "Row {0}: The entire expense amount for account {1} in {2} has already been allocated." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:667 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:108 msgid "Row {0}: The item {1}, quantity must be positive number" msgstr "" -#: erpnext/controllers/accounts_controller.py:3222 +#: erpnext/controllers/accounts_controller.py:3216 msgid "Row {0}: The {3} Account {1} does not belong to the company {2}" msgstr "" @@ -46249,11 +46229,11 @@ msgstr "" msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:348 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:615 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:189 msgid "Row {0}: UOM Conversion Factor is mandatory" msgstr "" @@ -46266,11 +46246,11 @@ msgid "Row {0}: Warehouse {1} is linked to company {2}. Please select a warehous msgstr "" #: erpnext/manufacturing/doctype/bom/bom.py:1248 -#: erpnext/manufacturing/doctype/work_order/work_order.py:419 +#: erpnext/manufacturing/doctype/work_order/work_order.py:420 msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:1176 +#: erpnext/controllers/accounts_controller.py:1177 msgid "Row {0}: user has not applied the rule {1} on the item {2}" msgstr "" @@ -46282,7 +46262,7 @@ msgstr "" msgid "Row {0}: {1} must be greater than 0" msgstr "" -#: erpnext/controllers/accounts_controller.py:782 +#: erpnext/controllers/accounts_controller.py:783 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}" msgstr "" @@ -46328,7 +46308,7 @@ msgstr "" msgid "Rows with Same Account heads will be merged on Ledger" msgstr "" -#: erpnext/controllers/accounts_controller.py:2747 +#: erpnext/controllers/accounts_controller.py:2748 msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "" @@ -46336,7 +46316,7 @@ msgstr "" msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "" -#: erpnext/controllers/accounts_controller.py:283 +#: erpnext/controllers/accounts_controller.py:284 msgid "Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry." msgstr "" @@ -46543,8 +46523,8 @@ msgstr "" #. Label of the salary_information (Tab Break) field in DocType 'Employee' #. Label of the salary (Currency) field in DocType 'Employee External Work #. History' -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:125 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:211 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:129 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:216 #: erpnext/setup/doctype/employee/employee.json #: erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json msgid "Salary" @@ -46566,8 +46546,8 @@ msgstr "" #. Option for the 'Order Type' (Select) field in DocType 'Quotation' #. Option for the 'Order Type' (Select) field in DocType 'Sales Order' #. Label of the sales_details (Tab Break) field in DocType 'Item' -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:142 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:238 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:146 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:243 #: erpnext/accounts/doctype/item_tax_template/item_tax_template_dashboard.py:9 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json #: erpnext/accounts/doctype/payment_term/payment_term_dashboard.py:8 @@ -46581,18 +46561,18 @@ msgstr "" #: erpnext/regional/report/vat_audit_report/vat_audit_report.py:143 #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/setup/doctype/company/company.py:456 -#: erpnext/setup/doctype/company/company.py:648 +#: erpnext/setup/doctype/company/company.py:460 +#: erpnext/setup/doctype/company/company.py:653 #: erpnext/setup/doctype/company/company_dashboard.py:9 #: erpnext/setup/doctype/sales_person/sales_person_dashboard.py:12 -#: erpnext/setup/install.py:399 +#: erpnext/setup/install.py:431 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:297 #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/pick_list/pick_list_dashboard.py:16 msgid "Sales" msgstr "" -#: erpnext/setup/doctype/company/company.py:648 +#: erpnext/setup/doctype/company/company.py:653 msgid "Sales Account" msgstr "" @@ -46616,8 +46596,8 @@ msgstr "" msgid "Sales Defaults" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:126 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:212 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:130 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:217 msgid "Sales Expenses" msgstr "" @@ -46786,11 +46766,11 @@ msgstr "" msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:634 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:675 msgid "Sales Invoice {0} has already been submitted" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:593 +#: erpnext/selling/doctype/sales_order/sales_order.py:597 msgid "Sales Invoice {0} must be deleted before cancelling this Sales Order" msgstr "" @@ -46992,8 +46972,8 @@ msgstr "" msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1921 -#: erpnext/selling/doctype/sales_order/sales_order.py:1934 +#: erpnext/selling/doctype/sales_order/sales_order.py:1943 +#: erpnext/selling/doctype/sales_order/sales_order.py:1956 msgid "Sales Order {0} is not available for production" msgstr "" @@ -47001,12 +46981,12 @@ msgstr "" msgid "Sales Order {0} is not submitted" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:495 +#: erpnext/manufacturing/doctype/work_order/work_order.py:496 msgid "Sales Order {0} is not valid" msgstr "" #: erpnext/controllers/selling_controller.py:476 -#: erpnext/manufacturing/doctype/work_order/work_order.py:500 +#: erpnext/manufacturing/doctype/work_order/work_order.py:501 msgid "Sales Order {0} is {1}" msgstr "" @@ -47062,7 +47042,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:130 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1310 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1233 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:114 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:196 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:74 @@ -47168,7 +47148,7 @@ msgstr "" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:158 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:136 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1307 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1230 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:120 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:193 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:80 @@ -47261,7 +47241,7 @@ msgstr "" msgid "Sales Representative" msgstr "" -#: erpnext/accounts/report/gross_profit/gross_profit.py:997 +#: erpnext/accounts/report/gross_profit/gross_profit.py:989 #: erpnext/stock/doctype/delivery_note/delivery_note.js:270 msgid "Sales Return" msgstr "" @@ -47285,7 +47265,7 @@ msgstr "" #. Label of the sales_tax_template (Link) field in DocType 'Tax Rule' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/tax_rule/tax_rule.json -#: erpnext/setup/doctype/company/company.js:133 +#: erpnext/setup/doctype/company/company.js:149 #: erpnext/workspace_sidebar/taxes.json msgid "Sales Tax Template" msgstr "" @@ -47436,12 +47416,12 @@ msgstr "" #. Label of the sample_size (Float) field in DocType 'Quality Inspection' #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93 -#: erpnext/public/js/controllers/transaction.js:2846 +#: erpnext/public/js/controllers/transaction.js:2848 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json msgid "Sample Size" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:1021 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "" @@ -47803,8 +47783,8 @@ msgstr "" msgid "Secretary" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:177 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:301 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:181 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:306 msgid "Secured Loans" msgstr "" @@ -47842,7 +47822,7 @@ msgstr "" msgid "Select Alternative Items for Sales Order" msgstr "" -#: erpnext/stock/doctype/item/item.js:820 +#: erpnext/stock/doctype/item/item.js:807 msgid "Select Attribute Values" msgstr "" @@ -47884,7 +47864,7 @@ msgstr "" msgid "Select Company Address" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:547 +#: erpnext/manufacturing/doctype/job_card/job_card.js:477 msgid "Select Corrective Operation" msgstr "" @@ -47920,7 +47900,7 @@ msgstr "" msgid "Select Dispatch Address " msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:229 +#: erpnext/manufacturing/doctype/job_card/job_card.js:702 msgid "Select Employees" msgstr "" @@ -47945,7 +47925,7 @@ msgstr "" msgid "Select Items based on Delivery Date" msgstr "" -#: erpnext/public/js/controllers/transaction.js:2885 +#: erpnext/public/js/controllers/transaction.js:2887 msgid "Select Items for Quality Inspection" msgstr "" @@ -47983,7 +47963,7 @@ msgstr "" msgid "Select Possible Supplier" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1122 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1104 #: erpnext/stock/doctype/pick_list/pick_list.js:219 msgid "Select Quantity" msgstr "" @@ -48081,7 +48061,7 @@ msgstr "" msgid "Select all" msgstr "" -#: erpnext/stock/doctype/item/item.js:1153 +#: erpnext/stock/doctype/item/item.js:1140 msgid "Select an Item Group." msgstr "" @@ -48097,7 +48077,7 @@ msgstr "" msgid "Select an item from each set to be used in the Sales Order." msgstr "" -#: erpnext/stock/doctype/item/item.js:834 +#: erpnext/stock/doctype/item/item.js:821 msgid "Select at least one value from each of the attributes." msgstr "" @@ -48115,7 +48095,7 @@ msgstr "" msgid "Select date" msgstr "" -#: erpnext/controllers/accounts_controller.py:2995 +#: erpnext/controllers/accounts_controller.py:2989 msgid "Select finance book for the item {0} at row {1}" msgstr "" @@ -48147,7 +48127,7 @@ msgstr "" msgid "Select the Default Workstation where the Operation will be performed. This will be fetched in BOMs and Work Orders." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1224 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1206 msgid "Select the Item to be manufactured." msgstr "" @@ -48164,7 +48144,7 @@ msgstr "" msgid "Select the customer or supplier." msgstr "" -#: erpnext/assets/doctype/asset/asset.js:929 +#: erpnext/assets/doctype/asset/asset.js:931 msgid "Select the date" msgstr "" @@ -48200,7 +48180,7 @@ msgstr "" msgid "Selected POS Opening Entry should be open." msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2569 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2650 msgid "Selected Price List should have buying and selling fields checked." msgstr "" @@ -48231,22 +48211,22 @@ msgstr "" msgid "Self delivery" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:640 +#: erpnext/assets/doctype/asset/asset.js:642 #: erpnext/stock/doctype/batch/batch_dashboard.py:9 #: erpnext/stock/doctype/item/item_dashboard.py:20 msgid "Sell" msgstr "" #: erpnext/assets/doctype/asset/asset.js:171 -#: erpnext/assets/doctype/asset/asset.js:629 +#: erpnext/assets/doctype/asset/asset.js:631 msgid "Sell Asset" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:634 +#: erpnext/assets/doctype/asset/asset.js:636 msgid "Sell Qty" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:650 +#: erpnext/assets/doctype/asset/asset.js:652 msgid "Sell quantity cannot exceed the asset quantity" msgstr "" @@ -48254,7 +48234,7 @@ msgstr "" msgid "Sell quantity cannot exceed the asset quantity. Asset {0} has only {1} item(s)." msgstr "" -#: erpnext/assets/doctype/asset/asset.js:646 +#: erpnext/assets/doctype/asset/asset.js:648 msgid "Sell quantity must be greater than zero" msgstr "" @@ -48507,7 +48487,7 @@ msgstr "" #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:74 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:114 -#: erpnext/public/js/controllers/transaction.js:2859 +#: erpnext/public/js/controllers/transaction.js:2861 #: erpnext/public/js/utils/serial_no_batch_selector.js:433 #: erpnext/selling/doctype/installation_note_item/installation_note_item.json #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -48712,7 +48692,7 @@ msgstr "" msgid "Serial Nos are created successfully" msgstr "" -#: erpnext/stock/stock_ledger.py:2330 +#: erpnext/stock/stock_ledger.py:2296 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding." msgstr "" @@ -49196,7 +49176,7 @@ msgstr "" #. Label of the set_basic_rate_manually (Check) field in DocType 'Stock Entry #. Detail' -#: erpnext/stock/doctype/stock_entry/stock_entry.py:300 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:706 #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "Set Basic Rate Manually" msgstr "" @@ -49215,8 +49195,8 @@ msgstr "" msgid "Set Dropship Items Delivered Quantity" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:418 -#: erpnext/manufacturing/doctype/job_card/job_card.js:487 +#: erpnext/manufacturing/doctype/job_card/job_card.js:363 +#: erpnext/manufacturing/doctype/job_card/job_card.js:425 msgid "Set Finished Good Quantity" msgstr "" @@ -49383,11 +49363,11 @@ msgstr "" msgid "Set closing balance as per bank statement" msgstr "" -#: erpnext/setup/doctype/company/company.py:546 +#: erpnext/setup/doctype/company/company.py:550 msgid "Set default inventory account for perpetual inventory" msgstr "" -#: erpnext/setup/doctype/company/company.py:572 +#: erpnext/setup/doctype/company/company.py:576 msgid "Set default {0} account for non stock items" msgstr "" @@ -49419,7 +49399,7 @@ msgstr "" msgid "Set targets Item Group-wise for this Sales Person." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1281 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1263 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)" msgstr "" @@ -49530,7 +49510,7 @@ msgid "Setting up company" msgstr "" #: erpnext/manufacturing/doctype/bom/bom.py:1227 -#: erpnext/manufacturing/doctype/work_order/work_order.py:1497 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1498 msgid "Setting {0} is required" msgstr "" @@ -49550,6 +49530,10 @@ msgstr "" msgid "Settled" msgstr "" +#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:33 +msgid "Settled with Credit Note" +msgstr "" + #. Title of an Onboarding Step #. Label of an action in the Onboarding Step 'Setup Company' #: erpnext/setup/onboarding_step/setup_company/setup_company.json @@ -49742,7 +49726,7 @@ msgstr "" msgid "Shipment details" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:805 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:846 msgid "Shipments" msgstr "" @@ -49780,7 +49764,7 @@ msgstr "" msgid "Shipping Address Template" msgstr "" -#: erpnext/controllers/accounts_controller.py:576 +#: erpnext/controllers/accounts_controller.py:577 msgid "Shipping Address does not belong to the {0}" msgstr "" @@ -49923,8 +49907,8 @@ msgstr "" msgid "Short-term Investments" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:175 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:296 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:179 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:301 msgid "Short-term Provisions" msgstr "" @@ -50257,7 +50241,7 @@ msgstr "" msgid "Since there are active depreciable assets under this category, the following accounts are required.

    " msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:745 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:504 msgid "Since there is a process loss of {0} units for the finished good {1}, you should reduce the quantity by {0} units for the finished good {1} in the Items Table." msgstr "" @@ -50302,7 +50286,7 @@ msgstr "" #. Label of the skip_material_transfer (Check) field in DocType 'Work Order #. Operation' -#: erpnext/manufacturing/doctype/work_order/work_order.js:380 +#: erpnext/manufacturing/doctype/work_order/work_order.js:361 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/doctype/workstation/workstation.js:454 msgid "Skip Material Transfer" @@ -50344,8 +50328,8 @@ msgstr "" msgid "Soap & Detergent" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:62 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:107 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:66 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:112 #: erpnext/setup/setup_wizard/data/industry_type.txt:45 msgid "Software" msgstr "" @@ -50369,7 +50353,7 @@ msgstr "" msgid "Solvency Ratios" msgstr "" -#: erpnext/controllers/accounts_controller.py:4391 +#: erpnext/controllers/accounts_controller.py:4379 msgid "Some required Company details are missing. You don't have permission to update them. Please contact your System Manager." msgstr "" @@ -50433,7 +50417,7 @@ msgstr "" msgid "Source Location" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1032 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1014 msgid "Source Manufacture Entry" msgstr "" @@ -50442,11 +50426,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:524 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:84 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50504,7 +50488,12 @@ msgstr "" msgid "Source Warehouse is mandatory for the Item {0}." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:304 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py:38 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:23 +msgid "Source Warehouse is required for item {0}" +msgstr "" + +#: erpnext/manufacturing/doctype/work_order/work_order.py:305 msgid "Source Warehouse {0} must be same as Customer Warehouse {1} in the Subcontracting Inward Order." msgstr "" @@ -50512,23 +50501,22 @@ msgstr "" msgid "Source and Target Location cannot be same" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 -msgid "Source and target warehouse cannot be same for row {0}" -msgstr "" - #: erpnext/stock/dashboard/item_dashboard.js:295 msgid "Source and target warehouse must be different" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:152 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:254 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:156 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:259 msgid "Source of Funds (Liabilities)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 -msgid "Source warehouse is mandatory for row {0}" +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:28 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:44 +msgid "Source or Target Warehouse is required for item {0}" +msgstr "" + +#: erpnext/selling/doctype/sales_order/sales_order.py:465 +msgid "Source warehouse required for stock item {0}" msgstr "" #. Label of the sourced_by_supplier (Check) field in DocType 'BOM Creator Item' @@ -50570,7 +50558,7 @@ msgstr "" msgid "Spent" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:690 +#: erpnext/assets/doctype/asset/asset.js:692 #: erpnext/stock/doctype/batch/batch.js:104 #: erpnext/stock/doctype/batch/batch.js:185 #: erpnext/support/doctype/issue/issue.js:114 @@ -50578,7 +50566,7 @@ msgid "Split" msgstr "" #: erpnext/assets/doctype/asset/asset.js:147 -#: erpnext/assets/doctype/asset/asset.js:674 +#: erpnext/assets/doctype/asset/asset.js:676 msgid "Split Asset" msgstr "" @@ -50602,7 +50590,7 @@ msgstr "" msgid "Split Issue" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:680 +#: erpnext/assets/doctype/asset/asset.js:682 msgid "Split Qty" msgstr "" @@ -50686,7 +50674,7 @@ msgstr "" msgid "Standard Description" msgstr "" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:115 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:127 msgid "Standard Rated Expenses" msgstr "" @@ -50713,8 +50701,8 @@ msgstr "" msgid "Standard Terms and Conditions that can be added to Sales and Purchases. Examples: Validity of the offer, Payment Terms, Safety and Usage, etc." msgstr "" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:96 -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:102 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:108 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:114 msgid "Standard rated supplies in {0}" msgstr "" @@ -50749,7 +50737,7 @@ msgstr "" msgid "Start Date should be lower than End Date" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:223 +#: erpnext/manufacturing/doctype/job_card/job_card.js:658 #: erpnext/manufacturing/doctype/workstation/workstation.js:124 msgid "Start Job" msgstr "" @@ -50878,7 +50866,7 @@ msgstr "" msgid "Status and Reference" msgstr "" -#: erpnext/projects/doctype/project/project.py:716 +#: erpnext/projects/doctype/project/project.py:754 msgid "Status must be Cancelled or Completed" msgstr "" @@ -50916,8 +50904,8 @@ msgstr "" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:96 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:158 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:100 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:163 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1362 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1388 #: erpnext/accounts/report/account_balance/account_balance.js:58 @@ -51017,6 +51005,16 @@ msgstr "" msgid "Stock Closing Log" msgstr "" +#. Option for the 'Account Type' (Select) field in DocType 'Account' +#. Label of the stock_delivered_but_not_billed (Link) field in DocType +#. 'Company' +#: erpnext/accounts/doctype/account/account.json +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:38 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:65 +#: erpnext/setup/doctype/company/company.json +msgid "Stock Delivered But Not Billed" +msgstr "" + #. Label of the warehouse_and_reference (Section Break) field in DocType 'POS #. Invoice Item' #. Label of the warehouse_and_reference (Section Break) field in DocType 'Sales @@ -51026,10 +51024,6 @@ msgstr "" msgid "Stock Details" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 -msgid "Stock Entries already created for Work Order {0}: {1}" -msgstr "" - #. Label of the stock_entry (Link) field in DocType 'Journal Entry' #. Label of a Link in the Manufacturing Workspace #. Option for the 'Receipt Document Type' (Select) field in DocType 'Landed @@ -51093,7 +51087,7 @@ msgstr "" msgid "Stock Entry {0} created" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1527 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1544 msgid "Stock Entry {0} has created" msgstr "" @@ -51101,8 +51095,8 @@ msgstr "" msgid "Stock Entry {0} is not submitted" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:83 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:142 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:87 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:147 msgid "Stock Expenses" msgstr "" @@ -51180,8 +51174,8 @@ msgstr "" msgid "Stock Levels HTML" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:160 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:273 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:164 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:278 msgid "Stock Liabilities" msgstr "" @@ -51284,8 +51278,8 @@ msgstr "" #. Option for the 'Account Type' (Select) field in DocType 'Account' #. Label of the stock_received_but_not_billed (Link) field in DocType 'Company' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:161 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:274 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:165 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:279 #: erpnext/accounts/report/account_balance/account_balance.js:59 #: erpnext/setup/doctype/company/company.json msgid "Stock Received But Not Billed" @@ -51334,9 +51328,9 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan/production_plan.js:289 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:297 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:303 -#: erpnext/manufacturing/doctype/work_order/work_order.js:945 -#: erpnext/manufacturing/doctype/work_order/work_order.js:954 -#: erpnext/manufacturing/doctype/work_order/work_order.js:961 +#: erpnext/manufacturing/doctype/work_order/work_order.js:927 +#: erpnext/manufacturing/doctype/work_order/work_order.js:936 +#: erpnext/manufacturing/doctype/work_order/work_order.js:943 #: erpnext/manufacturing/doctype/work_order/work_order_dashboard.py:14 #: erpnext/public/js/stock_reservation.js:12 #: erpnext/selling/doctype/sales_order/sales_order.js:109 @@ -51372,10 +51366,10 @@ msgstr "" msgid "Stock Reservation Entries Cancelled" msgstr "" -#: erpnext/controllers/subcontracting_inward_controller.py:1021 -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 -#: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:874 +#: erpnext/controllers/subcontracting_inward_controller.py:1029 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2261 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2150 +#: erpnext/selling/doctype/sales_order/sales_order.py:887 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "" @@ -51403,7 +51397,7 @@ msgstr "" msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:567 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:608 msgid "Stock Reservation Warehouse Mismatch" msgstr "" @@ -51443,7 +51437,7 @@ msgstr "" #: erpnext/selling/doctype/selling_settings/selling_settings.py:115 #: erpnext/setup/doctype/company/company.json #: erpnext/setup/workspace/erpnext_settings/erpnext_settings.json -#: erpnext/stock/doctype/item/item.js:420 +#: erpnext/stock/doctype/item/item.js:413 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:681 #: erpnext/stock/doctype/stock_settings/stock_settings.json #: erpnext/stock/workspace/stock/stock.json @@ -51750,11 +51744,11 @@ msgstr "" msgid "Stop Reason" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1105 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1106 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel" msgstr "" -#: erpnext/setup/doctype/company/company.py:383 +#: erpnext/setup/doctype/company/company.py:387 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 #: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 @@ -51815,7 +51809,7 @@ msgstr "" #. Label of the operation (Link) field in DocType 'Job Card Time Log' #. Name of a DocType -#: erpnext/manufacturing/doctype/job_card/job_card.js:363 +#: erpnext/manufacturing/doctype/job_card/job_card.js:310 #: erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json #: erpnext/manufacturing/doctype/sub_operation/sub_operation.json msgid "Sub Operation" @@ -52077,7 +52071,7 @@ msgstr "" msgid "Subcontracting Order Supplied Item" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:973 msgid "Subcontracting Order {0} created." msgstr "" @@ -52166,7 +52160,7 @@ msgstr "" msgid "Subdivision" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:969 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "" @@ -52187,7 +52181,7 @@ msgstr "" msgid "Submit Journal Entries" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:192 +#: erpnext/manufacturing/doctype/work_order/work_order.js:173 msgid "Submit this Work Order for further processing." msgstr "" @@ -52632,7 +52626,7 @@ msgstr "" #: erpnext/accounts/doctype/tax_rule/tax_rule.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:119 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:102 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1314 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1237 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:200 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:178 #: erpnext/accounts/report/purchase_register/purchase_register.js:27 @@ -52731,7 +52725,7 @@ msgstr "" #. Label of the supplier_name (Data) field in DocType 'Purchase Receipt' #. Label of the supplier_name (Data) field in DocType 'Stock Entry' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1229 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1152 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:157 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:196 #: erpnext/accounts/report/purchase_register/purchase_register.py:177 @@ -52819,7 +52813,7 @@ msgstr "" #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:40 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json -#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:235 +#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:240 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:60 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:256 #: erpnext/buying/workspace/buying/buying.json @@ -52848,7 +52842,7 @@ msgstr "" msgid "Supplier Quotation Item" msgstr "" -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:506 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:510 msgid "Supplier Quotation {0} Created" msgstr "" @@ -52937,7 +52931,7 @@ msgstr "" #. Label of the supplier_warehouse (Link) field in DocType 'Purchase Receipt' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/buying/doctype/purchase_order/purchase_order.json -#: erpnext/manufacturing/doctype/job_card/job_card.js:97 +#: erpnext/manufacturing/doctype/job_card/job_card.js:91 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json msgid "Supplier Warehouse" msgstr "" @@ -52964,7 +52958,7 @@ msgstr "" msgid "Supplier of Goods or Services." msgstr "" -#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:188 +#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:190 msgid "Supplier {0} not found in {1}" msgstr "" @@ -52977,8 +52971,8 @@ msgstr "" msgid "Suppliers" msgstr "" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:60 -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:122 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:72 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:134 msgid "Supplies subject to the reverse charge provision" msgstr "" @@ -53069,7 +53063,7 @@ msgstr "" msgid "Synchronize all accounts every hour" msgstr "" -#: erpnext/accounts/doctype/account/account.py:663 +#: erpnext/accounts/doctype/account/account.py:664 msgid "System In Use" msgstr "" @@ -53100,7 +53094,7 @@ msgstr "" msgid "System will fetch all the entries if limit value is zero." msgstr "" -#: erpnext/controllers/accounts_controller.py:2229 +#: erpnext/controllers/accounts_controller.py:2230 msgid "System will not check over billing since amount for Item {0} in {1} is zero" msgstr "" @@ -53121,7 +53115,7 @@ msgstr "" msgid "TDS Deducted" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:287 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:292 msgid "TDS Payable" msgstr "" @@ -53272,7 +53266,7 @@ msgstr "" msgid "Target Warehouse Address Link" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:249 +#: erpnext/manufacturing/doctype/work_order/work_order.py:250 msgid "Target Warehouse Reservation Error" msgstr "" @@ -53280,24 +53274,23 @@ msgstr "" msgid "Target Warehouse for Finished Good must be same as Finished Good Warehouse {1} in Work Order {2} linked to the Subcontracting Inward Order." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:793 +#: erpnext/manufacturing/doctype/work_order/work_order.py:794 msgid "Target Warehouse is required before Submit" msgstr "" -#: erpnext/controllers/selling_controller.py:885 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py:25 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:21 +msgid "Target Warehouse is required for item {0}" +msgstr "" + +#: erpnext/controllers/selling_controller.py:886 msgid "Target Warehouse is set for some items but the customer is not an internal customer." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:320 +#: erpnext/manufacturing/doctype/work_order/work_order.py:321 msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcontracting Inward Order Item." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 -msgid "Target warehouse is mandatory for row {0}" -msgstr "" - #. Label of the targets (Table) field in DocType 'Sales Partner' #. Label of the targets (Table) field in DocType 'Sales Person' #. Label of the targets (Table) field in DocType 'Territory' @@ -53414,8 +53407,8 @@ msgstr "" msgid "Tax Amount will be rounded on a row(items) level" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:41 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:69 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:45 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:74 #: erpnext/setup/setup_wizard/operations/taxes_setup.py:256 msgid "Tax Assets" msgstr "" @@ -53447,7 +53440,6 @@ msgstr "" msgid "Tax Breakup" msgstr "" -#. Label of the tax_category (Link) field in DocType 'Address' #. Label of the tax_category (Link) field in DocType 'POS Invoice' #. Label of the tax_category (Link) field in DocType 'POS Profile' #. Label of the tax_category (Link) field in DocType 'Purchase Invoice' @@ -53469,7 +53461,6 @@ msgstr "" #. Label of the tax_category (Link) field in DocType 'Item Tax' #. Label of the tax_category (Link) field in DocType 'Purchase Receipt' #. Label of a Workspace Sidebar Item -#: erpnext/accounts/custom/address.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/pos_profile/pos_profile.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -53485,6 +53476,7 @@ msgstr "" #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.json +#: erpnext/setup/install.py:154 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/item_tax/item_tax.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -53496,8 +53488,8 @@ msgstr "" msgid "Tax Category has been changed to \"Total\" because all the Items are non-stock items" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:136 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:230 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:140 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:235 msgid "Tax Expense" msgstr "" @@ -53571,7 +53563,7 @@ msgstr "" msgid "Tax Rates" msgstr "" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:52 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:64 msgid "Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme" msgstr "" @@ -53589,7 +53581,7 @@ msgstr "" msgid "Tax Rule" msgstr "" -#: erpnext/accounts/doctype/tax_rule/tax_rule.py:137 +#: erpnext/accounts/doctype/tax_rule/tax_rule.py:138 msgid "Tax Rule Conflicts with {0}" msgstr "" @@ -53604,7 +53596,7 @@ msgstr "" msgid "Tax Template" msgstr "" -#: erpnext/accounts/doctype/tax_rule/tax_rule.py:85 +#: erpnext/accounts/doctype/tax_rule/tax_rule.py:86 msgid "Tax Template is mandatory." msgstr "" @@ -53957,8 +53949,8 @@ msgstr "" msgid "Telecommunications" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:127 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:213 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:131 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:218 msgid "Telephone Expenses" msgstr "" @@ -54009,13 +54001,13 @@ msgstr "" msgid "Temporary" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:73 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:129 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:77 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:134 msgid "Temporary Accounts" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:74 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:130 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:78 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:135 msgid "Temporary Opening" msgstr "" @@ -54197,7 +54189,7 @@ msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/doctype/territory_item/territory_item.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:142 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1298 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1221 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:108 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:184 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68 @@ -54296,7 +54288,7 @@ msgstr "" msgid "The 'From Package No.' field must neither be empty nor it's value less than 1." msgstr "" -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:415 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:419 msgid "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings." msgstr "" @@ -54349,7 +54341,8 @@ msgstr "" msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1428 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:119 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "" @@ -54365,7 +54358,7 @@ msgstr "" msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:934 msgid "The Serial and Batch Bundle {0} is not valid for this transaction. The 'Type of Transaction' should be 'Outward' instead of 'Inward' in Serial and Batch Bundle {0}" msgstr "" @@ -54401,7 +54394,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1318 +#: erpnext/controllers/stock_controller.py:1319 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "" @@ -54409,7 +54402,11 @@ msgstr "" msgid "The company {0} is not in South Africa. VAT Audit Report is only available for companies in South Africa." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1320 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:21 +msgid "The company {0} is not in United Arab Emirates. UAE VAT 201 report is only available for companies in United Arab Emirates." +msgstr "" + +#: erpnext/manufacturing/doctype/job_card/job_card.py:1328 msgid "The completed quantity {0} of an operation {1} cannot be greater than the completed quantity {2} of a previous operation {3}." msgstr "" @@ -54429,7 +54426,7 @@ msgstr "" msgid "The date of the transaction" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1229 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1211 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM." msgstr "" @@ -54462,7 +54459,7 @@ msgstr "" msgid "The field To Shareholder cannot be blank" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:417 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:418 msgid "The field {0} in row {1} is not set" msgstr "" @@ -54503,7 +54500,7 @@ msgstr "" msgid "The following batches are expired, please restock them:
    {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:427 +#: erpnext/controllers/accounts_controller.py:428 msgid "The following cancelled repost entries exist for {0}:

    {1}

    Kindly delete these entries before continuing." msgstr "" @@ -54529,7 +54526,7 @@ msgstr "" msgid "The following rows are duplicates:" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.py:872 +#: erpnext/stock/doctype/material_request/material_request.py:871 msgid "The following {0} were created: {1}" msgstr "" @@ -54614,7 +54611,7 @@ msgstr "" msgid "The original invoice should be consolidated before or along with the return invoice." msgstr "" -#: erpnext/controllers/accounts_controller.py:205 +#: erpnext/controllers/accounts_controller.py:206 msgid "The outstanding amount {0} in {1} is lesser than {2}. Updating the outstanding to this invoice." msgstr "" @@ -54667,7 +54664,7 @@ msgstr "" msgid "The reserved stock will be released. Are you certain you wish to proceed?" msgstr "" -#: erpnext/accounts/doctype/account/account.py:218 +#: erpnext/accounts/doctype/account/account.py:219 msgid "The root account {0} must be a group" msgstr "" @@ -54683,7 +54680,7 @@ msgstr "" msgid "The selected item cannot have Batch" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:655 +#: erpnext/assets/doctype/asset/asset.js:657 msgid "The sell quantity is less than the total asset quantity. The remaining quantity will be split into a new asset. This action cannot be undone.

    Do you want to continue?" msgstr "" @@ -54790,15 +54787,15 @@ msgstr "" msgid "The value {0} is already assigned to an existing Item {1}." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1257 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1239 msgid "The warehouse where you store finished Items before they are shipped." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1250 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1232 msgid "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1262 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1244 msgid "The warehouse where your Items will be transferred when you begin production. Group Warehouse can also be selected as a Work in Progress warehouse." msgstr "" @@ -54806,11 +54803,11 @@ msgstr "" msgid "The withdrawal or deposit amounts - only required if there's no amount column." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:893 +#: erpnext/manufacturing/doctype/job_card/job_card.py:896 msgid "The {0} ({1}) must be equal to {2} ({3})" msgstr "" -#: erpnext/public/js/controllers/transaction.js:3328 +#: erpnext/public/js/controllers/transaction.js:3330 msgid "The {0} contains Unit Price Items." msgstr "" @@ -54818,7 +54815,7 @@ msgstr "" msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "" -#: erpnext/stock/doctype/material_request/material_request.py:878 +#: erpnext/stock/doctype/material_request/material_request.py:877 msgid "The {0} {1} created successfully" msgstr "" @@ -54826,7 +54823,7 @@ msgstr "" msgid "The {0} {1} does not match with the {0} {2} in the {3} {4}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:996 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1002 msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}." msgstr "" @@ -54842,7 +54839,7 @@ msgstr "" msgid "There are inconsistencies between the rate, no of shares and the amount calculated" msgstr "" -#: erpnext/accounts/doctype/account/account.py:203 +#: erpnext/accounts/doctype/account/account.py:204 msgid "There are ledger entries against this account. Changing {0} to non-{1} in live system will cause incorrect output in 'Accounts {2}' report" msgstr "" @@ -54871,7 +54868,7 @@ msgstr "" msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" -#: erpnext/stock/doctype/item/item.js:1177 +#: erpnext/stock/doctype/item/item.js:1164 msgid "There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit Item Valuation, FIFO and Moving Average." msgstr "" @@ -54911,7 +54908,7 @@ msgstr "" msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:871 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "" @@ -54967,11 +54964,11 @@ msgstr "" msgid "This Month's Summary" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:982 msgid "This Purchase Order has been fully subcontracted." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:2187 +#: erpnext/selling/doctype/sales_order/sales_order.py:2209 msgid "This Sales Order has been fully subcontracted." msgstr "" @@ -55108,11 +55105,11 @@ msgstr "" msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1243 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1225 msgid "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox." msgstr "" -#: erpnext/stock/doctype/item/item.js:1165 +#: erpnext/stock/doctype/item/item.js:1152 msgid "This is for raw material Items that'll be used to create finished goods. If the Item is an additional service like 'washing' that'll be used in the BOM, keep this unchecked." msgstr "" @@ -55274,7 +55271,7 @@ msgstr "" msgid "This will restrict user access to other employee records" msgstr "" -#: erpnext/controllers/selling_controller.py:886 +#: erpnext/controllers/selling_controller.py:887 msgid "This {} will be treated as material transfer." msgstr "" @@ -55385,7 +55382,7 @@ msgstr "" msgid "Time in mins." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:872 +#: erpnext/manufacturing/doctype/job_card/job_card.py:873 msgid "Time logs are required for {0} {1}" msgstr "" @@ -55494,7 +55491,7 @@ msgstr "" msgid "To Currency" msgstr "" -#: erpnext/controllers/accounts_controller.py:626 +#: erpnext/controllers/accounts_controller.py:627 #: erpnext/setup/doctype/holiday_list/holiday_list.py:121 msgid "To Date cannot be before From Date" msgstr "" @@ -55768,7 +55765,7 @@ msgid "To include sub-assembly costs and secondary items in Finished Goods on a msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2249 -#: erpnext/controllers/accounts_controller.py:3255 +#: erpnext/controllers/accounts_controller.py:3249 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "" @@ -55780,7 +55777,7 @@ msgstr "" msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled." msgstr "" -#: erpnext/accounts/doctype/account/account.py:554 +#: erpnext/accounts/doctype/account/account.py:555 msgid "To overrule this, enable '{0}' in company {1}" msgstr "" @@ -56062,12 +56059,12 @@ msgstr "" #. Label of the total_completed_qty (Float) field in DocType 'Job Card' #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/job_card/job_card.py:889 +#: erpnext/manufacturing/doctype/job_card/job_card.py:892 #: erpnext/manufacturing/report/job_card_summary/job_card_summary.py:174 msgid "Total Completed Qty" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:191 +#: erpnext/manufacturing/doctype/job_card/job_card.py:192 msgid "Total Completed Qty is required for Job Card {0}, please start and complete the job card before submission" msgstr "" @@ -56369,7 +56366,7 @@ msgstr "" msgid "Total Paid Amount" msgstr "" -#: erpnext/controllers/accounts_controller.py:2801 +#: erpnext/controllers/accounts_controller.py:2802 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total" msgstr "" @@ -56381,7 +56378,7 @@ msgstr "" msgid "Total Payments" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:724 +#: erpnext/selling/doctype/sales_order/sales_order.py:727 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "" @@ -56664,7 +56661,7 @@ msgstr "" msgid "Total allocated percentage for sales team should be 100" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:194 +#: erpnext/selling/doctype/customer/customer.py:184 msgid "Total contribution percentage should be equal to 100" msgstr "" @@ -56839,7 +56836,7 @@ msgstr "" msgid "Transaction Dates" msgstr "" -#: erpnext/setup/doctype/company/company.py:1093 +#: erpnext/setup/doctype/company/company.py:1097 msgid "Transaction Deletion Document {0} has been triggered for company {1}" msgstr "" @@ -56863,11 +56860,11 @@ msgstr "" msgid "Transaction Deletion Record To Delete" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1102 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1103 msgid "Transaction Deletion Record {0} is already running. {1}" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1121 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1122 msgid "Transaction Deletion Record {0} is currently deleting {1}. Cannot save documents until deletion completes." msgstr "" @@ -56972,7 +56969,8 @@ msgstr "" msgid "Transaction from which tax is withheld" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:865 +#: erpnext/manufacturing/doctype/job_card/job_card.py:866 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/base.py:38 msgid "Transaction not allowed against stopped Work Order {0}" msgstr "" @@ -57204,8 +57202,8 @@ msgstr "" msgid "Transporter Name" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:128 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:214 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:132 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:219 msgid "Travel Expenses" msgstr "" @@ -57484,7 +57482,7 @@ msgstr "" #: erpnext/stock/report/item_prices/item_prices.py:55 #: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:186 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:174 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -57545,7 +57543,7 @@ msgstr "" msgid "UOM Conversion Factor" msgstr "" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1467 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1469 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}" msgstr "" @@ -57558,7 +57556,7 @@ msgstr "" msgid "UOM Name" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1711 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "" @@ -57630,7 +57628,7 @@ msgstr "" msgid "Unable to find score starting at {0}. You need to have standing scores covering 0 to 100" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1063 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1064 msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "" @@ -57717,7 +57715,7 @@ msgstr "" msgid "Undo {}?" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:937 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:938 msgid "Unexpected Naming Series Pattern" msgstr "" @@ -57736,7 +57734,7 @@ msgstr "" msgid "Unit Of Measure" msgstr "" -#: erpnext/controllers/accounts_controller.py:3925 +#: erpnext/controllers/accounts_controller.py:3931 msgid "Unit Price" msgstr "" @@ -57898,7 +57896,7 @@ msgstr "" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:952 +#: erpnext/manufacturing/doctype/work_order/work_order.js:934 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:192 @@ -57938,8 +57936,8 @@ msgstr "" msgid "Unscheduled" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:178 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:305 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:182 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:310 msgid "Unsecured Loans" msgstr "" @@ -58119,7 +58117,7 @@ msgstr "" #. Invoice' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/controllers/accounts_controller.py:198 +#: erpnext/controllers/accounts_controller.py:199 msgid "Update Outstanding for Self" msgstr "" @@ -58202,7 +58200,7 @@ msgstr "" msgid "Updating Variants..." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1205 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1187 msgid "Updating Work Order status" msgstr "" @@ -58404,7 +58402,7 @@ msgstr "" msgid "Use Transaction Date Exchange Rate" msgstr "" -#: erpnext/projects/doctype/project/project.py:567 +#: erpnext/projects/doctype/project/project.py:605 msgid "Use a name that is different from previous project name" msgstr "" @@ -58446,7 +58444,7 @@ msgstr "" msgid "Used with Financial Report Template" msgstr "" -#: erpnext/setup/install.py:204 +#: erpnext/setup/install.py:236 msgid "User Forum" msgstr "" @@ -58532,8 +58530,8 @@ msgstr "" msgid "Using negative stock disables FIFO/Moving average valuation when inventory is negative." msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:129 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:215 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:133 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:220 msgid "Utility Expenses" msgstr "" @@ -58543,7 +58541,7 @@ msgstr "" msgid "VAT Accounts" msgstr "" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:28 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:40 msgid "VAT Amount (AED)" msgstr "" @@ -58553,12 +58551,12 @@ msgid "VAT Audit Report" msgstr "" #: erpnext/regional/report/uae_vat_201/uae_vat_201.html:47 -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:111 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:123 msgid "VAT on Expenses and All Other Inputs" msgstr "" #: erpnext/regional/report/uae_vat_201/uae_vat_201.html:15 -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:45 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:57 msgid "VAT on Sales and All Other Outputs" msgstr "" @@ -58783,11 +58781,11 @@ msgstr "" msgid "Valuation Rate (In / Out)" msgstr "" -#: erpnext/stock/stock_ledger.py:2075 +#: erpnext/stock/stock_ledger.py:2041 msgid "Valuation Rate Missing" msgstr "" -#: erpnext/stock/stock_ledger.py:2053 +#: erpnext/stock/stock_ledger.py:2019 msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "" @@ -58819,7 +58817,7 @@ msgid "Valuation rate for the item as per Sales Invoice (Only for Internal Trans msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2273 -#: erpnext/controllers/accounts_controller.py:3279 +#: erpnext/controllers/accounts_controller.py:3273 msgid "Valuation type charges can not be marked as Inclusive" msgstr "" @@ -58831,7 +58829,7 @@ msgstr "" msgid "Value (G - D)" msgstr "" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:229 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:217 msgid "Value ({0})" msgstr "" @@ -59003,7 +59001,7 @@ msgstr "" msgid "Variant Of" msgstr "" -#: erpnext/stock/doctype/item/item.js:857 +#: erpnext/stock/doctype/item/item.js:844 msgid "Variant creation has been queued." msgstr "" @@ -59369,7 +59367,7 @@ msgstr "" #: erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json #: erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1253 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1176 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 @@ -59443,7 +59441,7 @@ msgstr "" #: erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json #: erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1174 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 #: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 @@ -59651,7 +59649,7 @@ msgid "Warehouse not found against the account {0}" msgstr "" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1215 -#: erpnext/stock/doctype/delivery_note/delivery_note.py:444 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:445 msgid "Warehouse required for stock Item {0}" msgstr "" @@ -59676,7 +59674,7 @@ msgstr "" msgid "Warehouse {0} does not exist" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:246 +#: erpnext/manufacturing/doctype/work_order/work_order.py:247 msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "" @@ -59813,7 +59811,7 @@ msgstr "" msgid "Warning: Material Requested Qty is less than Minimum Order Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1482 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1483 msgid "Warning: Quantity exceeds maximum producible quantity based on quantity of raw materials received through the Subcontracting Inward Order {0}." msgstr "" @@ -59907,7 +59905,7 @@ msgstr "" msgid "Wavelength In Megametres" msgstr "" -#: erpnext/controllers/accounts_controller.py:193 +#: erpnext/controllers/accounts_controller.py:194 msgid "We can see {0} is made against {1}. If you want {1}'s outstanding to be updated, uncheck the '{2}' checkbox." msgstr "" @@ -60106,7 +60104,7 @@ msgstr "" msgid "When checked, the system will use the posting datetime of the document for naming the document instead of the creation datetime of the document." msgstr "" -#: erpnext/stock/doctype/item/item.js:1184 +#: erpnext/stock/doctype/item/item.js:1171 msgid "When creating an Item, entering a value for this field will automatically create an Item Price at the backend." msgstr "" @@ -60116,7 +60114,7 @@ msgstr "" msgid "When enabled, it adds a cutoff date filter to Delivery Notes created in bulk from Sales Orders. This allows you to process orders only with a transaction date up to the specified cutoff date, which is useful for period-end processing and batch fulfillment." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:297 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:703 msgid "When there are multiple finished goods ({0}) in a Repack stock entry, the basic rate for all finished goods must be set manually. To set rate manually, enable the checkbox 'Set Basic Rate Manually' in the respective finished good row." msgstr "" @@ -60126,11 +60124,11 @@ msgstr "" msgid "When you pay for something upfront (like annual insurance), the cost is held here and recognized gradually over time" msgstr "" -#: erpnext/accounts/doctype/account/account.py:380 +#: erpnext/accounts/doctype/account/account.py:381 msgid "While creating account for Child Company {0}, parent account {1} found as a ledger account." msgstr "" -#: erpnext/accounts/doctype/account/account.py:370 +#: erpnext/accounts/doctype/account/account.py:371 msgid "While creating account for Child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA" msgstr "" @@ -60275,7 +60273,7 @@ msgstr "" #: erpnext/assets/doctype/asset/asset_list.js:12 #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json -#: erpnext/setup/doctype/company/company.py:384 +#: erpnext/setup/doctype/company/company.py:388 #: erpnext/support/doctype/warranty_claim/warranty_claim.json msgid "Work In Progress" msgstr "" @@ -60312,7 +60310,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1094 #: erpnext/stock/doctype/material_request/material_request.js:216 #: erpnext/stock/doctype/material_request/material_request.json -#: erpnext/stock/doctype/material_request/material_request.py:879 +#: erpnext/stock/doctype/material_request/material_request.py:878 #: erpnext/stock/doctype/pick_list/pick_list.json #: erpnext/stock/doctype/serial_no/serial_no.json #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -60346,7 +60344,7 @@ msgstr "" msgid "Work Order Item" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:527 msgid "Work Order Mismatch" msgstr "" @@ -60387,19 +60385,23 @@ msgstr "" msgid "Work Order Summary Report" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.py:885 +#: erpnext/stock/doctype/material_request/material_request.py:884 msgid "Work Order cannot be created for following reason:
    {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1426 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1427 msgid "Work Order cannot be raised against a Item Template" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2510 -#: erpnext/manufacturing/doctype/work_order/work_order.py:2590 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2508 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2588 msgid "Work Order has been {0}" msgstr "" +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:285 +msgid "Work Order is mandatory" +msgstr "" + #: erpnext/selling/doctype/sales_order/sales_order.js:1297 msgid "Work Order not created" msgstr "" @@ -60408,16 +60410,16 @@ msgstr "" msgid "Work Order {0} created" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:100 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 -msgid "Work Order {0}: Job Card not found for the operation {1}" +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/base.py:35 +msgid "Work Order {0} must be submitted" msgstr "" #: erpnext/manufacturing/report/job_card_summary/job_card_summary.js:56 -#: erpnext/stock/doctype/material_request/material_request.py:873 +#: erpnext/stock/doctype/material_request/material_request.py:872 msgid "Work Orders" msgstr "" @@ -60442,7 +60444,7 @@ msgstr "" msgid "Work-in-Progress Warehouse" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:791 +#: erpnext/manufacturing/doctype/work_order/work_order.py:792 msgid "Work-in-Progress Warehouse is required before Submit" msgstr "" @@ -60490,7 +60492,7 @@ msgstr "" #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json #: erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:344 +#: erpnext/manufacturing/doctype/work_order/work_order.js:325 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/doctype/workstation/workstation.json #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js:35 @@ -60581,14 +60583,14 @@ msgstr "" #. Label of the write_off (Section Break) field in DocType 'Purchase Invoice' #. Label of the write_off_section (Section Break) field in DocType 'Sales #. Invoice' -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:130 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:216 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:134 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:221 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/pos_profile/pos_profile.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/setup/doctype/company/company.py:666 +#: erpnext/setup/doctype/company/company.py:671 msgid "Write Off" msgstr "" @@ -60693,7 +60695,7 @@ msgstr "" msgid "Wrong Company" msgstr "" -#: erpnext/setup/doctype/company/company.js:233 +#: erpnext/setup/doctype/company/company.js:249 msgid "Wrong Password" msgstr "" @@ -60749,7 +60751,7 @@ msgstr "" msgid "You are importing data for the code list:" msgstr "" -#: erpnext/controllers/accounts_controller.py:4029 +#: erpnext/controllers/accounts_controller.py:4035 msgid "You are not allowed to update as per the conditions set in {} Workflow." msgstr "" @@ -60761,7 +60763,7 @@ msgstr "" msgid "You are not authorized to make/edit Stock Transactions for Item {0} under warehouse {1} before this time." msgstr "" -#: erpnext/accounts/doctype/account/account.py:312 +#: erpnext/accounts/doctype/account/account.py:313 msgid "You are not authorized to set Frozen value" msgstr "" @@ -60830,11 +60832,11 @@ msgstr "" msgid "You can set up the rule to split the transaction across multiple accounts." msgstr "" -#: erpnext/controllers/accounts_controller.py:214 +#: erpnext/controllers/accounts_controller.py:215 msgid "You can use {0} to reconcile against {1} later." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1332 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1340 msgid "You can't make any changes to Job Card since Work Order is closed." msgstr "" @@ -60919,7 +60921,7 @@ msgstr "" msgid "You do not have permission to import bank transactions" msgstr "" -#: erpnext/controllers/accounts_controller.py:4005 +#: erpnext/controllers/accounts_controller.py:4011 msgid "You do not have permissions to {} items in a {}." msgstr "" @@ -60931,19 +60933,19 @@ msgstr "" msgid "You don't have enough points to redeem." msgstr "" -#: erpnext/controllers/accounts_controller.py:4466 +#: erpnext/controllers/accounts_controller.py:4454 msgid "You don't have permission to create a Company Address. Please contact your System Manager." msgstr "" -#: erpnext/controllers/accounts_controller.py:4446 +#: erpnext/controllers/accounts_controller.py:4434 msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:575 msgid "You don't have permission to update Received Qty DocField for item {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:4440 +#: erpnext/controllers/accounts_controller.py:4428 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60955,7 +60957,7 @@ msgstr "" msgid "You have already selected items from {0} {1}" msgstr "" -#: erpnext/projects/doctype/project/project.py:362 +#: erpnext/projects/doctype/project/project.py:400 msgid "You have been invited to collaborate on the project {0}." msgstr "" @@ -60995,7 +60997,7 @@ msgstr "" msgid "You need to cancel POS Closing Entry {} to be able to cancel this document." msgstr "" -#: erpnext/controllers/accounts_controller.py:3230 +#: erpnext/controllers/accounts_controller.py:3224 msgid "You selected the account group {1} as {2} Account in row {0}. Please select a single account." msgstr "" @@ -61042,11 +61044,11 @@ msgstr "" msgid "Zero Balance" msgstr "" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:65 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:77 msgid "Zero Rated" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:621 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:195 msgid "Zero quantity" msgstr "" @@ -61072,7 +61074,7 @@ msgstr "" msgid "`Allow Negative rates for Items`" msgstr "" -#: erpnext/stock/stock_ledger.py:2067 +#: erpnext/stock/stock_ledger.py:2033 msgid "after" msgstr "" @@ -61262,7 +61264,7 @@ msgstr "" msgid "per hour" msgstr "" -#: erpnext/stock/stock_ledger.py:2068 +#: erpnext/stock/stock_ledger.py:2034 msgid "performing either one below:" msgstr "" @@ -61357,7 +61359,7 @@ msgstr "" msgid "to" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3176 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3257 msgid "to unallocate the amount of this Return Invoice before cancelling it." msgstr "" @@ -61384,7 +61386,7 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:605 msgid "updated delivered quantity for item {0} to {1}" msgstr "" @@ -61406,7 +61408,7 @@ msgstr "" msgid "you must select Capital Work in Progress Account in accounts table" msgstr "" -#: erpnext/controllers/accounts_controller.py:1286 +#: erpnext/controllers/accounts_controller.py:1287 msgid "{0} '{1}' is disabled" msgstr "" @@ -61414,7 +61416,7 @@ msgstr "" msgid "{0} '{1}' not in Fiscal Year {2}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:677 +#: erpnext/manufacturing/doctype/work_order/work_order.py:678 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}" msgstr "" @@ -61422,7 +61424,7 @@ msgstr "" msgid "{0} {1} has submitted Assets. Remove Item {2} from table to continue." msgstr "" -#: erpnext/controllers/accounts_controller.py:2383 +#: erpnext/controllers/accounts_controller.py:2384 msgid "{0} Account not found against Customer {1}." msgstr "" @@ -61455,11 +61457,11 @@ msgstr "" msgid "{0} Number {1} is already used in {2} {3}" msgstr "" -#: erpnext/manufacturing/doctype/bom/bom.py:1689 +#: erpnext/manufacturing/doctype/bom/bom.py:1703 msgid "{0} Operating Cost for operation {1}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:578 +#: erpnext/manufacturing/doctype/work_order/work_order.js:560 msgid "{0} Operations: {1}" msgstr "" @@ -61555,7 +61557,7 @@ msgstr "" msgid "{0} creation for the following records will be skipped." msgstr "" -#: erpnext/setup/doctype/company/company.py:291 +#: erpnext/setup/doctype/company/company.py:295 msgid "{0} currency must be same as company's default currency. Please select another account." msgstr "" @@ -61571,7 +61573,7 @@ msgstr "" msgid "{0} does not belong to Company {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:353 +#: erpnext/controllers/accounts_controller.py:354 msgid "{0} does not belong to the Company {1}." msgstr "" @@ -61605,7 +61607,7 @@ msgstr "" msgid "{0} hours" msgstr "" -#: erpnext/controllers/accounts_controller.py:2741 +#: erpnext/controllers/accounts_controller.py:2742 msgid "{0} in row {1}" msgstr "" @@ -61627,7 +61629,7 @@ msgstr "" msgid "{0} is already running for {1}" msgstr "" -#: erpnext/controllers/accounts_controller.py:175 +#: erpnext/controllers/accounts_controller.py:176 msgid "{0} is blocked so this transaction cannot proceed" msgstr "" @@ -61648,7 +61650,7 @@ msgstr "" msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}" msgstr "" -#: erpnext/controllers/accounts_controller.py:3187 +#: erpnext/controllers/accounts_controller.py:3181 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}." msgstr "" @@ -61656,7 +61658,7 @@ msgstr "" msgid "{0} is not a CSV file." msgstr "" -#: erpnext/selling/doctype/customer/customer.py:236 +#: erpnext/selling/doctype/customer/customer.py:226 msgid "{0} is not a company bank account" msgstr "" @@ -61664,7 +61666,7 @@ msgstr "" msgid "{0} is not a group node. Please select a group node as parent cost center" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:673 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:114 msgid "{0} is not a stock Item" msgstr "" @@ -61704,27 +61706,27 @@ msgstr "" msgid "{0} is open. Close the POS or cancel the existing POS Opening Entry to create a new POS Opening Entry." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:543 +#: erpnext/manufacturing/doctype/work_order/work_order.js:525 msgid "{0} items disassembled" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:507 +#: erpnext/manufacturing/doctype/work_order/work_order.js:489 msgid "{0} items in progress" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:531 +#: erpnext/manufacturing/doctype/work_order/work_order.js:513 msgid "{0} items lost during process." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:488 +#: erpnext/manufacturing/doctype/work_order/work_order.js:470 msgid "{0} items produced" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:511 +#: erpnext/manufacturing/doctype/work_order/work_order.js:493 msgid "{0} items returned" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:514 +#: erpnext/manufacturing/doctype/work_order/work_order.js:496 msgid "{0} items to return" msgstr "" @@ -61732,7 +61734,7 @@ msgstr "" msgid "{0} must be negative in return document" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2366 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2447 msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record." msgstr "" @@ -61748,7 +61750,7 @@ msgstr "" msgid "{0} payment entries can not be filtered by {1}" msgstr "" -#: erpnext/controllers/stock_controller.py:1740 +#: erpnext/controllers/stock_controller.py:1741 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "" @@ -61777,16 +61779,16 @@ msgstr "" msgid "{0} units of {1} are required in {2} with the inventory dimension: {3} on {4} {5} for {6} to complete the transaction." msgstr "" -#: erpnext/stock/stock_ledger.py:1720 erpnext/stock/stock_ledger.py:2216 -#: erpnext/stock/stock_ledger.py:2230 +#: erpnext/stock/stock_ledger.py:1686 erpnext/stock/stock_ledger.py:2182 +#: erpnext/stock/stock_ledger.py:2196 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction." msgstr "" -#: erpnext/stock/stock_ledger.py:2317 erpnext/stock/stock_ledger.py:2362 +#: erpnext/stock/stock_ledger.py:2283 erpnext/stock/stock_ledger.py:2328 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction." msgstr "" -#: erpnext/stock/stock_ledger.py:1714 +#: erpnext/stock/stock_ledger.py:1680 msgid "{0} units of {1} needed in {2} to complete this transaction." msgstr "" @@ -61798,7 +61800,7 @@ msgstr "" msgid "{0} valid serial nos for Item {1}" msgstr "" -#: erpnext/stock/doctype/item/item.js:862 +#: erpnext/stock/doctype/item/item.js:849 msgid "{0} variants created." msgstr "" @@ -61814,7 +61816,7 @@ msgstr "" msgid "{0} will be set as the {1} in subsequently scanned items" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1005 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1011 msgid "{0} {1}" msgstr "" @@ -61852,8 +61854,8 @@ msgstr "" msgid "{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:414 -#: erpnext/selling/doctype/sales_order/sales_order.py:602 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:413 +#: erpnext/selling/doctype/sales_order/sales_order.py:605 #: erpnext/stock/doctype/material_request/material_request.py:257 msgid "{0} {1} has been modified. Please refresh." msgstr "" @@ -61963,7 +61965,7 @@ msgstr "" msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "" -#: erpnext/controllers/stock_controller.py:953 +#: erpnext/controllers/stock_controller.py:954 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "" @@ -62012,8 +62014,8 @@ msgstr "" msgid "{0}'s {1} cannot be after {2}'s Expected End Date." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1304 #: erpnext/manufacturing/doctype/job_card/job_card.py:1312 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1320 msgid "{0}, complete the operation {1} before the operation {2}." msgstr "" @@ -62033,11 +62035,11 @@ msgstr "" msgid "{0}: Virtual DocType (no database table)" msgstr "" -#: erpnext/controllers/accounts_controller.py:543 +#: erpnext/controllers/accounts_controller.py:544 msgid "{0}: {1} does not belong to the Company: {2}" msgstr "" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1410 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1333 msgid "{0}: {1} does not exist" msgstr "" @@ -62045,7 +62047,7 @@ msgstr "" msgid "{0}: {1} does not exists" msgstr "" -#: erpnext/setup/doctype/company/company.py:278 +#: erpnext/setup/doctype/company/company.py:282 msgid "{0}: {1} is a group account." msgstr "" @@ -62061,7 +62063,7 @@ msgstr "" msgid "{doctype} {name} is cancelled or closed." msgstr "" -#: erpnext/controllers/stock_controller.py:2147 +#: erpnext/controllers/stock_controller.py:2148 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "" @@ -62073,7 +62075,7 @@ msgstr "" msgid "{}" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2132 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2213 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}" msgstr "" From bafa6f950818334b4a96a2bdd7e8f5dbf5e48403 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Mon, 25 May 2026 12:06:54 +0530 Subject: [PATCH 125/249] feat: add party groups functionality to party specific item (#54988) --- erpnext/controllers/queries.py | 14 +++++++++++++- .../party_specific_item.js | 19 +++++++++++++++++-- .../party_specific_item.json | 8 +++++--- .../party_specific_item.py | 2 +- .../test_party_specific_item.py | 17 +++++++++++++++++ 5 files changed, 53 insertions(+), 7 deletions(-) diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index 07dbc43f0e1..09a490cd9dc 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -198,16 +198,28 @@ def item_query( if filters and isinstance(filters, dict): if filters.get("customer") or filters.get("supplier"): + party_type = "Customer" if filters.get("customer") else "Supplier" party = filters.get("customer") or filters.get("supplier") + group = "Customer Group" if filters.get("customer") else "Supplier Group" item_rules_list = frappe.get_all( "Party Specific Item", filters={ "party": ["!=", party], - "party_type": "Customer" if filters.get("customer") else "Supplier", + "party_type": party_type, }, fields=["restrict_based_on", "based_on_value"], ) + party_group_rules_list = frappe.get_all( + "Party Specific Item", + filters={"party_type": group}, + fields=["party as party_group", "restrict_based_on", "based_on_value"], + ) + current_party_group = frappe.get_value(party_type, party, frappe.scrub(group)) + for rule in party_group_rules_list: + if current_party_group != rule.party_group: + item_rules_list.append(rule) + filters_dict = {} for rule in item_rules_list: if rule["restrict_based_on"] == "Item": diff --git a/erpnext/selling/doctype/party_specific_item/party_specific_item.js b/erpnext/selling/doctype/party_specific_item/party_specific_item.js index 0decc70d7ac..779f2683102 100644 --- a/erpnext/selling/doctype/party_specific_item/party_specific_item.js +++ b/erpnext/selling/doctype/party_specific_item/party_specific_item.js @@ -2,6 +2,21 @@ // For license information, please see license.txt frappe.ui.form.on("Party Specific Item", { - // refresh: function(frm) { - // } + setup: function (frm) { + frm.trigger("party_type"); + }, + + party_type: function (frm) { + if (["Customer Group", "Supplier Group"].includes(frm.doc.party_type)) { + frm.set_query("party", function () { + return { + filters: { + is_group: 0, + }, + }; + }); + } else { + frm.set_query("party", null); + } + }, }); diff --git a/erpnext/selling/doctype/party_specific_item/party_specific_item.json b/erpnext/selling/doctype/party_specific_item/party_specific_item.json index 999cb61af61..b1aa5bfa59b 100644 --- a/erpnext/selling/doctype/party_specific_item/party_specific_item.json +++ b/erpnext/selling/doctype/party_specific_item/party_specific_item.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_bulk_edit": 1, "allow_import": 1, "creation": "2021-08-27 19:28:07.559978", "doctype": "DocType", @@ -18,7 +19,7 @@ "fieldtype": "Select", "in_list_view": 1, "label": "Party Type", - "options": "Customer\nSupplier", + "options": "Customer\nCustomer Group\nSupplier\nSupplier Group", "reqd": 1 }, { @@ -52,7 +53,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-03-27 13:10:08.752476", + "modified": "2026-05-17 11:46:17.634855", "modified_by": "Administrator", "module": "Selling", "name": "Party Specific Item", @@ -71,9 +72,10 @@ "write": 1 } ], + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], "title_field": "party", "track_changes": 1 -} \ No newline at end of file +} diff --git a/erpnext/selling/doctype/party_specific_item/party_specific_item.py b/erpnext/selling/doctype/party_specific_item/party_specific_item.py index d1775c2467c..77eb9095305 100644 --- a/erpnext/selling/doctype/party_specific_item/party_specific_item.py +++ b/erpnext/selling/doctype/party_specific_item/party_specific_item.py @@ -17,7 +17,7 @@ class PartySpecificItem(Document): based_on_value: DF.DynamicLink party: DF.DynamicLink - party_type: DF.Literal["Customer", "Supplier"] + party_type: DF.Literal["Customer", "Customer Group", "Supplier", "Supplier Group"] restrict_based_on: DF.Literal["Item", "Item Group", "Brand"] # end: auto-generated types diff --git a/erpnext/selling/doctype/party_specific_item/test_party_specific_item.py b/erpnext/selling/doctype/party_specific_item/test_party_specific_item.py index a94837452e6..eaa68232d27 100644 --- a/erpnext/selling/doctype/party_specific_item/test_party_specific_item.py +++ b/erpnext/selling/doctype/party_specific_item/test_party_specific_item.py @@ -49,6 +49,23 @@ class TestPartySpecificItem(ERPNextTestSuite): ) self.assertTrue(item in flatten(items)) + def test_party_group(self): + customer = "_Test Customer With Template" + item = "_Test Item" + frappe.set_value("Customer", customer, "customer_group", "Government") + + create_party_specific_item( + party_type="Customer Group", + party="Government", + restrict_based_on="Item", + based_on_value=item, + ) + filters = {"is_sales_item": 1, "customer": customer} + items = item_query( + doctype="Item", txt="", searchfield="name", start=0, page_len=20, filters=filters, as_dict=False + ) + self.assertTrue(item in flatten(items)) + def flatten(lst): result = [] From 1c3a9f7dd9aab3ea0ea97ba478366edcaf0d9437 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 25 May 2026 14:11:46 +0530 Subject: [PATCH 126/249] refactor: summarize in background --- .../process_period_closing_voucher.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py b/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py index 7a39f0f9053..6e1f3393866 100644 --- a/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py +++ b/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py @@ -288,7 +288,14 @@ def schedule_next_date(docname: str): ) # Ensure both normal and opening balances are processed for all dates if total_no_of_dates == completed: - summarize_and_post_ledger_entries(docname) + frappe.enqueue( + method="erpnext.accounts.doctype.process_period_closing_voucher.process_period_closing_voucher.summarize_and_post_ledger_entries", + queue="long", + timeout="3600", + is_async=True, + enqueue_after_commit=True, + docname=docname, + ) def make_dict_json_compliant(dimension_wise_balance) -> dict: From ccb8837c6c18b08ac3705b4e570675e0911fffb0 Mon Sep 17 00:00:00 2001 From: Sudharsanan11 Date: Mon, 25 May 2026 14:42:58 +0530 Subject: [PATCH 127/249] fix(stock): remove precision for valuation rate while creating sle --- .../stock/doctype/stock_reconciliation/stock_reconciliation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 3457d963b69..526aa4a0257 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -888,7 +888,7 @@ class StockReconciliation(StockController): "company": self.company, "stock_uom": frappe.db.get_value("Item", row.item_code, "stock_uom"), "is_cancelled": 1 if self.docstatus == 2 else 0, - "valuation_rate": flt(row.valuation_rate, row.precision("valuation_rate")), + "valuation_rate": flt(row.valuation_rate), } ) From 66ba7be2392eb2b41e2959c0b4a5af0ece922118 Mon Sep 17 00:00:00 2001 From: Sudharsanan11 Date: Mon, 25 May 2026 14:43:39 +0530 Subject: [PATCH 128/249] fix(stock): remove precision for valuation rate while calculating difference amount --- .../stock_reconciliation/stock_reconciliation.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index 526aa4a0257..f21f4da7174 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -570,15 +570,18 @@ class StockReconciliation(StockController): def calculate_difference_amount(self, item, item_dict): qty_precision = item.precision("qty") - val_precision = item.precision("valuation_rate") + amount_precision = item.precision("amount") new_qty = flt(item.qty, qty_precision) - new_valuation_rate = flt(item.valuation_rate or item_dict.get("rate"), val_precision) + new_valuation_rate = flt(item.valuation_rate or item_dict.get("rate")) current_qty = flt(item_dict.get("qty"), qty_precision) - current_valuation_rate = flt(item_dict.get("rate"), val_precision) + current_valuation_rate = flt(item_dict.get("rate")) - self.difference_amount += (new_qty * new_valuation_rate) - (current_qty * current_valuation_rate) + new_amount = flt(new_qty * new_valuation_rate, amount_precision) + current_amount = flt(current_qty * current_valuation_rate, amount_precision) + + self.difference_amount += new_amount - current_amount def validate_data(self): def _get_msg(row_num, msg): From c327a5ca93ec690e89912a43fe5436a60237b990 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 25 May 2026 15:33:12 +0530 Subject: [PATCH 129/249] fix: job card buttons color --- erpnext/manufacturing/doctype/job_card/job_card.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/erpnext/manufacturing/doctype/job_card/job_card.js b/erpnext/manufacturing/doctype/job_card/job_card.js index 140733353f4..795136d2374 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.js +++ b/erpnext/manufacturing/doctype/job_card/job_card.js @@ -655,10 +655,10 @@ frappe.ui.form.on("Job Card", { }; const buttons_html = [ - show_start && btn("btn-default jcd-btn-start", "play", __("Start Job")), - show_resume && btn("btn-default jcd-btn-resume", "play", __("Resume Job")), + show_start && btn("btn-primary jcd-btn-start", "play", __("Start Job")), + show_resume && btn("btn-primary jcd-btn-resume", "play", __("Resume Job")), show_pause && btn("btn-default jcd-btn-pause", "pause", __("Pause Job")), - show_complete && btn("btn-success jcd-btn-complete", "check", __("Complete Job"), "white"), + show_complete && btn("btn-primary jcd-btn-complete", "check", __("Complete Job"), "white"), ] .filter(Boolean) .join(""); @@ -766,6 +766,14 @@ frappe.ui.form.on("Job Card", { }, 1000); } + // Demote Submit to btn-default when an action button is already primary. + const has_action_button = show_start || show_resume || show_complete; + if (frm.page.btn_primary) { + frm.page.btn_primary + .toggleClass("btn-primary", !has_action_button) + .toggleClass("btn-default", has_action_button); + } + return is_timer_running; }, From f414778486e7526e8d4b07eccc627fb858acd6e3 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 25 May 2026 16:02:09 +0530 Subject: [PATCH 130/249] refactor: handle processes stuck in running state in process pcv --- .../process_period_closing_voucher.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py b/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py index 6e1f3393866..6008bf8470e 100644 --- a/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py +++ b/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py @@ -137,9 +137,10 @@ def pause_pcv_processing(docname: str): ppcv = qb.DocType("Process Period Closing Voucher") qb.update(ppcv).set(ppcv.status, "Paused").where(ppcv.name.eq(docname)).run() + # If a date is stuck in 'Running' state, this will allow it to procced. if queued_dates := frappe.db.get_all( "Process Period Closing Voucher Detail", - filters={"parent": docname, "status": "Queued"}, + filters={"parent": docname, "status": ["in", ["Queued", "Running"]]}, pluck="name", ): ppcvd = qb.DocType("Process Period Closing Voucher Detail") @@ -173,6 +174,9 @@ def resume_pcv_processing(docname: str): ppcvd = qb.DocType("Process Period Closing Voucher Detail") qb.update(ppcvd).set(ppcvd.status, "Queued").where(ppcvd.name.isin(paused_dates)).run() start_pcv_processing(docname) + else: + # If a parent doc is stuck in 'Running' state, will allow it to proceed. + schedule_next_date(docname) def update_default_dimensions(dimension_fields, gl_entry, dimension_values): From 9d5fd11bcd80a1de1c3282de06845648736cfebb Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 25 May 2026 11:40:25 +0530 Subject: [PATCH 131/249] fix: stock reco for legacy serial nos --- erpnext/stock/stock_ledger.py | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index 0eafe4323a2..fb8e63c37b7 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -895,7 +895,7 @@ class update_entries_after: # Only run in reposting self.get_serialized_values(sle) self.wh_data.qty_after_transaction += flt(sle.actual_qty) - if sle.voucher_type == "Stock Reconciliation" and not sle.batch_no: + if sle.voucher_type == "Stock Reconciliation" and not sle.batch_no and has_correct_data(sle): self.wh_data.qty_after_transaction = sle.qty_after_transaction self.wh_data.stock_value = flt(self.wh_data.qty_after_transaction) * flt( @@ -2470,3 +2470,28 @@ def get_incoming_rate_for_serial_and_batch(item_code, row, sn_obj, company): @frappe.request_cache def is_repack_entry(stock_entry_id): return frappe.get_cached_value("Stock Entry", stock_entry_id, "purpose") == "Repack" + + +def has_correct_data(sle): + previous_sle = get_previous_sle( + { + "item_code": sle.item_code, + "warehouse": sle.warehouse, + "posting_date": sle.posting_date, + "posting_time": sle.posting_time, + "creation": sle.creation, + "sle": sle.name, + } + ) + + if not previous_sle: + return True + + previous_qty = previous_sle.get("qty_after_transaction") or 0 + if previous_qty and not frappe.db.get_value( + "Stock Ledger Entry", + {"voucher_detail_no": sle.voucher_detail_no, "is_cancelled": 0, "actual_qty": ("<", 0)}, + ): + return False + + return True From f040bdf1656545362d86bda44c8986274124622a Mon Sep 17 00:00:00 2001 From: Nihantra Patel Date: Mon, 25 May 2026 21:39:54 +0530 Subject: [PATCH 132/249] fix: use passed posting date in make_reverse_gl_entries --- .../test_period_closing_voucher.py | 60 +++++++++++++++++++ erpnext/accounts/general_ledger.py | 7 ++- 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py index f90c2725241..c4fc74de2b5 100644 --- a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py +++ b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py @@ -7,6 +7,7 @@ from frappe.utils import today from erpnext.accounts.doctype.finance_book.test_finance_book import create_finance_book from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice +from erpnext.accounts.general_ledger import make_reverse_gl_entries from erpnext.accounts.utils import get_fiscal_year from erpnext.tests.utils import ERPNextTestSuite @@ -333,6 +334,65 @@ class TestPeriodClosingVoucher(ERPNextTestSuite): return pcv + @ERPNextTestSuite.change_settings( + "Accounts Settings", + {"enable_immutable_ledger": 1}, + ) + def test_immutable_ledger_reverse_entry_uses_passed_posting_date_after_pcv(self): + company = create_company() + cost_center = create_cost_center("Test Cost Center 1") + + jv = make_journal_entry( + posting_date="2021-03-15", + amount=400, + account1="Cash - TPC", + account2="Sales - TPC", + cost_center=cost_center, + company=company, + save=False, + ) + jv.company = company + jv.save() + jv.submit() + + self.make_period_closing_voucher(posting_date="2021-03-31") + + totals_before_cancel = frappe.db.sql( + """ + select sum(debit) as total_debit, sum(credit) as total_credit + from `tabGL Entry` + where voucher_type=%s and voucher_no=%s and is_cancelled=0 + """, + ("Journal Entry", jv.name), + as_dict=True, + )[0] + + # Passed posting_date is after PCV end date, so cancellation should not fail. + make_reverse_gl_entries( + voucher_type="Journal Entry", + voucher_no=jv.name, + posting_date="2022-01-01", + ) + + totals_after_cancel = frappe.db.sql( + """ + select sum(debit) as total_debit, sum(credit) as total_credit + from `tabGL Entry` + where voucher_type=%s and voucher_no=%s and is_cancelled=0 + """, + ("Journal Entry", jv.name), + as_dict=True, + )[0] + + self.assertEqual( + totals_after_cancel.total_debit, + totals_before_cancel.total_debit * 2, + ) + self.assertEqual( + totals_after_cancel.total_credit, + totals_before_cancel.total_credit * 2, + ) + def create_company(): company = frappe.get_doc( diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py index 406ca90232c..9effa1a09c5 100644 --- a/erpnext/accounts/general_ledger.py +++ b/erpnext/accounts/general_ledger.py @@ -718,7 +718,12 @@ def make_reverse_gl_entries( check_freezing_date(gl_entries[0]["posting_date"], adv_adj) is_opening = any(d.get("is_opening") == "Yes" for d in gl_entries) - validate_against_pcv(is_opening, gl_entries[0]["posting_date"], gl_entries[0]["company"]) + + # For reverse entries, use the posting_date parameter if provided and valid + # Otherwise fall back to original posting_date + validation_date = posting_date if posting_date else gl_entries[0]["posting_date"] + validate_against_pcv(is_opening, validation_date, gl_entries[0]["company"]) + if partial_cancel: # Partial cancel is only used by `Advance` in separate account feature. # Only cancel GL entries for unlinked reference using `voucher_detail_no` From 49d579a016d8668d486cde041b7642cb9521b526 Mon Sep 17 00:00:00 2001 From: diptanilsaha Date: Mon, 25 May 2026 23:16:33 +0530 Subject: [PATCH 133/249] fix(payment_entry): sync paid/received amounts for cross-currency entries (#55270) --- .../doctype/payment_entry/payment_entry.js | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index cf15139b712..33f0dee0702 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -807,11 +807,14 @@ frappe.ui.form.on("Payment Entry", { frm.set_value("base_paid_amount", flt(frm.doc.paid_amount) * flt(frm.doc.source_exchange_rate)); let company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency; if (!frm.doc.received_amount) { - if (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) { - frm.set_value("received_amount", frm.doc.paid_amount); - } else if (company_currency == frm.doc.paid_to_account_currency) { + frm.set_value("base_received_amount", frm.doc.base_paid_amount); + if (company_currency == frm.doc.paid_to_account_currency) { frm.set_value("received_amount", frm.doc.base_paid_amount); - frm.set_value("base_received_amount", frm.doc.base_paid_amount); + } else if (frm.doc.target_exchange_rate) { + frm.set_value( + "received_amount", + flt(frm.doc.base_paid_amount) / flt(frm.doc.target_exchange_rate) + ); } } frm.trigger("reset_received_amount"); @@ -828,15 +831,14 @@ frappe.ui.form.on("Payment Entry", { ); if (!frm.doc.paid_amount) { - if (frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) { - frm.set_value("paid_amount", frm.doc.received_amount); - if (frm.doc.target_exchange_rate) { - frm.set_value("source_exchange_rate", frm.doc.target_exchange_rate); - } - frm.set_value("base_paid_amount", frm.doc.base_received_amount); - } else if (company_currency == frm.doc.paid_from_account_currency) { + frm.set_value("base_paid_amount", frm.doc.base_received_amount); + if (company_currency == frm.doc.paid_from_account_currency) { frm.set_value("paid_amount", frm.doc.base_received_amount); - frm.set_value("base_paid_amount", frm.doc.base_received_amount); + } else if (frm.doc.source_exchange_rate) { + frm.set_value( + "paid_amount", + flt(frm.doc.base_received_amount) / flt(frm.doc.source_exchange_rate) + ); } } From 6cb7971342b6425894e4b3b040d4a5b2ed0faa08 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Tue, 26 May 2026 09:51:40 +0530 Subject: [PATCH 134/249] refactor: atomic summarization step for process pcv --- .../process_period_closing_voucher.py | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py b/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py index 6008bf8470e..e9600b0cd3c 100644 --- a/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py +++ b/erpnext/accounts/doctype/process_period_closing_voucher/process_period_closing_voucher.py @@ -292,15 +292,22 @@ def schedule_next_date(docname: str): ) # Ensure both normal and opening balances are processed for all dates if total_no_of_dates == completed: - frappe.enqueue( - method="erpnext.accounts.doctype.process_period_closing_voucher.process_period_closing_voucher.summarize_and_post_ledger_entries", - queue="long", - timeout="3600", - is_async=True, - enqueue_after_commit=True, - docname=docname, + from erpnext.accounts.doctype.process_payment_reconciliation.process_payment_reconciliation import ( + is_job_running, ) + job_name = f"summarize_{docname}" + if not is_job_running(job_name): + frappe.enqueue( + method="erpnext.accounts.doctype.process_period_closing_voucher.process_period_closing_voucher.summarize_and_post_ledger_entries", + queue="long", + timeout="3600", + is_async=True, + job_name=job_name, + enqueue_after_commit=True, + docname=docname, + ) + def make_dict_json_compliant(dimension_wise_balance) -> dict: """ From c286a73e0b881ce314aefd08b721b327d533e32c Mon Sep 17 00:00:00 2001 From: Pandiyan P Date: Tue, 26 May 2026 10:23:18 +0530 Subject: [PATCH 135/249] fix: prevent AttributeError in batch query filters (#55257) --- erpnext/controllers/queries.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index 09a490cd9dc..9dfc8a87e4f 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -544,7 +544,7 @@ def get_batches_from_stock_ledger_entries(searchfields, txt, filters, start=0, p if filters.get("posting_date") and filters.get("posting_time"): query = query.where( stock_ledger_entry.posting_datetime - <= get_combine_datetime(filters.posting_date, filters.posting_time) + <= get_combine_datetime(filters.get("posting_date"), filters.get("posting_time")) ) if not filters.get("include_expired_batches"): @@ -604,7 +604,7 @@ def get_batches_from_serial_and_batch_bundle(searchfields, txt, filters, start=0 if filters.get("posting_date") and filters.get("posting_time"): bundle_query = bundle_query.where( stock_ledger_entry.posting_datetime - <= get_combine_datetime(filters.posting_date, filters.posting_time) + <= get_combine_datetime(filters.get("posting_date"), filters.get("posting_time")) ) if not filters.get("include_expired_batches"): From a128d851c5b7ae60a6a29addf4e016b7ecf38fe2 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 26 May 2026 10:47:00 +0530 Subject: [PATCH 136/249] refactor: remove unused customer field in Item DocType (#55277) --- erpnext/stock/doctype/item/item.js | 5 ----- erpnext/stock/doctype/item/item.json | 10 +--------- erpnext/stock/doctype/item/item.py | 1 - 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index 51fa652d310..99099798462 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -286,7 +286,6 @@ frappe.ui.form.on("Item", { frm.set_df_property(fieldname, "read_only", stock_exists); }); frm.set_df_property("is_fixed_asset", "read_only", frm.doc.__onload?.asset_exists ? 1 : 0); - frm.toggle_reqd("customer", frm.doc.is_customer_provided_item ? 1 : 0); }, validate: function (frm) { @@ -297,10 +296,6 @@ frappe.ui.form.on("Item", { refresh_field("image_view"); }, - is_customer_provided_item: function (frm) { - frm.toggle_reqd("customer", frm.doc.is_customer_provided_item ? 1 : 0); - }, - is_fixed_asset: function (frm) { // set serial no to false & toggles its visibility frm.set_value("has_serial_no", 0); diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index 699379d3501..a5e7a2cc551 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -31,7 +31,6 @@ "column_break_kpmi", "is_purchase_item", "is_customer_provided_item", - "customer", "section_break_gjns", "standard_rate", "column_break_ixrh", @@ -632,13 +631,6 @@ "read_only_depends_on": "eval: doc.is_purchase_item", "show_description_on_click": 1 }, - { - "depends_on": "eval:doc.is_customer_provided_item", - "fieldname": "customer", - "fieldtype": "Link", - "label": "Customer", - "options": "Customer" - }, { "depends_on": "eval:!doc.is_fixed_asset", "fieldname": "supplier_details", @@ -1077,7 +1069,7 @@ "image_field": "image", "links": [], "make_attachments_public": 1, - "modified": "2026-05-14 02:09:33.455292", + "modified": "2026-05-26 10:18:46.862670", "modified_by": "Administrator", "module": "Stock", "name": "Item", diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index 21cdad65980..245f2dc82b8 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -79,7 +79,6 @@ class Item(Document): brand: DF.Link | None country_of_origin: DF.Link | None create_new_batch: DF.Check - customer: DF.Link | None customer_code: DF.SmallText | None customer_items: DF.Table[ItemCustomerDetail] customs_tariff_number: DF.Link | None From bda75135c35bc99c7f3564de3a29be415225409d Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 26 May 2026 12:53:47 +0530 Subject: [PATCH 137/249] fix: single variant creation error --- erpnext/stock/doctype/item/item.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index 21cdad65980..aabc4d0e016 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -889,8 +889,13 @@ class Item(Document): if disabled: frappe.throw(_("Attribute {0} is disabled.").format(frappe.bold(d.attribute))) - if not numeric_values and not frappe.db.exists( - "Item Attribute Value", {"parent": d.attribute, "attribute_value": d.attribute_value} + if ( + not numeric_values + and d.attribute_value + and not frappe.db.exists( + "Item Attribute Value", + {"parent": d.attribute, "attribute_value": d.attribute_value}, + ) ): frappe.throw( _("Attribute Value {0} is not valid for the selected attribute {1}.").format( From 090c25d848a57c10a3b1ee078832f4b6f43a2743 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 26 May 2026 13:09:14 +0530 Subject: [PATCH 138/249] feat: allow creation of any number of variants in multiple item variant creation dialog --- erpnext/controllers/item_variant.py | 14 +++++++++++++- .../controllers/tests/test_item_variant.py | 19 ++++++++++++++++++- erpnext/stock/doctype/item/item.js | 12 +++++++----- 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py index 689f0c6a3f6..7c5db01c835 100644 --- a/erpnext/controllers/item_variant.py +++ b/erpnext/controllers/item_variant.py @@ -215,7 +215,9 @@ def create_variant(item: str, args: dict | str, use_template_image: bool = False variant_attributes = [] for d in template.attributes: - variant_attributes.append({"attribute": d.attribute, "attribute_value": args.get(_(d.attribute))}) + attribute_value = args.get(_(d.attribute)) or args.get(d.attribute) + if attribute_value: + variant_attributes.append({"attribute": d.attribute, "attribute_value": attribute_value}) variant.set("attributes", variant_attributes) copy_attributes_to_variant(template, variant) @@ -234,6 +236,12 @@ def enqueue_multiple_variant_creation(item: str, args: dict | str, use_template_ # There can be innumerable attribute combinations, enqueue if isinstance(args, str): variants = json.loads(args) + else: + variants = args + variants = {key: values for key, values in variants.items() if values} + if not variants: + frappe.throw(_("Please select at least one attribute value")) + total_variants = 1 for key in variants: total_variants *= len(variants[key]) @@ -257,6 +265,7 @@ def create_multiple_variants(item, args, use_template_image=False): count = 0 if isinstance(args, str): args = json.loads(args) + args = {key: values for key, values in args.items() if values} template_item = frappe.get_doc("Item", item) args_set = generate_keyed_value_combinations(args) @@ -291,6 +300,9 @@ def generate_keyed_value_combinations(args): """ # Return empty list if empty + if not args: + return [] + args = {key: values for key, values in args.items() if values} if not args: return [] diff --git a/erpnext/controllers/tests/test_item_variant.py b/erpnext/controllers/tests/test_item_variant.py index 04634cf911a..77c8e708d14 100644 --- a/erpnext/controllers/tests/test_item_variant.py +++ b/erpnext/controllers/tests/test_item_variant.py @@ -2,7 +2,11 @@ import json import frappe -from erpnext.controllers.item_variant import copy_attributes_to_variant, make_variant_item_code +from erpnext.controllers.item_variant import ( + copy_attributes_to_variant, + generate_keyed_value_combinations, + make_variant_item_code, +) from erpnext.stock.doctype.item.test_item import set_item_variant_settings from erpnext.stock.doctype.quality_inspection.test_quality_inspection import ( create_quality_inspection_parameter, @@ -17,6 +21,19 @@ class TestItemVariant(ERPNextTestSuite): variant = make_item_variant() self.assertEqual(variant.get("quality_inspection_template"), "_Test QC Template") + def test_generate_keyed_value_combinations_ignores_empty_attributes(self): + combinations = generate_keyed_value_combinations( + {"Test Colour": ["Red", "Blue"], "Test Size": ["Small", "Large"], "Test Fit": []} + ) + + self.assertEqual(len(combinations), 4) + self.assertNotIn("Test Fit", combinations[0]) + + single_attribute_combinations = generate_keyed_value_combinations( + {"Test Colour": ["Red", "Blue"], "Test Size": []} + ) + self.assertEqual(single_attribute_combinations, [{"Test Colour": "Red"}, {"Test Colour": "Blue"}]) + def create_variant_with_tables(item, args): if isinstance(args, str): diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js index 51fa652d310..125c6b86c46 100644 --- a/erpnext/stock/doctype/item/item.js +++ b/erpnext/stock/doctype/item/item.js @@ -777,11 +777,10 @@ $.extend(erpnext.item, { default: 0, onchange: function () { let selected_attributes = get_selected_attributes(); - let lengths = []; - Object.keys(selected_attributes).map((key) => { - lengths.push(selected_attributes[key].length); + let lengths = Object.keys(selected_attributes).map((key) => { + return selected_attributes[key].length; }); - if (lengths.includes(0)) { + if (!lengths.length) { me.multiple_variant_dialog.get_primary_btn().html(__("Create Variants")); me.multiple_variant_dialog.disable_primary_action(); } else { @@ -818,7 +817,7 @@ $.extend(erpnext.item, { fieldtype: "HTML", fieldname: "help", options: ``, }, ] @@ -880,6 +879,9 @@ $.extend(erpnext.item, { selected_attributes[attribute_name].push($(opt).attr("data-fieldname")); } }); + if (!selected_attributes[attribute_name].length) { + delete selected_attributes[attribute_name]; + } }); return selected_attributes; From bbb7b6f8e0d8b18e5d11f28ddbc13fe173015a5f Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Tue, 26 May 2026 09:44:39 +0200 Subject: [PATCH 139/249] refactor(buying): replace sql query by orm (#55153) --- .../supplier_scorecard_criteria.py | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py b/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py index 5bdad172ae6..f0c0d9b65bd 100644 --- a/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py +++ b/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py @@ -73,22 +73,16 @@ def _get_variables(criteria): mylist = re.finditer(regex, criteria.formula, re.MULTILINE | re.DOTALL) for _dummy1, match in enumerate(mylist): for _dummy2 in range(0, len(match.groups())): - try: - var = frappe.db.sql( - """ - SELECT - scv.variable_label, scv.description, scv.param_name, scv.path - FROM - `tabSupplier Scorecard Variable` scv - WHERE - param_name=%(param)s""", - {"param": match.group(1)}, - as_dict=1, - )[0] - my_variables.append(var) - except Exception: - frappe.throw( - _("Unable to find variable:") + " " + str(match.group(1)), InvalidFormulaVariable - ) + param_name = match.group(1) + + variables = frappe.get_all( + "Supplier Scorecard Variable", + fields=["variable_label", "description", "param_name", "path"], + filters={"param_name": param_name}, + limit=1, + ) + if not variables: + frappe.throw(_("Unable to find variable: {0}").format(param_name), InvalidFormulaVariable) + my_variables.append(variables[0]) return my_variables From b8327e40310ab8d58490c7a939f91160440f0acc Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Tue, 26 May 2026 10:00:23 +0200 Subject: [PATCH 140/249] =?UTF-8?q?refactor(customer):=20replace=20SQL=20w?= =?UTF-8?q?ith=20query=20builder=20in=20get=5Fcustomer=5Fou=E2=80=A6=20(#5?= =?UTF-8?q?5209)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erpnext/selling/doctype/customer/customer.py | 144 ++++++++++--------- 1 file changed, 78 insertions(+), 66 deletions(-) diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py index 4c2f6999e4c..8368fd90ee9 100644 --- a/erpnext/selling/doctype/customer/customer.py +++ b/erpnext/selling/doctype/customer/customer.py @@ -667,85 +667,97 @@ def send_emails( def get_customer_outstanding(customer, company, ignore_outstanding_sales_order=False, cost_center=None): - # Outstanding based on GL Entries - cond = "" + from frappe.query_builder import Criterion + from frappe.query_builder.functions import Coalesce, IfNull, Sum + + GLEntry = frappe.qb.DocType("GL Entry") + gle_query = ( + frappe.qb.from_(GLEntry) + .select(Sum(GLEntry.debit) - Sum(GLEntry.credit)) + .where(GLEntry.party_type == "Customer") + .where(GLEntry.party == customer) + .where(GLEntry.company == company) + .where(GLEntry.is_cancelled == 0) + ) + if cost_center: lft, rgt = frappe.get_cached_value("Cost Center", cost_center, ["lft", "rgt"]) + CostCenter = frappe.qb.DocType("Cost Center") + cost_center_subquery = ( + frappe.qb.from_(CostCenter) + .select(CostCenter.name) + .where(CostCenter.lft >= lft) + .where(CostCenter.rgt <= rgt) + ) + gle_query = gle_query.where(GLEntry.cost_center.isin(cost_center_subquery)) - cond = f""" and cost_center in (select name from `tabCost Center` where - lft >= {lft} and rgt <= {rgt})""" + gle_res = gle_query.run() + outstanding_based_on_gle = flt(gle_res[0][0]) if gle_res and gle_res[0][0] is not None else 0.0 - outstanding_based_on_gle = frappe.db.sql( - f""" - select sum(debit) - sum(credit) - from `tabGL Entry` where party_type = 'Customer' - and is_cancelled = 0 and party = %s - and company=%s {cond}""", - (customer, company), - ) - - outstanding_based_on_gle = flt(outstanding_based_on_gle[0][0]) if outstanding_based_on_gle else 0 - - # Outstanding based on Sales Order - outstanding_based_on_so = 0 - - # if credit limit check is bypassed at sales order level, - # we should not consider outstanding Sales Orders, when customer credit balance report is run + outstanding_based_on_so = 0.0 if not ignore_outstanding_sales_order: - outstanding_based_on_so = frappe.db.sql( - """ - select sum(base_grand_total*(100 - per_billed)/100) - from `tabSales Order` - where customer=%s and docstatus = 1 and company=%s - and per_billed < 100 and status != 'Closed'""", - (customer, company), + SalesOrder = frappe.qb.DocType("Sales Order") + so_query = ( + frappe.qb.from_(SalesOrder) + .select(Sum(SalesOrder.base_grand_total * (100 - SalesOrder.per_billed) / 100)) + .where(SalesOrder.customer == customer) + .where(SalesOrder.company == company) + .where(SalesOrder.docstatus == 1) + .where(SalesOrder.per_billed < 100) + .where(SalesOrder.status != "Closed") ) + so_res = so_query.run() + outstanding_based_on_so = flt(so_res[0][0]) if so_res and so_res[0][0] is not None else 0.0 - outstanding_based_on_so = flt(outstanding_based_on_so[0][0]) if outstanding_based_on_so else 0 + DeliveryNote = frappe.qb.DocType("Delivery Note") + DeliveryNoteItem = frappe.qb.DocType("Delivery Note Item") + SalesInvoiceItem = frappe.qb.DocType("Sales Invoice Item") - # Outstanding based on Delivery Note, which are not created against Sales Order - outstanding_based_on_dn = 0 - - unmarked_delivery_note_items = frappe.db.sql( - """select - dn_item.name, dn_item.amount, dn.base_net_total, dn.base_grand_total - from `tabDelivery Note` dn, `tabDelivery Note Item` dn_item - where - dn.name = dn_item.parent - and dn.customer=%s and dn.company=%s - and dn.docstatus = 1 and dn.status not in ('Closed', 'Stopped') - and ifnull(dn_item.against_sales_order, '') = '' - and ifnull(dn_item.against_sales_invoice, '') = '' - """, - (customer, company), - as_dict=True, + si_subquery = ( + frappe.qb.from_(SalesInvoiceItem) + .select(SalesInvoiceItem.dn_detail, Sum(SalesInvoiceItem.amount).as_("billed_amount")) + .where(SalesInvoiceItem.docstatus == 1) + .groupby(SalesInvoiceItem.dn_detail) ) - if not unmarked_delivery_note_items: - return outstanding_based_on_gle + outstanding_based_on_so - - si_amounts = frappe.db.sql( - """ - SELECT - dn_detail, sum(amount) from `tabSales Invoice Item` - WHERE - docstatus = 1 - and dn_detail in ({}) - GROUP BY dn_detail""".format( - ", ".join(frappe.db.escape(dn_item.name) for dn_item in unmarked_delivery_note_items) + dn_query = ( + frappe.qb.from_(DeliveryNote) + .join(DeliveryNoteItem) + .on(DeliveryNote.name == DeliveryNoteItem.parent) + .left_join(si_subquery) + .on(DeliveryNoteItem.name == si_subquery.dn_detail) + .select( + Sum( + ( + (DeliveryNoteItem.amount - IfNull(si_subquery.billed_amount, 0.0)) + / DeliveryNote.base_net_total + ) + * DeliveryNote.base_grand_total + ) + ) + .where(DeliveryNote.customer == customer) + .where(DeliveryNote.company == company) + .where(DeliveryNote.docstatus == 1) + .where(DeliveryNote.base_net_total > 0) + .where(DeliveryNote.status.notin(["Closed", "Stopped"])) + .where(DeliveryNoteItem.amount > IfNull(si_subquery.billed_amount, 0.0)) + .where( + Criterion.any( + [DeliveryNoteItem.against_sales_order.isnull(), DeliveryNoteItem.against_sales_order == ""] + ) + ) + .where( + Criterion.any( + [ + DeliveryNoteItem.against_sales_invoice.isnull(), + DeliveryNoteItem.against_sales_invoice == "", + ] + ) ) ) - si_amounts = {si_item[0]: si_item[1] for si_item in si_amounts} - - for dn_item in unmarked_delivery_note_items: - dn_amount = flt(dn_item.amount) - si_amount = flt(si_amounts.get(dn_item.name)) - - if dn_amount > si_amount and dn_item.base_net_total: - outstanding_based_on_dn += ( - (dn_amount - si_amount) / dn_item.base_net_total - ) * dn_item.base_grand_total + dn_res = dn_query.run() + outstanding_based_on_dn = flt(dn_res[0][0]) if dn_res and dn_res[0][0] is not None else 0.0 return outstanding_based_on_gle + outstanding_based_on_so + outstanding_based_on_dn From a051049710d66773d645c8acac19bb5dd18c8824 Mon Sep 17 00:00:00 2001 From: Loic Oberle Date: Tue, 26 May 2026 10:20:04 +0200 Subject: [PATCH 141/249] refactor(sales_order): Replace SQL with ORM in validate_po (#55198) --- .../doctype/sales_order/sales_order.py | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 3c3097d0be3..4d68a79e62d 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -337,20 +337,24 @@ class SalesOrder(SellingController): ) if self.po_no and self.customer and not self.skip_delivery_note: - so = frappe.db.sql( - "select name from `tabSales Order` \ - where ifnull(po_no, '') = %s and name != %s and docstatus < 2\ - and customer = %s", - (self.po_no, self.name, self.customer), + so = frappe.db.get_value( + "Sales Order", + filters={ + "po_no": self.po_no, + "name": ["!=", self.name], + "docstatus": ["<", 2], + "customer": self.customer, + }, + fieldname="name", ) - if so and so[0][0]: + if so: if cint( frappe.get_single_value("Selling Settings", "allow_against_multiple_purchase_orders") ): frappe.msgprint( _( "Warning: Sales Order {0} already exists against Customer's Purchase Order {1}" - ).format(frappe.bold(so[0][0]), frappe.bold(self.po_no)), + ).format(frappe.bold(so), frappe.bold(self.po_no)), alert=True, ) else: @@ -358,7 +362,7 @@ class SalesOrder(SellingController): _( "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" ).format( - frappe.bold(so[0][0]), + frappe.bold(so), frappe.bold(self.po_no), frappe.bold( _("'Allow Multiple Sales Orders Against a Customer's Purchase Order'") From 9c39b01f1c838e88cec373bb320fc53332e47df7 Mon Sep 17 00:00:00 2001 From: Nihantra Patel Date: Tue, 26 May 2026 14:19:04 +0530 Subject: [PATCH 142/249] test: update testcase --- .../test_period_closing_voucher.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py index c4fc74de2b5..f05b1f58b4d 100644 --- a/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py +++ b/erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py @@ -357,16 +357,6 @@ class TestPeriodClosingVoucher(ERPNextTestSuite): self.make_period_closing_voucher(posting_date="2021-03-31") - totals_before_cancel = frappe.db.sql( - """ - select sum(debit) as total_debit, sum(credit) as total_credit - from `tabGL Entry` - where voucher_type=%s and voucher_no=%s and is_cancelled=0 - """, - ("Journal Entry", jv.name), - as_dict=True, - )[0] - # Passed posting_date is after PCV end date, so cancellation should not fail. make_reverse_gl_entries( voucher_type="Journal Entry", @@ -384,14 +374,7 @@ class TestPeriodClosingVoucher(ERPNextTestSuite): as_dict=True, )[0] - self.assertEqual( - totals_after_cancel.total_debit, - totals_before_cancel.total_debit * 2, - ) - self.assertEqual( - totals_after_cancel.total_credit, - totals_before_cancel.total_credit * 2, - ) + self.assertEqual(totals_after_cancel.total_debit, totals_after_cancel.total_credit) def create_company(): From 048ddfc265b2f7a031f8eada42fafc5870d19747 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 26 May 2026 13:59:25 +0530 Subject: [PATCH 143/249] fix: inclusive tax amount not considered while setting LCV from purchase invoice --- .../purchase_receipt/purchase_receipt.py | 4 +- .../purchase_receipt/test_purchase_receipt.py | 151 ++++++++++++++++++ 2 files changed, 153 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index 335a77e3963..30afd561482 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -1375,7 +1375,7 @@ def get_billed_qty_amount_against_purchase_receipt(pr_doc): .on(parent_table.name == table.parent) .select( table.pr_detail, - fn.Sum(table.amount * parent_table.conversion_rate).as_("amount"), + fn.Sum(table.base_net_amount).as_("amount"), fn.Sum(table.qty).as_("qty"), ) .where((table.pr_detail.isin(pr_names)) & (table.docstatus == 1)) @@ -1421,7 +1421,7 @@ def get_billed_qty_amount_against_purchase_order(pr_doc): .select( table.po_detail, fn.Sum(table.qty).as_("qty"), - fn.Sum(table.amount * parent_table.conversion_rate).as_("amount"), + fn.Sum(table.base_net_amount).as_("amount"), ) .where((table.po_detail.isin(po_names)) & (table.docstatus == 1) & (table.pr_detail.isnull())) .groupby(table.po_detail) diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py index 03b4355cd14..6f217b98674 100644 --- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py @@ -5602,6 +5602,157 @@ class TestPurchaseReceipt(ERPNextTestSuite): self.assertIn(company.default_inventory_account, gl_accounts) pr.cancel() + @ERPNextTestSuite.change_settings( + "Buying Settings", {"set_landed_cost_based_on_purchase_invoice_rate": 1, "maintain_same_rate": 0} + ) + def test_srbnb_with_inclusive_tax_and_rate_change_in_pi(self): + """ + When 'Set Landed Cost Based on PI Rate' is enabled and PI has an inclusive tax: + - PR: qty=2, rate=1000 INR → base_net_amount=2000 + - PI: rate changed to 2000, 5% tax included in basic rate + → PI base_net_amount = 2 * 2000 / 1.05 ≈ 3809.52 + + The system must use PI's base_net_amount (not amount=4000) so that + SRBNB credit on PR = 3809.52, not 4000. + """ + company = "_Test Company with perpetual inventory" + warehouse = "Stores - TCP1" + cost_center = "Main - TCP1" + + item_code = make_item( + "Test Item for SRBNB Inclusive Tax Rate Change", + {"is_stock_item": 1}, + ).name + + pr = make_purchase_receipt( + item_code=item_code, + qty=2, + rate=1000, + company=company, + warehouse=warehouse, + cost_center=cost_center, + ) + + pi = make_purchase_invoice(pr.name) + pi.items[0].rate = 2000 + pi.append( + "taxes", + { + "charge_type": "On Net Total", + "account_head": "_Test Account VAT - TCP1", + "category": "Total", + "add_deduct_tax": "Add", + "included_in_print_rate": 1, + "rate": 5, + "description": "Test Inclusive Tax", + "cost_center": cost_center, + }, + ) + pi.save() + pi.submit() + + pr.reload() + + # PI base_net_amount = qty * (rate / (1 + tax_rate/100)) = 2 * (2000 / 1.05) + pi_base_net_amount = flt(2 * 2000 / 1.05, 2) + pr_base_net_amount = flt(pr.items[0].amount, 2) # 2 * 1000 = 2000 + expected_diff = flt(pi_base_net_amount - pr_base_net_amount, 2) + + self.assertAlmostEqual(pr.items[0].amount_difference_with_purchase_invoice, expected_diff, places=2) + + # Total SRBNB credit = PR base_net_amount + amount_difference = PI base_net_amount + srbnb_account = "Stock Received But Not Billed - TCP1" + gl_entries = get_gl_entries("Purchase Receipt", pr.name, skip_cancelled=True) + srbnb_credit = sum(flt(row.credit) for row in gl_entries if row.account == srbnb_account) + self.assertAlmostEqual(srbnb_credit, pi_base_net_amount, places=2) + + @ERPNextTestSuite.change_settings( + "Buying Settings", {"set_landed_cost_based_on_purchase_invoice_rate": 1, "maintain_same_rate": 0} + ) + def test_srbnb_with_inclusive_tax_and_exchange_rate_change_in_pi(self): + """ + When 'Set Landed Cost Based on PI Rate' is enabled, PI has an inclusive tax, and only + the exchange rate changes on the PI (rate stays the same): + - PR: qty=2, rate=100 USD, conversion_rate=70 → base_net_amount=14000 INR + - PI: same rate=100 USD, conversion_rate changed to 90, 5% tax included in basic rate + → PI base_net_amount = 2 * (100 / 1.05) * 90 ≈ 17142.86 INR + + The system must use PI's base_net_amount (not amount = 2*100*90 = 18000) so that + SRBNB credit on PR = 17142.86, not 18000. + """ + from erpnext.accounts.doctype.account.test_account import create_account + + company = "_Test Company with perpetual inventory" + warehouse = "Stores - TCP1" + cost_center = "Main - TCP1" + + party_account = create_account( + account_name="USD Payable For SRBNB Exchange Rate Test", + parent_account="Accounts Payable - TCP1", + account_type="Payable", + company=company, + account_currency="USD", + ) + + supplier = create_supplier( + supplier_name="_Test USD Supplier for SRBNB Exchange Rate", + default_currency="USD", + party_account=party_account, + ).name + + item_code = make_item( + "Test Item for SRBNB Inclusive Tax Exchange Rate Change", + {"is_stock_item": 1}, + ).name + + pr = make_purchase_receipt( + item_code=item_code, + qty=2, + rate=100, + currency="USD", + conversion_rate=70, + company=company, + warehouse=warehouse, + supplier=supplier, + ) + + pi = make_purchase_invoice(pr.name) + pi.conversion_rate = 90 + pi.append( + "taxes", + { + "charge_type": "On Net Total", + "account_head": "_Test Account VAT - TCP1", + "category": "Total", + "add_deduct_tax": "Add", + "included_in_print_rate": 1, + "rate": 5, + "description": "Test Inclusive Tax", + "cost_center": cost_center, + }, + ) + pi.save() + pi.submit() + + pr.reload() + + # PI base_net_amount = qty * (rate / (1 + tax_rate/100)) * new_conversion_rate + # = 2 * (100 / 1.05) * 90 ≈ 17142.86 INR + # PR base_net_amount = qty * rate * pr_conversion_rate = 2 * 100 * 70 = 14000 INR + tax_amount_pr = (200 - flt(200 / 1.05, 2)) * 90 + + pi_base_net_amount = flt(2 * 100 * 90) - flt(tax_amount_pr) + pr_base_net_amount = flt(2 * 100 * 70) + expected_diff = flt(pi_base_net_amount - pr_base_net_amount) + + self.assertAlmostEqual(pr.items[0].amount_difference_with_purchase_invoice, expected_diff, places=2) + + # Total SRBNB credit = PR base_net_amount + amount_difference = PI base_net_amount + srbnb_account = "Stock Received But Not Billed - TCP1" + gl_entries = get_gl_entries("Purchase Receipt", pr.name, skip_cancelled=True) + srbnb_credit = sum(flt(row.credit) for row in gl_entries if row.account == srbnb_account) + self.assertAlmostEqual(srbnb_credit, pi_base_net_amount, places=2) + def create_asset_category_for_pr_test(): category_name = "Test Asset Category for PR" From 58f24c83c0916e7cf9e8a2796ae2149b6bb157cf Mon Sep 17 00:00:00 2001 From: Sudharsanan11 Date: Tue, 26 May 2026 18:21:40 +0530 Subject: [PATCH 144/249] fix(stock): add validation for work order seial nos and batch nos --- .../stock_entry_handler/manufacturing.py | 135 +++++++++++++++--- 1 file changed, 112 insertions(+), 23 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py b/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py index 231664f954d..79dafd69d9f 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py @@ -7,10 +7,13 @@ from frappe.query_builder.functions import Sum from frappe.utils import ceil, cint, flt, get_link_to_form from erpnext.manufacturing.doctype.bom.bom import add_additional_cost +from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos from erpnext.stock.serial_batch_bundle import ( SerialBatchCreation, get_batch_nos, + get_batches_from_bundle, get_empty_batches_based_work_order, + get_serial_nos_from_bundle, ) from .base import BaseStockEntry @@ -165,25 +168,30 @@ class BaseManufactureStockEntry(BaseStockEntry): else: self.doc.append("items", item_details) - def set_serial_nos_for_finished_good(self, item_details): + def set_serial_nos_for_finished_good(self, item_details, existing_row=None): serial_nos = self.get_available_serial_nos_for_fg(item_details.item_code) - if serial_nos: - row = frappe._dict({"serial_nos": serial_nos[0 : cint(item_details.qty)]}) + if not serial_nos: + return - _id = create_serial_and_batch_bundle( - self.doc, - row, - frappe._dict( - { - "item_code": item_details.item_code, - "warehouse": item_details.t_warehouse, - } - ), - ) + row = frappe._dict({"serial_nos": serial_nos[0 : cint(item_details.qty)]}) + _id = create_serial_and_batch_bundle( + self.doc, + row, + frappe._dict( + { + "item_code": item_details.item_code, + "warehouse": item_details.t_warehouse, + } + ), + ) + + if existing_row: + existing_row.serial_and_batch_bundle = _id + existing_row.use_serial_batch_fields = 0 + else: item_details.serial_and_batch_bundle = _id item_details.use_serial_batch_fields = 0 - self.doc.append("items", item_details) def get_available_serial_nos_for_fg(self, item_code) -> list[str]: @@ -199,22 +207,23 @@ class BaseManufactureStockEntry(BaseStockEntry): order_by="creation asc", ) - def set_batchwise_finished_goods(self, item_details): - batches = get_empty_batches_based_work_order(self.doc.work_order, self.doc.pro_doc.production_item) + def set_batchwise_finished_goods(self, item_details, existing_row=None): + batches = get_empty_batches_based_work_order(self.doc.work_order, self.wo_doc.production_item) if not batches: - self.doc.append("items", item_details) + if not existing_row: + self.doc.append("items", item_details) else: - self.add_batchwise_finished_good(batches, item_details) + self.add_batchwise_finished_good(batches, item_details, existing_row=existing_row) - def add_batchwise_finished_good(self, batches, item_details): + def add_batchwise_finished_good(self, batches, item_details, existing_row=None): qty = flt(self.doc.fg_completed_qty) row = frappe._dict({"batches_to_be_consume": defaultdict(float)}) self.update_batches_to_be_consume(batches, row, qty) if row.batches_to_be_consume: - self._link_fg_bundle_and_append(item_details, row) + self._link_fg_bundle_and_append(item_details, row, existing_row=existing_row) - def _link_fg_bundle_and_append(self, item_details, row): + def _link_fg_bundle_and_append(self, item_details, row, existing_row=None): _id = create_serial_and_batch_bundle( self.doc, row, @@ -222,8 +231,13 @@ class BaseManufactureStockEntry(BaseStockEntry): {"item_code": self.wo_doc.production_item, "warehouse": item_details.get("t_warehouse")} ), ) - item_details["serial_and_batch_bundle"] = _id - self.doc.append("items", item_details) + if existing_row: + existing_row.serial_and_batch_bundle = _id + existing_row.use_serial_batch_fields = 0 + else: + item_details["serial_and_batch_bundle"] = _id + item_details["use_serial_batch_fields"] = 0 + self.doc.append("items", item_details) def update_batches_to_be_consume(self, batches, row, qty): qty_to_be_consumed = qty @@ -253,6 +267,81 @@ class ManufactureStockEntry(BaseManufactureStockEntry): self.validate_warehouse() self.validate_raw_materials_exists() self.validate_component_and_quantities() + self.validate_finished_good_serial_batch_for_work_order() + + def validate_finished_good_serial_batch_for_work_order(self): + if not ( + self.doc.work_order + and self.wo_doc + and self.wo_doc.track_semi_finished_goods != 1 + and cint( + frappe.db.get_single_value( + "Manufacturing Settings", "make_serial_no_batch_from_work_order", cache=True + ) + ) + and (self.wo_doc.has_serial_no or self.wo_doc.has_batch_no) + ): + return + + for row in self.doc.items: + if not row.is_finished_item: + continue + + if self.check_invalid_serial_batch_nos_for_finished_good_item(row): + self.reset_serial_batch_on_fg_row(row) + frappe.msgprint( + _( + "Row {0}: Serial/Batch has been reset to values linked with Work Order {1}" + " because the previously selected serial/batch does not belong to this Work Order." + ).format(row.idx, frappe.bold(self.doc.work_order)) + ) + + def check_invalid_serial_batch_nos_for_finished_good_item(self, row) -> bool: + if self.wo_doc.has_serial_no: + serial_nos = get_serial_nos(row.serial_no) if row.serial_no else [] + if not serial_nos and row.serial_and_batch_bundle: + serial_nos = get_serial_nos_from_bundle(row.serial_and_batch_bundle) + if serial_nos: + valid_serial_nos = frappe.get_all( + "Serial No", + filters={"name": ("in", serial_nos), "work_order": self.doc.work_order}, + pluck="name", + ) + return bool(set(serial_nos) - set(valid_serial_nos)) + else: + return True + + if self.wo_doc.has_batch_no: + batch_nos = [row.batch_no] if row.batch_no else [] + if not batch_nos and row.serial_and_batch_bundle: + batch_nos = list(get_batches_from_bundle(row.serial_and_batch_bundle).keys()) + if batch_nos: + valid_batch_nos = frappe.get_all( + "Batch", + filters={"name": ("in", batch_nos), "reference_name": self.doc.work_order}, + pluck="name", + ) + return bool(set(batch_nos) - set(valid_batch_nos)) + else: + return True + + def reset_serial_batch_on_fg_row(self, row): + item_details = frappe._dict( + { + "item_code": row.item_code, + "t_warehouse": row.t_warehouse, + "qty": row.qty, + } + ) + + row.serial_no = None + row.batch_no = None + row.serial_and_batch_bundle = None + + if self.wo_doc.has_serial_no: + self.set_serial_nos_for_finished_good(item_details, existing_row=row) + elif self.wo_doc.has_batch_no: + self.set_batchwise_finished_goods(item_details, existing_row=row) def set_job_card_data(self): if self.doc.job_card and not self.doc.work_order: From 2a7867511d8e1da3d0fae7268fefe7888a2ba8c5 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Wed, 27 May 2026 01:43:40 +0530 Subject: [PATCH 145/249] fix(sales_invoice): skip stock update for POS invoices linked to Delivery Note (#55311) --- erpnext/accounts/doctype/sales_invoice/sales_invoice.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 86f84be0973..634e97aa9b5 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -969,9 +969,6 @@ class SalesInvoice(SellingController): if selling_price_list: self.set("selling_price_list", selling_price_list) - if not for_validate: - self.update_stock = cint(pos.get("update_stock")) - # set pos values in items for item in self.get("items"): if item.get("item_code"): @@ -982,6 +979,10 @@ class SalesInvoice(SellingController): if (not for_validate) or (for_validate and not item.get(fname)): item.set(fname, val) + if not for_validate: + dn_flag = any(d.get("dn_detail") for d in self.get("items")) + self.update_stock = 0 if dn_flag else cint(pos.get("update_stock")) + # fetch terms if self.tc_name and not self.terms: self.terms = frappe.db.get_value("Terms and Conditions", self.tc_name, "terms") From 652014700c3429c7babaf989b523a2430d24dbaa Mon Sep 17 00:00:00 2001 From: Himanshu Jain <118419692+trufurs@users.noreply.github.com> Date: Wed, 27 May 2026 01:49:16 +0530 Subject: [PATCH 146/249] fix(employee): js error if user does not have write permission for date field (#55312) --- erpnext/setup/doctype/employee/employee.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/doctype/employee/employee.js b/erpnext/setup/doctype/employee/employee.js index 847922dba33..7f1260fdc6e 100755 --- a/erpnext/setup/doctype/employee/employee.js +++ b/erpnext/setup/doctype/employee/employee.js @@ -44,7 +44,7 @@ frappe.ui.form.on("Employee", { }, refresh: function (frm) { - frm.fields_dict.date_of_birth.datepicker.update({ maxDate: new Date() }); + frm.fields_dict.date_of_birth.datepicker?.update({ maxDate: new Date() }); if (!frm.is_new() && !frm.doc.user_id) { frm.add_custom_button(__("Create User"), () => { From 8bb611dfee2fa3afe2d7957f8a0ce2c14d49cbb4 Mon Sep 17 00:00:00 2001 From: MochaMind Date: Wed, 27 May 2026 05:28:39 +0530 Subject: [PATCH 147/249] fix: sync translations from crowdin (#55239) --- erpnext/locale/ar.po | 2286 +++++++++++++++++++------------------- erpnext/locale/bs.po | 2286 +++++++++++++++++++------------------- erpnext/locale/cs.po | 2278 +++++++++++++++++++------------------- erpnext/locale/da.po | 2278 +++++++++++++++++++------------------- erpnext/locale/de.po | 2286 +++++++++++++++++++------------------- erpnext/locale/eo.po | 2286 +++++++++++++++++++------------------- erpnext/locale/es.po | 2284 +++++++++++++++++++------------------- erpnext/locale/fa.po | 2326 ++++++++++++++++++++------------------- erpnext/locale/fr.po | 2282 +++++++++++++++++++------------------- erpnext/locale/hr.po | 2298 +++++++++++++++++++------------------- erpnext/locale/hu.po | 2278 +++++++++++++++++++------------------- erpnext/locale/id.po | 2280 +++++++++++++++++++------------------- erpnext/locale/it.po | 2270 +++++++++++++++++++------------------- erpnext/locale/my.po | 2278 +++++++++++++++++++------------------- erpnext/locale/nb.po | 2278 +++++++++++++++++++------------------- erpnext/locale/nl.po | 2286 +++++++++++++++++++------------------- erpnext/locale/pl.po | 2278 +++++++++++++++++++------------------- erpnext/locale/pt.po | 2278 +++++++++++++++++++------------------- erpnext/locale/pt_BR.po | 2278 +++++++++++++++++++------------------- erpnext/locale/ru.po | 2286 +++++++++++++++++++------------------- erpnext/locale/sl.po | 2282 +++++++++++++++++++------------------- erpnext/locale/sr.po | 2286 +++++++++++++++++++------------------- erpnext/locale/sr_CS.po | 2286 +++++++++++++++++++------------------- erpnext/locale/sv.po | 2314 +++++++++++++++++++------------------- erpnext/locale/th.po | 2286 +++++++++++++++++++------------------- erpnext/locale/tr.po | 2282 +++++++++++++++++++------------------- erpnext/locale/vi.po | 2286 +++++++++++++++++++------------------- erpnext/locale/zh.po | 2286 +++++++++++++++++++------------------- 28 files changed, 32022 insertions(+), 31966 deletions(-) diff --git a/erpnext/locale/ar.po b/erpnext/locale/ar.po index 5b907c5f521..3383cb36c95 100644 --- a/erpnext/locale/ar.po +++ b/erpnext/locale/ar.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-17 10:04+0000\n" -"PO-Revision-Date: 2026-05-18 20:20\n" +"POT-Creation-Date: 2026-05-24 10:11+0000\n" +"PO-Revision-Date: 2026-05-24 21:21\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Arabic\n" "MIME-Version: 1.0\n" @@ -268,7 +268,7 @@ msgstr "" msgid "% of materials delivered against this Sales Order" msgstr "" -#: erpnext/controllers/accounts_controller.py:2387 +#: erpnext/controllers/accounts_controller.py:2388 msgid "'Account' in the Accounting section of Customer {0}" msgstr "" @@ -284,7 +284,7 @@ msgstr "'على أساس' و 'المجموعة حسب' لا يمكن أن يكو msgid "'Days Since Last Order' must be greater than or equal to zero" msgstr "يجب أن تكون \"الأيام منذ آخر طلب\" أكبر من أو تساوي الصفر" -#: erpnext/controllers/accounts_controller.py:2392 +#: erpnext/controllers/accounts_controller.py:2393 msgid "'Default {0} Account' in Company {1}" msgstr "" @@ -346,8 +346,8 @@ msgstr "{0} الحساب مستخدم بواسطة{1} استخدم حساب آخ msgid "'{0}' has been already added." msgstr "لقد تمت إضافة '{0}' بالفعل." -#: erpnext/setup/doctype/company/company.py:303 -#: erpnext/setup/doctype/company/company.py:314 +#: erpnext/setup/doctype/company/company.py:307 +#: erpnext/setup/doctype/company/company.py:318 msgid "'{0}' should be in company currency {1}." msgstr "" @@ -517,8 +517,8 @@ msgstr "1000+" msgid "11-50" msgstr "" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:95 -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:101 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:107 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:113 msgid "1{0}" msgstr "1{0}" @@ -607,8 +607,8 @@ msgstr "" msgid "90 Above" msgstr "أكثر من 90" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1348 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1349 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1271 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1272 msgid "<0" msgstr "<0" @@ -758,7 +758,7 @@ msgstr "" msgid "
  • Clearance date must be after cheque date for row(s): {0}
  • " msgstr "" -#: erpnext/controllers/accounts_controller.py:2270 +#: erpnext/controllers/accounts_controller.py:2271 msgid "
  • Item {0} in row(s) {1} billed more than {2}
  • " msgstr "" @@ -775,7 +775,7 @@ msgstr "" msgid "
  • {}
  • " msgstr "" -#: erpnext/controllers/accounts_controller.py:2267 +#: erpnext/controllers/accounts_controller.py:2268 msgid "

    Cannot overbill for the following Items:

    " msgstr "" @@ -819,7 +819,7 @@ msgstr "" msgid "

    Price List Rate has not been set as editable in Selling Settings. In this scenario, setting Update Price List Based On to Price List Rate will prevent auto-updation of Item Price.

    Are you sure you want to continue?" msgstr "" -#: erpnext/controllers/accounts_controller.py:2279 +#: erpnext/controllers/accounts_controller.py:2280 msgid "

    To allow over-billing, please set allowance in Accounts Settings.

    " msgstr "" @@ -941,7 +941,7 @@ msgstr "" msgid "A - C" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:355 +#: erpnext/selling/doctype/customer/customer.py:345 msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group" msgstr "مجموعة الزبائن موجودة بنفس الاسم أرجو تغير اسم العميل أو اعادة تسمية مجموعة الزبائن\\n
    \\nA Customer Group exists with same name please change the Customer name or rename the Customer Group" @@ -1105,11 +1105,11 @@ msgstr "" msgid "Abbreviation" msgstr "اسم مختصر" -#: erpnext/setup/doctype/company/company.py:238 +#: erpnext/setup/doctype/company/company.py:241 msgid "Abbreviation already used for another company" msgstr "الاختصار يستخدم بالفعل لشركة أخرى\\n
    \\nAbbreviation already used for another company" -#: erpnext/setup/doctype/company/company.py:235 +#: erpnext/setup/doctype/company/company.py:238 msgid "Abbreviation is mandatory" msgstr "الاسم المختصر إلزامي" @@ -1117,7 +1117,7 @@ msgstr "الاسم المختصر إلزامي" msgid "Abbreviation: {0} must appear only once" msgstr "الاختصار: يجب أن يظهر {0} مرة واحدة فقط" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1345 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1268 msgid "Above" msgstr "فوق" @@ -1171,7 +1171,7 @@ msgid "Accepted Qty in Stock UOM" msgstr "" #. Label of the qty (Float) field in DocType 'Purchase Receipt Item' -#: erpnext/public/js/controllers/transaction.js:2839 +#: erpnext/public/js/controllers/transaction.js:2841 #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json msgid "Accepted Quantity" msgstr "كمية مقبولة" @@ -1207,7 +1207,7 @@ msgstr "مفتاح الوصول مطلوب لموفر الخدمة: {0}" msgid "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010" msgstr "وفقًا لـ CEFACT/ICG/2010/IC013 أو CEFACT/ICG/2010/IC010" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1075 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:784 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." msgstr "وفقًا لقائمة المواد {0}، فإن العنصر '{1}' مفقود في إدخال المخزون." @@ -1326,7 +1326,7 @@ msgid "Account Manager" msgstr "إدارة حساب المستخدم" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1009 -#: erpnext/controllers/accounts_controller.py:2396 +#: erpnext/controllers/accounts_controller.py:2397 msgid "Account Missing" msgstr "الحساب مفقود" @@ -1344,7 +1344,7 @@ msgstr "الحساب مفقود" msgid "Account Name" msgstr "اسم الحساب" -#: erpnext/accounts/doctype/account/account.py:373 +#: erpnext/accounts/doctype/account/account.py:374 msgid "Account Not Found" msgstr "الحساب غير موجود" @@ -1357,7 +1357,7 @@ msgstr "الحساب غير موجود" msgid "Account Number" msgstr "رقم الحساب" -#: erpnext/accounts/doctype/account/account.py:359 +#: erpnext/accounts/doctype/account/account.py:360 msgid "Account Number {0} already used in account {1}" msgstr "رقم الحساب {0} بالفعل مستخدم في الحساب {1}" @@ -1396,7 +1396,7 @@ msgstr "نوع الحساب الفرعي" #. Label of the account_type (Select) field in DocType 'Payment Ledger Entry' #. Label of the account_type (Select) field in DocType 'Party Type' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/account.py:206 +#: erpnext/accounts/doctype/account/account.py:207 #: erpnext/accounts/doctype/account/account_tree.js:154 #: erpnext/accounts/doctype/bank_account/bank_account.json #: erpnext/accounts/doctype/bank_account_type/bank_account_type.json @@ -1412,11 +1412,11 @@ msgstr "نوع الحساب" msgid "Account Value" msgstr "قيمة الحساب" -#: erpnext/accounts/doctype/account/account.py:328 +#: erpnext/accounts/doctype/account/account.py:329 msgid "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'" msgstr "رصيد الحساب بالفعل دائن ، لا يسمح لك لتعيين ' الرصيد يجب ان يكون ' ك ' مدين '\\n
    \\nAccount balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'" -#: erpnext/accounts/doctype/account/account.py:322 +#: erpnext/accounts/doctype/account/account.py:323 msgid "Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'" msgstr "رصيد الحساب رصيد مدين، لا يسمح لك بتغييره 'الرصيد يجب أن يكون دائن'" @@ -1483,24 +1483,24 @@ msgstr "" msgid "Account where the cost of this item will be debited on purchase" msgstr "" -#: erpnext/accounts/doctype/account/account.py:427 +#: erpnext/accounts/doctype/account/account.py:428 msgid "Account with child nodes cannot be converted to ledger" msgstr "لا يمكن تحويل الحساب إلى دفتر الأستاذ لأن لديه حسابات فرعية\\n
    \\nAccount with child nodes cannot be converted to ledger" -#: erpnext/accounts/doctype/account/account.py:279 +#: erpnext/accounts/doctype/account/account.py:280 msgid "Account with child nodes cannot be set as ledger" msgstr "الحساب لديه حسابات فرعية لا يمكن إضافته لدفتر الأستاذ.\\n
    \\nAccount with child nodes cannot be set as ledger" -#: erpnext/accounts/doctype/account/account.py:438 +#: erpnext/accounts/doctype/account/account.py:439 msgid "Account with existing transaction can not be converted to group." msgstr "لا يمكن تحويل حساب جرت عليه أي عملية إلى تصنيف مجموعة" -#: erpnext/accounts/doctype/account/account.py:467 +#: erpnext/accounts/doctype/account/account.py:468 msgid "Account with existing transaction can not be deleted" msgstr "الحساب لديه معاملات موجودة لا يمكن حذفه\\n
    \\nAccount with existing transaction can not be deleted" -#: erpnext/accounts/doctype/account/account.py:273 -#: erpnext/accounts/doctype/account/account.py:429 +#: erpnext/accounts/doctype/account/account.py:274 +#: erpnext/accounts/doctype/account/account.py:430 msgid "Account with existing transaction cannot be converted to ledger" msgstr "لا يمكن تحويل الحساب مع الحركة الموجودة إلى دفتر الأستاذ\\n
    \\nAccount with existing transaction cannot be converted to ledger" @@ -1508,11 +1508,11 @@ msgstr "لا يمكن تحويل الحساب مع الحركة الموجودة msgid "Account {0} added multiple times" msgstr "تمت إضافة الحساب {0} عدة مرات" -#: erpnext/accounts/doctype/account/account.py:291 +#: erpnext/accounts/doctype/account/account.py:292 msgid "Account {0} cannot be converted to Group as it is already set as {1} for {2}." msgstr "لا يمكن تحويل الحساب {0} إلى مجموعة لأنه تم تعيينه على أنه {1} لـ {2}." -#: erpnext/accounts/doctype/account/account.py:288 +#: erpnext/accounts/doctype/account/account.py:289 msgid "Account {0} cannot be disabled as it is already set as {1} for {2}." msgstr "لا يمكن تعطيل الحساب {0} لأنه تم تعيينه بالفعل على أنه {1} لـ {2}." @@ -1520,11 +1520,11 @@ msgstr "لا يمكن تعطيل الحساب {0} لأنه تم تعيينه ب msgid "Account {0} does not belong to company {1}" msgstr "" -#: erpnext/setup/doctype/company/company.py:285 +#: erpnext/setup/doctype/company/company.py:289 msgid "Account {0} does not belong to company: {1}" msgstr "الحساب {0} لا يتنمى للشركة {1}\\n
    \\nAccount {0} does not belong to company: {1}" -#: erpnext/accounts/doctype/account/account.py:589 +#: erpnext/accounts/doctype/account/account.py:590 msgid "Account {0} does not exist" msgstr "حساب {0} غير موجود" @@ -1540,15 +1540,15 @@ msgstr "الحساب {0} لا يتطابق مع الشركة {1} في طريقة msgid "Account {0} doesn't belong to Company {1}" msgstr "" -#: erpnext/accounts/doctype/account/account.py:546 +#: erpnext/accounts/doctype/account/account.py:547 msgid "Account {0} exists in parent company {1}." msgstr "الحساب {0} موجود في الشركة الأم {1}." -#: erpnext/accounts/doctype/account/account.py:411 +#: erpnext/accounts/doctype/account/account.py:412 msgid "Account {0} is added in the child company {1}" msgstr "تتم إضافة الحساب {0} في الشركة التابعة {1}" -#: erpnext/setup/doctype/company/company.py:274 +#: erpnext/setup/doctype/company/company.py:278 msgid "Account {0} is disabled." msgstr "تم تعطيل الحساب {0}." @@ -1556,7 +1556,7 @@ msgstr "تم تعطيل الحساب {0}." msgid "Account {0} is frozen" msgstr "الحساب {0} مجمد\\n
    \\nAccount {0} is frozen" -#: erpnext/controllers/accounts_controller.py:1471 +#: erpnext/controllers/accounts_controller.py:1472 msgid "Account {0} is invalid. Account Currency must be {1}" msgstr "الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}" @@ -1564,19 +1564,19 @@ msgstr "الحساب {0} غير صحيح. يجب أن تكون عملة الحس msgid "Account {0} should be of type Expense" msgstr "حساب {0} يجب أن يكون من نوع المصروفات" -#: erpnext/accounts/doctype/account/account.py:152 +#: erpnext/accounts/doctype/account/account.py:153 msgid "Account {0}: Parent account {1} can not be a ledger" msgstr "الحساب {0}: الحساب الرئيسي {1} لا يمكن أن يكون حساب دفتر أستاذ" -#: erpnext/accounts/doctype/account/account.py:158 +#: erpnext/accounts/doctype/account/account.py:159 msgid "Account {0}: Parent account {1} does not belong to company: {2}" msgstr "الحساب {0}: الحساب الرئيسي {1} لا ينتمي إلى الشركة: {2}" -#: erpnext/accounts/doctype/account/account.py:146 +#: erpnext/accounts/doctype/account/account.py:147 msgid "Account {0}: Parent account {1} does not exist" msgstr "الحساب {0}: الحسابه الأب {1} غير موجود" -#: erpnext/accounts/doctype/account/account.py:149 +#: erpnext/accounts/doctype/account/account.py:150 msgid "Account {0}: You can not assign itself as parent account" msgstr "الحساب {0}: لا يمكنك جعله حساب رئيسي" @@ -1592,7 +1592,7 @@ msgstr "الحساب: {0} لا يمكن تحديثه إلا من خلال معا msgid "Account: {0} is not permitted under Payment Entry" msgstr "الحساب: {0} غير مسموح به بموجب إدخال الدفع" -#: erpnext/controllers/accounts_controller.py:3287 +#: erpnext/controllers/accounts_controller.py:3281 msgid "Account: {0} with currency: {1} can not be selected" msgstr "الحساب: {0} مع العملة: {1} لا يمكن اختياره" @@ -1877,8 +1877,8 @@ msgstr "القيود المحاسبة" msgid "Accounting Entry for Asset" msgstr "المدخلات الحسابية للأصول" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2038 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2058 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1148 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1168 msgid "Accounting Entry for LCV in Stock Entry {0}" msgstr "" @@ -1902,8 +1902,8 @@ msgstr "القيد المحاسبي للخدمة" #: erpnext/controllers/stock_controller.py:733 #: erpnext/controllers/stock_controller.py:750 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.py:941 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1983 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1997 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1100 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1114 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:778 msgid "Accounting Entry for Stock" msgstr "القيود المحاسبية للمخزون" @@ -1912,7 +1912,7 @@ msgstr "القيود المحاسبية للمخزون" msgid "Accounting Entry for {0}" msgstr "القيد المحاسبي لـ {0}" -#: erpnext/controllers/accounts_controller.py:2437 +#: erpnext/controllers/accounts_controller.py:2438 msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}" msgstr "المدخل المحاسبي ل {0}: {1} يمكن أن يكون فقط بالعملة {1}.\\n
    \\nAccounting Entry for {0}: {1} can only be made in currency: {2}" @@ -1982,12 +1982,12 @@ msgstr "تم تجميد القيود المحاسبية حتى هذا التار #: erpnext/buying/doctype/supplier/supplier.json #: erpnext/selling/doctype/customer/customer.json #: erpnext/setup/doctype/company/company.json -#: erpnext/setup/doctype/company/company.py:444 +#: erpnext/setup/doctype/company/company.py:448 #: erpnext/setup/doctype/customer_group/customer_group.json #: erpnext/setup/doctype/email_digest/email_digest.json #: erpnext/setup/doctype/incoterm/incoterm.json #: erpnext/setup/doctype/supplier_group/supplier_group.json -#: erpnext/setup/install.py:395 +#: erpnext/setup/install.py:427 msgid "Accounts" msgstr "الحسابات" @@ -2017,8 +2017,8 @@ msgstr "الحسابات المفقودة من التقرير" #. Entry' #. Name of a report #. Label of a Workspace Sidebar Item -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:154 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:256 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:158 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:261 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/report/accounts_payable/accounts_payable.json #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:126 @@ -2118,15 +2118,15 @@ msgstr "جدول الحسابات لا يمكن أن يكون فارغا." msgid "Accounts to Merge" msgstr "الحسابات المراد دمجها" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:158 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:265 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:162 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:270 msgid "Accrued Expenses" msgstr "" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:63 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:112 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:67 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117 #: erpnext/accounts/report/account_balance/account_balance.js:37 msgid "Accumulated Depreciation" msgstr "إستهلاك متراكم" @@ -2291,7 +2291,7 @@ msgstr "الإجراءات المنجزة" #. Label of the enable_serial_and_batch_no_for_item (Check) field in DocType #. 'Stock Settings' -#: erpnext/stock/doctype/item/item.js:419 +#: erpnext/stock/doctype/item/item.js:412 #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Activate Serial / Batch No for Item" msgstr "" @@ -2415,7 +2415,7 @@ msgstr "تاريخ الإنتهاء الفعلي" msgid "Actual End Date (via Timesheet)" msgstr "تاريخ الإنتهاء الفعلي (عبر ورقة الوقت)" -#: erpnext/manufacturing/doctype/work_order/work_order.py:229 +#: erpnext/manufacturing/doctype/work_order/work_order.py:230 msgid "Actual End Date cannot be before Actual Start Date" msgstr "تاريخ النهاية الفعلي لا يمكن أن يكون قبل تاريخ البداية الفعلي" @@ -2546,7 +2546,7 @@ msgstr "نوع الضريبة الفعلي لا يمكن تضمينه في مع msgid "Ad-hoc Qty" msgstr "الكَميَّة المخصصة" -#: erpnext/stock/doctype/item/item.js:688 +#: erpnext/stock/doctype/item/item.js:675 #: erpnext/stock/doctype/price_list/price_list.js:8 msgid "Add / Edit Prices" msgstr "إضافة و تعديل الأسعار" @@ -3045,7 +3045,7 @@ msgstr "معلومة اضافية" msgid "Additional Information updated successfully." msgstr "تم تحديث المعلومات الإضافية بنجاح." -#: erpnext/manufacturing/doctype/work_order/work_order.js:836 +#: erpnext/manufacturing/doctype/work_order/work_order.js:818 msgid "Additional Material Transfer" msgstr "نقل مواد إضافية" @@ -3068,7 +3068,7 @@ msgstr "تكاليف تشغيل اضافية" msgid "Additional Transferred Qty" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:710 +#: erpnext/manufacturing/doctype/work_order/work_order.py:711 msgid "Additional Transferred Qty {0}\n" "\t\t\t\t\tcannot be greater than {1}.\n" "\t\t\t\t\tTo fix this, increase the percentage value\n" @@ -3226,11 +3226,6 @@ msgstr "يجب ربط العنوان بشركة. الرجاء إضافة صف ل msgid "Address used to determine Tax Category in transactions" msgstr "العنوان المستخدم لتحديد فئة الضريبة في المعاملات" -#. Label of the adjust_qty (Float) field in DocType 'Sales Forecast Item' -#: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json -msgid "Adjust Qty" -msgstr "ضبط الكميَّة" - #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:1160 msgid "Adjustment Against" msgstr "" @@ -3243,8 +3238,8 @@ msgstr "" msgid "Administrative Assistant" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:103 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:168 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:107 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:173 msgid "Administrative Expenses" msgstr "نفقات إدارية" @@ -3312,7 +3307,7 @@ msgstr "حالة الدفع المسبّق" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/controllers/accounts_controller.py:287 +#: erpnext/controllers/accounts_controller.py:288 #: erpnext/setup/doctype/company/company.json msgid "Advance Payments" msgstr "دفعات مقدمة" @@ -3574,11 +3569,11 @@ msgstr "عمر" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:154 #: erpnext/accounts/report/accounts_payable/accounts_payable.html:138 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:139 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1279 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1202 msgid "Age (Days)" msgstr "(العمر (أيام" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:228 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:216 msgid "Age ({0})" msgstr "السن ({0})" @@ -3728,21 +3723,21 @@ msgstr "جميع مجموعات العملاء" #: erpnext/patches/v11_0/update_department_lft_rgt.py:9 #: erpnext/patches/v11_0/update_department_lft_rgt.py:11 #: erpnext/patches/v11_0/update_department_lft_rgt.py:16 -#: erpnext/setup/doctype/company/company.py:437 -#: erpnext/setup/doctype/company/company.py:440 -#: erpnext/setup/doctype/company/company.py:445 -#: erpnext/setup/doctype/company/company.py:451 -#: erpnext/setup/doctype/company/company.py:457 -#: erpnext/setup/doctype/company/company.py:463 -#: erpnext/setup/doctype/company/company.py:469 -#: erpnext/setup/doctype/company/company.py:475 -#: erpnext/setup/doctype/company/company.py:481 -#: erpnext/setup/doctype/company/company.py:487 -#: erpnext/setup/doctype/company/company.py:493 -#: erpnext/setup/doctype/company/company.py:499 -#: erpnext/setup/doctype/company/company.py:505 -#: erpnext/setup/doctype/company/company.py:511 -#: erpnext/setup/doctype/company/company.py:517 +#: erpnext/setup/doctype/company/company.py:441 +#: erpnext/setup/doctype/company/company.py:444 +#: erpnext/setup/doctype/company/company.py:449 +#: erpnext/setup/doctype/company/company.py:455 +#: erpnext/setup/doctype/company/company.py:461 +#: erpnext/setup/doctype/company/company.py:467 +#: erpnext/setup/doctype/company/company.py:473 +#: erpnext/setup/doctype/company/company.py:479 +#: erpnext/setup/doctype/company/company.py:485 +#: erpnext/setup/doctype/company/company.py:491 +#: erpnext/setup/doctype/company/company.py:497 +#: erpnext/setup/doctype/company/company.py:503 +#: erpnext/setup/doctype/company/company.py:509 +#: erpnext/setup/doctype/company/company.py:515 +#: erpnext/setup/doctype/company/company.py:521 msgid "All Departments" msgstr "جميع الاقسام" @@ -3822,7 +3817,7 @@ msgstr "جميع مجموعات الموردين" msgid "All Territories" msgstr "جميع الأقاليم" -#: erpnext/setup/doctype/company/company.py:382 +#: erpnext/setup/doctype/company/company.py:386 msgid "All Warehouses" msgstr "جميع المخازن" @@ -3844,15 +3839,15 @@ msgstr "جميع العناصر مطلوبة مسبقاً" msgid "All items have already been Invoiced/Returned" msgstr "تم بالفعل تحرير / إرجاع جميع العناصر" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:1236 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:1277 msgid "All items have already been received" msgstr "تم استلام جميع العناصر مسبقاً" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3319 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:138 msgid "All items have already been transferred for this Work Order." msgstr "جميع الإصناف تم نقلها لأمر العمل" -#: erpnext/public/js/controllers/transaction.js:2948 +#: erpnext/public/js/controllers/transaction.js:2950 msgid "All items in this document already have a linked Quality Inspection." msgstr "" @@ -3874,11 +3869,11 @@ msgstr "" msgid "All the items have been already returned." msgstr "تم إرجاع جميع العناصر مسبقاً." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1274 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1256 msgid "All the required items (raw materials) will be fetched from BOM and populated in this table. Here you can also change the Source Warehouse for any item. And during the production, you can track transferred raw materials from this table." msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:872 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:913 msgid "All these items have already been Invoiced/Returned" msgstr "تم بالفعل إصدار فاتورة / إرجاع جميع هذه العناصر" @@ -3994,7 +3989,7 @@ msgstr "الكمية المخصصة" #. Label of the allow_account_creation_against_child_company (Check) field in #. DocType 'Company' -#: erpnext/accounts/doctype/account/account.py:544 +#: erpnext/accounts/doctype/account/account.py:545 #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:68 #: erpnext/setup/doctype/company/company.json msgid "Allow Account Creation Against Child Company" @@ -4058,7 +4053,7 @@ msgstr "السماح في المرتجعات" msgid "Allow Internal Transfers at Arm's Length Price" msgstr "" -#: erpnext/controllers/selling_controller.py:858 +#: erpnext/controllers/selling_controller.py:859 msgid "Allow Item to Be Added Multiple Times in a Transaction" msgstr "" @@ -4448,8 +4443,8 @@ msgid "Also you can't switch back to FIFO after setting the valuation method to msgstr "" #: erpnext/manufacturing/doctype/bom/bom.js:288 -#: erpnext/manufacturing/doctype/work_order/work_order.js:165 -#: erpnext/manufacturing/doctype/work_order/work_order.js:180 +#: erpnext/manufacturing/doctype/work_order/work_order.js:146 +#: erpnext/manufacturing/doctype/work_order/work_order.js:161 #: erpnext/public/js/utils.js:587 #: erpnext/stock/doctype/stock_entry/stock_entry.js:322 msgid "Alternate Item" @@ -4690,7 +4685,7 @@ msgstr "" msgid "Amount" msgstr "كمية" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:22 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:34 msgid "Amount (AED)" msgstr "المبلغ (بالدرهم الإماراتي)" @@ -4824,12 +4819,12 @@ msgid "Amount to Bill" msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1259 -msgid "Amount {0} {1} against {2} {3}" -msgstr "مبلغ {0} {1} مقابل {2} {3}" +msgid "Amount {0} {1} adjusted against {2} {3}" +msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1270 -msgid "Amount {0} {1} deducted against {2}" -msgstr "مبلغ {0} {1} خصم مقابل {2}" +msgid "Amount {0} {1} as adjustment to {2}" +msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1234 msgid "Amount {0} {1} transferred from {2} to {3}" @@ -4874,7 +4869,7 @@ msgstr "الإجمالي" msgid "An Item Group is a way to classify items based on types." msgstr "مجموعة العناصر هي طريقة لتصنيف العناصر بناءً على الأنواع." -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:558 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:601 msgid "An error has been appeared while reposting item valuation via {0}" msgstr "حدث خطأ أثناء إعادة نشر تقييم العنصر عبر {0}" @@ -5430,7 +5425,7 @@ msgstr "نظراً لوجود مخزون محجوز، لا يمكنك تعطيل msgid "As there are sufficient Sub Assembly Items, Work Order is not required for Warehouse {0}." msgstr "نظرًا لوجود عناصر تجميع فرعية كافية، فإن أمر العمل غير مطلوب للمستودع {0}." -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1839 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1841 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}." msgstr "نظرًا لوجود مواد خام كافية ، فإن طلب المواد ليس مطلوبًا للمستودع {0}." @@ -5745,8 +5740,8 @@ msgstr "كَمَيَّة الأصول" #. Option for the 'Account Type' (Select) field in DocType 'Account' #. Label of the asset_received_but_not_billed (Link) field in DocType 'Company' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:165 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:279 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:169 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:284 #: erpnext/accounts/report/account_balance/account_balance.js:38 #: erpnext/setup/doctype/company/company.json msgid "Asset Received But Not Billed" @@ -6010,7 +6005,7 @@ msgstr "لم يتم إنشاء الأصول لـ {item_code}. سيكون علي msgid "Assets {assets_link} created for {item_code}" msgstr "الأصول {assets_link} التي تم إنشاؤها لـ {item_code}" -#: erpnext/manufacturing/doctype/job_card/job_card.js:240 +#: erpnext/manufacturing/doctype/job_card/job_card.js:709 msgid "Assign Job to Employee" msgstr "إسناد الوظيفة إلى الموظف" @@ -6071,7 +6066,7 @@ msgstr "يجب اختيار واحدة على الأقل من الوحدات ا msgid "At least one of the Selling or Buying must be selected" msgstr "يجب اختيار واحد على الأقل من خياري البيع أو الشراء" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:317 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:57 msgid "At least one raw material item must be present in the stock entry for the type {0}" msgstr "" @@ -6079,21 +6074,17 @@ msgstr "" msgid "At least one row is required for a financial report template" msgstr "يلزم وجود صف واحد على الأقل في نموذج التقرير المالي" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:876 -msgid "At least one warehouse is mandatory" -msgstr "يُشترط وجود مستودع واحد على الأقل" - -#: erpnext/stock/doctype/stock_entry/stock_entry.py:779 -msgid "At row #{0}: the Difference Account must not be a Stock type account, please change the Account Type for the account {1} or select a different account" -msgstr "في السطر #{0}: يجب ألا يكون حساب الفروقات حسابًا من نوع الأسهم، يُرجى تغيير نوع الحساب {1} أو تحديد حساب مختلف." +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:169 +msgid "At row #{0}: the Difference Account must not be a Stock type account..." +msgstr "" #: erpnext/manufacturing/doctype/routing/routing.py:50 msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}" msgstr "في الصف # {0}: لا يمكن أن يكون معرف التسلسل {1} أقل من معرف تسلسل الصف السابق {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:790 -msgid "At row #{0}: you have selected the Difference Account {1}, which is a Cost of Goods Sold type account. Please select a different account" -msgstr "في الصف #{0}: لقد اخترت حساب الفرق {1}، وهو حساب من نوع تكلفة البضائع المباعة. يرجى اختيار حساب مختلف." +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:180 +msgid "At row #{0}: you have selected the Difference Account {1}..." +msgstr "" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1184 msgid "At row {0}: Batch No is mandatory for Item {1}" @@ -6523,7 +6514,7 @@ msgstr "متاح للاستخدام تاريخ" #: erpnext/public/js/utils.js:647 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json -#: erpnext/stock/report/stock_ageing/stock_ageing.py:177 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:165 msgid "Available Qty" msgstr "الكمية المتاحة" @@ -6612,10 +6603,6 @@ msgstr "" msgid "Available for use date is required" msgstr "مطلوب تاريخ متاح للاستخدام" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1039 -msgid "Available quantity is {0}, you need {1}" -msgstr "الكمية المتاحة هي {0} ، تحتاج إلى {1}" - #: erpnext/stock/dashboard/item_dashboard.js:251 msgid "Available {0}" msgstr "متاح {0}" @@ -6624,8 +6611,8 @@ msgstr "متاح {0}" msgid "Available-for-use Date should be after purchase date" msgstr "يجب أن يكون التاريخ متاحًا بعد تاريخ الشراء" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:178 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:212 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:166 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:200 #: erpnext/stock/report/stock_balance/stock_balance.py:594 msgid "Average Age" msgstr "متوسط العمر" @@ -6731,7 +6718,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:216 +#: erpnext/manufacturing/doctype/work_order/work_order.js:197 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/report/bom_explorer/bom_explorer.js:8 #: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:67 @@ -6754,7 +6741,7 @@ msgstr "قائمة مكونات المواد" msgid "BOM 1" msgstr "BOM 1" -#: erpnext/manufacturing/doctype/bom/bom.py:1811 +#: erpnext/manufacturing/doctype/bom/bom.py:1832 msgid "BOM 1 {0} and BOM 2 {1} should not be same" msgstr "يجب ألا يكون BOM 1 {0} و BOM 2 {1} متطابقين" @@ -6826,11 +6813,6 @@ msgstr "قائمة المواد للصنف المفصص" msgid "BOM ID" msgstr "معرف BOM" -#. Label of the bom_info_section (Section Break) field in DocType 'Stock Entry' -#: erpnext/stock/doctype/stock_entry/stock_entry.json -msgid "BOM Info" -msgstr "معلومات BOM" - #. Name of a DocType #: erpnext/manufacturing/doctype/bom_item/bom_item.json msgid "BOM Item" @@ -6984,7 +6966,7 @@ msgstr "صنف الموقع الالكتروني بقائمة المواد" msgid "BOM Website Operation" msgstr "عملية الموقع الالكتروني بقائمة المواد" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2430 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:156 msgid "BOM and Finished Good Quantity is mandatory for Disassembly" msgstr "يُعدّ كل من قائمة المواد وكمية المنتج النهائي شرطًا أساسيًا لعملية التفكيك." @@ -7052,7 +7034,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:386 +#: erpnext/manufacturing/doctype/work_order/work_order.js:367 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Backflush Materials From WIP Warehouse" msgstr "مواد التنظيف العكسي من مستودع العمل قيد التنفيذ" @@ -7337,8 +7319,8 @@ msgid "Bank Balance" msgstr "الرصيد المصرفي" #. Label of the bank_charges (Currency) field in DocType 'Invoice Discounting' -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:133 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:219 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:137 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:224 #: erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json msgid "Bank Charges" msgstr "الرسوم المصرفية" @@ -7453,8 +7435,8 @@ msgstr "نوع الضمان المصرفي" msgid "Bank Name" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:179 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:309 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:183 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:314 msgid "Bank Overdraft Account" msgstr "حساب السحب من البنك بدون رصيد" @@ -7863,7 +7845,7 @@ msgstr "حالة انتهاء صلاحية الدفعة الصنف" #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:89 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:115 -#: erpnext/public/js/controllers/transaction.js:2865 +#: erpnext/public/js/controllers/transaction.js:2867 #: erpnext/public/js/utils/barcode_scanner.js:281 #: erpnext/public/js/utils/serial_no_batch_selector.js:450 #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -7958,7 +7940,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:368 +#: erpnext/manufacturing/doctype/work_order/work_order.js:349 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "Batch Size" @@ -7975,7 +7957,7 @@ msgstr "دفعة UOM" msgid "Batch and Serial No" msgstr "رقم الدفعة والرقم التسلسلي" -#: erpnext/manufacturing/doctype/work_order/work_order.py:937 +#: erpnext/manufacturing/doctype/work_order/work_order.py:938 msgid "Batch not created for item {} since it does not have a batch series." msgstr "لم يتم إنشاء دفعة للعنصر {} لأنه لا يحتوي على سلسلة دفعات." @@ -7998,12 +7980,12 @@ msgstr "الدفعة {0} والمستودع" msgid "Batch {0} is not available in warehouse {1}" msgstr "الدفعة {0} غير متوفرة في المستودع {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3503 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:103 #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:289 msgid "Batch {0} of Item {1} has expired." msgstr "الدفعة {0} للعنصر {1} انتهت صلاحيتها\\n
    \\nBatch {0} of Item {1} has expired." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3509 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:98 msgid "Batch {0} of Item {1} is disabled." msgstr "تم تعطيل الدفعة {0} من الصنف {1}." @@ -8058,7 +8040,7 @@ msgstr "" #. Label of the bill_date (Date) field in DocType 'Journal Entry' #. Label of the bill_date (Date) field in DocType 'Subcontracting Receipt' #: erpnext/accounts/doctype/journal_entry/journal_entry.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1264 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1187 #: erpnext/accounts/report/purchase_register/purchase_register.py:214 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Bill Date" @@ -8067,7 +8049,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:1263 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1186 #: erpnext/accounts/report/purchase_register/purchase_register.py:213 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Bill No" @@ -8081,11 +8063,13 @@ msgstr "" #. Label of a Card Break in the Manufacturing Workspace #. Label of a Link in the Manufacturing Workspace +#. Label of the bom_info_section (Section Break) field in DocType 'Stock Entry' #. Label of a Workspace Sidebar Item #: erpnext/manufacturing/doctype/bom/bom.py:1382 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/stock/doctype/material_request/material_request.js:139 #: erpnext/stock/doctype/stock_entry/stock_entry.js:774 +#: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/workspace_sidebar/subcontracting.json msgid "Bill of Materials" msgstr "فاتورة المواد" @@ -8186,7 +8170,7 @@ msgstr "تفاصيل عنوان الفوترة" msgid "Billing Address Name" msgstr "اسم عنوان تقديم الفواتير" -#: erpnext/controllers/accounts_controller.py:574 +#: erpnext/controllers/accounts_controller.py:575 msgid "Billing Address does not belong to the {0}" msgstr "عنوان الفوترة لا ينتمي إلى {0}" @@ -8793,8 +8777,8 @@ msgstr "بناء الشجرة" msgid "Buildable Qty" msgstr "الكمية القابلة للبناء" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:61 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:102 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:65 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:107 msgid "Buildings" msgstr "المباني" @@ -9012,8 +8996,8 @@ msgstr "ملاحظة إدارة علاقات العملاء" msgid "CRM Settings" msgstr "إعدادات إدارة علاقات العملاء" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:67 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:71 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:122 msgid "CWIP Account" msgstr "حساب CWIP" @@ -9268,7 +9252,7 @@ msgstr "" msgid "Can be approved by {0}" msgstr "يمكن الموافقة عليها بواسطة {0}" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2583 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2581 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state." msgstr "لا يمكن إغلاق أمر العمل. لأن {0} بطاقات العمل في حالة \"قيد التنفيذ\"." @@ -9302,12 +9286,12 @@ msgid "Can only make payment against unbilled {0}" msgstr "يمكن إجراء دفعة فقط مقابل فاتورة غير مدفوعة {0}" #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1499 -#: erpnext/controllers/accounts_controller.py:3196 +#: erpnext/controllers/accounts_controller.py:3190 #: erpnext/public/js/controllers/accounts.js:103 msgid "Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'" msgstr "لا يمكن الرجوع إلى الصف إلا إذا كان نوع الرسوم هو \"مبلغ الصف السابق\" أو \"إجمالي الصف السابق\"." -#: erpnext/setup/doctype/company/company.py:206 +#: erpnext/setup/doctype/company/company.py:209 #: erpnext/stock/doctype/stock_settings/stock_settings.py:181 msgid "Can't change the valuation method, as there are transactions against some items which do not have its own valuation method" msgstr "لا يمكن تغيير طريقة التقييم، حيث توجد معاملات على بعض البنود التي لا تملك طريقة تقييم خاصة بها." @@ -9349,7 +9333,7 @@ msgstr "لا يمكن تعيين أمين صندوق" msgid "Cannot Calculate Arrival Time as Driver Address is Missing." msgstr "لا يمكن حساب وقت الوصول حيث أن عنوان برنامج التشغيل مفقود." -#: erpnext/setup/doctype/company/company.py:225 +#: erpnext/setup/doctype/company/company.py:228 msgid "Cannot Change Inventory Account Setting" msgstr "لا يمكن تغيير إعدادات حساب المخزون" @@ -9407,7 +9391,7 @@ msgstr "لا يمكن إلغاء إدخال حجز المخزون {0}، لأنه msgid "Cannot cancel as processing of cancelled documents is pending." msgstr "لا يمكن الإلغاء لأن معالجة المستندات الملغاة لا تزال قيد الانتظار." -#: erpnext/manufacturing/doctype/work_order/work_order.py:1115 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1116 msgid "Cannot cancel because submitted Stock Entry {0} exists" msgstr "لا يمكن الإلغاء لان هناك تدوينات مخزون مقدمة {0} موجوده" @@ -9427,7 +9411,7 @@ msgstr "" msgid "Cannot cancel this document as it is linked with the submitted asset {asset_link}. Please cancel the asset to continue." msgstr "لا يمكن إلغاء هذا المستند لأنه مرتبط بالأصل المُرسَل {asset_link}. يُرجى إلغاء الأصل للمتابعة." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:554 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:418 msgid "Cannot cancel transaction for Completed Work Order." msgstr "لا يمكن إلغاء المعاملة لأمر العمل المكتمل." @@ -9435,7 +9419,7 @@ msgstr "لا يمكن إلغاء المعاملة لأمر العمل المكت msgid "Cannot change Attributes after stock transaction. Make a new Item and transfer stock to the new Item" msgstr "لا يمكن تغيير سمات بعد معاملة الأسهم. جعل عنصر جديد ونقل الأسهم إلى البند الجديد" -#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:73 +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:74 msgid "Cannot change Reference Document Type." msgstr "لا يمكن تغيير نوع المستند المرجعي." @@ -9447,7 +9431,7 @@ msgstr "لا يمكن تغيير تاريخ إيقاف الخدمة للعنصر msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this." msgstr "لا يمكن تغيير خصائص المتغير بعد معاملة المخزون. سيكون عليك عمل عنصر جديد للقيام بذلك." -#: erpnext/setup/doctype/company/company.py:330 +#: erpnext/setup/doctype/company/company.py:334 msgid "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency." msgstr "لا يمكن تغيير العملة الافتراضية للشركة، لأن هناك معاملات موجودة. يجب إلغاء المعاملات لتغيير العملة الافتراضية." @@ -9463,11 +9447,11 @@ msgstr "لا يمكن تحويل مركز التكلفة إلى حساب دفت msgid "Cannot convert Task to non-group because the following child Tasks exist: {0}." msgstr "لا يمكن تحويل المهمة إلى مهمة غير جماعية لوجود المهام الفرعية التالية: {0}." -#: erpnext/accounts/doctype/account/account.py:440 +#: erpnext/accounts/doctype/account/account.py:441 msgid "Cannot convert to Group because Account Type is selected." msgstr "لا يمكن التحويل إلى مجموعة لأن نوع الحساب محدد." -#: erpnext/accounts/doctype/account/account.py:276 +#: erpnext/accounts/doctype/account/account.py:277 msgid "Cannot covert to Group because Account Type is selected." msgstr "لا يمكن تحويل الحساب إلى تصنيف مجموعة لأن نوع الحساب تم اختياره." @@ -9475,7 +9459,7 @@ msgstr "لا يمكن تحويل الحساب إلى تصنيف مجموعة ل msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts." msgstr "لا يمكن إنشاء إدخالات حجز المخزون لإيصالات الشراء ذات التواريخ المستقبلية." -#: erpnext/selling/doctype/sales_order/sales_order.py:2023 +#: erpnext/selling/doctype/sales_order/sales_order.py:2045 #: erpnext/stock/doctype/pick_list/pick_list.py:257 msgid "Cannot create a pick list for Sales Order {0} because it has reserved stock. Please unreserve the stock in order to create a pick list." msgstr "لا يمكن إنشاء قائمة اختيار لأمر البيع {0} لأنه يحتوي على مخزون محجوز. يرجى إلغاء حجز المخزون لإنشاء قائمة الاختيار." @@ -9509,12 +9493,12 @@ msgstr "لا يمكن حذف صف الربح/الخسارة في الصرف" msgid "Cannot delete Serial No {0}, as it is used in stock transactions" msgstr "لا يمكن حذف الرقم التسلسلي {0}، لانه يتم استخدامها في قيود المخزون" -#: erpnext/controllers/accounts_controller.py:3809 +#: erpnext/controllers/accounts_controller.py:3815 msgid "Cannot delete an item which has been ordered" msgstr "لا يمكن حذف عنصر تم طلبه" #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:197 -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:784 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:785 msgid "Cannot delete protected core DocType: {0}" msgstr "" @@ -9526,7 +9510,7 @@ msgstr "" msgid "Cannot disable Serial and Batch No for Item, as there are existing records for serial / batch." msgstr "" -#: erpnext/setup/doctype/company/company.py:560 +#: erpnext/setup/doctype/company/company.py:564 msgid "Cannot disable perpetual inventory, as there are existing Stock Ledger Entries for the company {0}. Please cancel the stock transactions first and try again." msgstr "لا يمكن تعطيل الجرد الدائم، لوجود قيود دفترية للمخزون للشركة {0}. يرجى إلغاء معاملات المخزون أولاً ثم المحاولة مرة أخرى." @@ -9534,20 +9518,20 @@ msgstr "لا يمكن تعطيل الجرد الدائم، لوجود قيود msgid "Cannot disable {0} as it may lead to incorrect stock valuation." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:727 +#: erpnext/manufacturing/doctype/work_order/work_order.py:728 msgid "Cannot disassemble more than produced quantity." msgstr "لا يمكن تفكيك كمية أكبر من الكمية المنتجة." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:919 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:40 msgid "Cannot disassemble {0} qty against Stock Entry {1}. Only {2} qty available to disassemble." msgstr "" -#: erpnext/setup/doctype/company/company.py:222 +#: erpnext/setup/doctype/company/company.py:225 msgid "Cannot enable Item-wise Inventory Account, as there are existing Stock Ledger Entries for the company {0} with Warehouse-wise Inventory Account. Please cancel the stock transactions first and try again." msgstr "لا يمكن تفعيل حساب المخزون حسب الصنف، لوجود قيود دفترية للمخزون للشركة {0} مع حساب مخزون حسب المستودع. يرجى إلغاء معاملات المخزون أولاً ثم المحاولة مرة أخرى." -#: erpnext/selling/doctype/sales_order/sales_order.py:783 -#: erpnext/selling/doctype/sales_order/sales_order.py:806 +#: erpnext/selling/doctype/sales_order/sales_order.py:786 +#: erpnext/selling/doctype/sales_order/sales_order.py:809 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No." msgstr "لا يمكن ضمان التسليم بواسطة Serial No حيث أن العنصر {0} مضاف مع وبدون ضمان التسليم بواسطة Serial No." @@ -9563,7 +9547,7 @@ msgstr "لا يمكن العثور على المنتج أو المستودع ب msgid "Cannot find Item with this Barcode" msgstr "لا يمكن العثور على عنصر بهذا الرمز الشريطي" -#: erpnext/controllers/accounts_controller.py:3761 +#: erpnext/controllers/accounts_controller.py:3767 msgid "Cannot find a default warehouse for item {0}. Please set one in the Item Master or in Stock Settings." msgstr "تعذر العثور على مستودع افتراضي للصنف {0}. يرجى تحديد مستودع في بيانات الصنف الرئيسية أو في إعدادات المخزون." @@ -9571,15 +9555,15 @@ msgstr "تعذر العثور على مستودع افتراضي للصنف {0}. msgid "Cannot merge {0} '{1}' into '{2}' as both have existing accounting entries in different currencies for company '{3}'." msgstr "لا يمكن دمج {0} '{1}' في '{2}' حيث أن لكليهما قيود محاسبية موجودة بعملات مختلفة للشركة '{3}'." -#: erpnext/manufacturing/doctype/work_order/work_order.py:577 +#: erpnext/manufacturing/doctype/work_order/work_order.py:578 msgid "Cannot produce more Item {0} than Sales Order quantity {1} {2}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1472 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1473 msgid "Cannot produce more item for {0}" msgstr "لا يمكن إنتاج المزيد من العناصر لـ {0}" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1476 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1477 msgid "Cannot produce more than {0} items for {1}" msgstr "لا يمكن إنتاج أكثر من {0} عنصرًا لـ {1}" @@ -9587,12 +9571,12 @@ msgstr "لا يمكن إنتاج أكثر من {0} عنصرًا لـ {1}" msgid "Cannot receive from customer against negative outstanding" msgstr "" -#: erpnext/controllers/accounts_controller.py:4083 +#: erpnext/controllers/accounts_controller.py:4089 msgid "Cannot reduce quantity than ordered or purchased quantity" msgstr "لا يمكن تقليل الكمية عن الكمية المطلوبة أو المشتراة" #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1512 -#: erpnext/controllers/accounts_controller.py:3211 +#: erpnext/controllers/accounts_controller.py:3205 #: erpnext/public/js/controllers/accounts.js:120 msgid "Cannot refer row number greater than or equal to current row number for this Charge type" msgstr "لا يمكن أن يشير رقم الصف أكبر من أو يساوي رقم الصف الحالي لهذا النوع المسؤول" @@ -9605,14 +9589,14 @@ msgstr "تعذر استرداد رمز الرابط للتحديث. راجع س msgid "Cannot retrieve link token. Check Error Log for more information" msgstr "تعذر استرداد رمز الرابط. راجع سجل الأخطاء لمزيد من المعلومات." -#: erpnext/selling/doctype/customer/customer.py:368 +#: erpnext/selling/doctype/customer/customer.py:358 msgid "Cannot select a Group type Customer Group. Please select a non-group Customer Group." msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1505 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1683 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1827 -#: erpnext/controllers/accounts_controller.py:3201 +#: erpnext/controllers/accounts_controller.py:3195 #: erpnext/public/js/controllers/accounts.js:112 #: erpnext/public/js/controllers/taxes_and_totals.js:550 msgid "Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row" @@ -9634,11 +9618,11 @@ msgstr "لا يمكن تعيين عدة عناصر افتراضية لأي شر msgid "Cannot set multiple account rows for the same company" msgstr "" -#: erpnext/controllers/accounts_controller.py:4049 +#: erpnext/controllers/accounts_controller.py:4055 msgid "Cannot set quantity less than delivered quantity." msgstr "لا يمكن ضبط كمية أقل من الكمية المسلمة." -#: erpnext/controllers/accounts_controller.py:4050 +#: erpnext/controllers/accounts_controller.py:4056 msgid "Cannot set quantity less than received quantity." msgstr "لا يمكن تعيين كمية أقل من الكمية المستلمة." @@ -9650,7 +9634,7 @@ msgstr "لا يمكن تعيين الحقل {0} للنسخ في المت msgid "Cannot start deletion. Another deletion {0} is already queued/running. Please wait for it to complete." msgstr "" -#: erpnext/controllers/accounts_controller.py:4077 +#: erpnext/controllers/accounts_controller.py:4083 msgid "Cannot update rate as item {0} is already ordered or purchased against this quotation" msgstr "" @@ -9683,7 +9667,7 @@ msgstr "السعة (وحدة قياس المخزون)" msgid "Capacity Planning" msgstr "القدرة على التخطيط" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1101 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1102 msgid "Capacity Planning Error, planned start time can not be same as end time" msgstr "خطأ في تخطيط السعة ، لا يمكن أن يكون وقت البدء المخطط له هو نفسه وقت الانتهاء" @@ -9702,13 +9686,13 @@ msgstr "السعة بوحدة قياس المخزون" msgid "Capacity must be greater than 0" msgstr "يجب أن تكون السعة أكبر من 0" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:44 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:77 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:48 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:82 msgid "Capital Equipment" msgstr "معدات رأسمالية" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:190 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:333 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:194 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:338 msgid "Capital Stock" msgstr "رأس المال" @@ -10040,7 +10024,7 @@ msgstr "قم بتغيير نوع الحساب إلى "ذمم مدينة&quo msgid "Change this date manually to setup the next synchronization start date" msgstr "قم بتغيير هذا التاريخ يدويًا لإعداد تاريخ بدء المزامنة التالي" -#: erpnext/selling/doctype/customer/customer.py:158 +#: erpnext/selling/doctype/customer/customer.py:148 msgid "Changed customer name to '{}' as '{}' already exists." msgstr "تم تغيير اسم العميل إلى '{}' لأن '{}' موجود بالفعل." @@ -10048,7 +10032,7 @@ msgstr "تم تغيير اسم العميل إلى '{}' لأن '{}' موجود msgid "Changes in {0}" msgstr "التغييرات في {0}" -#: erpnext/stock/doctype/item/item.js:385 +#: erpnext/stock/doctype/item/item.js:378 msgid "Changing Customer Group for the selected Customer is not allowed." msgstr "لا يسمح بتغيير مجموعة العملاء للعميل المحدد." @@ -10063,7 +10047,7 @@ msgid "Channel Partner" msgstr "شريك القناة" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2258 -#: erpnext/controllers/accounts_controller.py:3264 +#: erpnext/controllers/accounts_controller.py:3258 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount" msgstr "لا يمكن تضمين رسوم من النوع \"فعلي\" في الصف {0} في سعر السلعة أو المبلغ المدفوع" @@ -10117,7 +10101,7 @@ msgstr "شجرة الرسم البياني" #: erpnext/accounts/doctype/cost_center/cost_center_tree.js:52 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/public/js/setup_wizard.js:43 -#: erpnext/setup/doctype/company/company.js:123 +#: erpnext/setup/doctype/company/company.js:139 #: erpnext/setup/doctype/company/company.json #: erpnext/setup/workspace/home/home.json #: erpnext/workspace_sidebar/accounts_setup.json @@ -10260,7 +10244,7 @@ msgstr "عرض الشيك" #. Label of the reference_date (Date) field in DocType 'Payment Entry' #: erpnext/accounts/doctype/payment_entry/payment_entry.json -#: erpnext/public/js/controllers/transaction.js:2776 +#: erpnext/public/js/controllers/transaction.js:2778 msgid "Cheque/Reference Date" msgstr "تاريخ الصك / السند المرجع" @@ -10318,7 +10302,7 @@ msgstr "اسم الطفل" #. Label of the child_row_reference (Data) field in DocType 'Quality #. Inspection' -#: erpnext/public/js/controllers/transaction.js:2871 +#: erpnext/public/js/controllers/transaction.js:2873 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json msgid "Child Row Reference" msgstr "مرجع صف الطفل" @@ -10512,11 +10496,11 @@ msgstr "وثيقة مغلقة" msgid "Closed Documents" msgstr "وثائق مغلقة" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2506 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2504 msgid "Closed Work Order can not be stopped or Re-opened" msgstr "لا يمكن إيقاف أمر العمل المغلق أو إعادة فتحه." -#: erpnext/selling/doctype/sales_order/sales_order.py:542 +#: erpnext/selling/doctype/sales_order/sales_order.py:547 msgid "Closed order cannot be cancelled. Unclose to cancel." msgstr "الطلب المغلق لايمكن إلغاؤه. ازالة الاغلاق لكي تتمكن من الالغاء" @@ -10768,8 +10752,8 @@ msgstr "" msgid "Commission Rate (%)" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:104 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:172 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:108 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:177 msgid "Commission on Sales" msgstr "عمولة على المبيعات" @@ -10803,7 +10787,7 @@ msgstr "الاتصالات المتوسطة Timeslot" msgid "Communication Medium Type" msgstr "الاتصالات المتوسطة النوع" -#: erpnext/setup/install.py:107 +#: erpnext/setup/install.py:108 msgid "Compact Item Print" msgstr "مدمجة البند طباعة" @@ -11202,8 +11186,8 @@ msgstr "شركات" #: erpnext/setup/doctype/employee/employee_tree.js:8 #: erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json -#: erpnext/setup/doctype/vehicle/vehicle.json erpnext/setup/install.py:166 -#: erpnext/setup/install.py:175 erpnext/setup/workspace/home/home.json +#: erpnext/setup/doctype/vehicle/vehicle.json erpnext/setup/install.py:198 +#: erpnext/setup/install.py:207 erpnext/setup/workspace/home/home.json #: erpnext/stock/dashboard_chart_source/stock_value_by_item_group/stock_value_by_item_group.js:8 #: erpnext/stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.js:8 #: erpnext/stock/doctype/bin/bin.json @@ -11345,11 +11329,11 @@ msgstr "عرض عنوان الشركة" msgid "Company Address Name" msgstr "اسم عنوان الشركة" -#: erpnext/controllers/accounts_controller.py:4411 +#: erpnext/controllers/accounts_controller.py:4399 msgid "Company Address is missing. You don't have permission to create an Address. Please contact your System Manager." msgstr "" -#: erpnext/controllers/accounts_controller.py:4399 +#: erpnext/controllers/accounts_controller.py:4387 msgid "Company Address is missing. You don't have permission to update it. Please contact your System Manager." msgstr "عنوان الشركة غير موجود. ليس لديك صلاحية لتحديثه. يرجى الاتصال بمدير النظام." @@ -11452,7 +11436,7 @@ msgstr "اسم الشركة وتاريخ النشر إلزامي" msgid "Company and account filters not set!" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2580 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2661 msgid "Company currencies of both the companies should match for Inter Company Transactions." msgstr "يجب أن تتطابق عملات الشركة لكلتا الشركتين مع معاملات Inter Inter Company." @@ -11487,7 +11471,7 @@ msgstr "" msgid "Company link field name used for filtering (optional - leave empty to delete all records)" msgstr "" -#: erpnext/setup/doctype/company/company.js:222 +#: erpnext/setup/doctype/company/company.js:238 msgid "Company name not same" msgstr "اسم الشركة ليس مماثل\\n
    \\nCompany name not same" @@ -11526,12 +11510,12 @@ msgstr "الشركة التي يمثلها المورد الداخلي" msgid "Company {0} added multiple times" msgstr "تمت إضافة الشركة {0} عدة مرات" -#: erpnext/accounts/doctype/account/account.py:509 +#: erpnext/accounts/doctype/account/account.py:510 #: erpnext/manufacturing/report/material_requirements_planning_report/material_requirements_planning_report.py:1308 msgid "Company {0} does not exist" msgstr "الشركة {0} غير موجودة" -#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:83 +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:105 msgid "Company {0} is added more than once" msgstr "تمت إضافة الشركة {0} أكثر من مرة" @@ -11573,7 +11557,7 @@ msgstr "اسم المنافس" msgid "Competitors" msgstr "المنافسون" -#: erpnext/manufacturing/doctype/job_card/job_card.js:277 +#: erpnext/manufacturing/doctype/job_card/job_card.js:661 #: erpnext/manufacturing/doctype/workstation/workstation.js:151 msgid "Complete Job" msgstr "إنجاز العمل" @@ -11620,12 +11604,12 @@ msgstr "المشاريع المنجزة" msgid "Completed Qty" msgstr "الكمية المكتملة" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1390 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1391 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'" msgstr "لا يمكن أن تكون الكمية المكتملة أكبر من "الكمية إلى التصنيع"" -#: erpnext/manufacturing/doctype/job_card/job_card.js:331 -#: erpnext/manufacturing/doctype/job_card/job_card.js:452 +#: erpnext/manufacturing/doctype/job_card/job_card.js:259 +#: erpnext/manufacturing/doctype/job_card/job_card.js:393 #: erpnext/manufacturing/doctype/workstation/workstation.js:296 msgid "Completed Quantity" msgstr "الكمية المكتملة" @@ -11814,7 +11798,7 @@ msgstr "ضع في اعتبارك أبعاد المحاسبة" msgid "Consider Minimum Order Qty" msgstr "يرجى مراعاة الحد الأدنى لكمية الطلب" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1096 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1078 msgid "Consider Process Loss" msgstr "ضع في اعتبارك خسائر العملية" @@ -12008,7 +11992,7 @@ msgstr "تكلفة المواد المستهلكة" msgid "Consumed Qty" msgstr "تستهلك الكمية" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1766 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1767 msgid "Consumed Qty cannot be greater than Reserved Qty for item {0}" msgstr "لا يمكن أن تتجاوز الكمية المستهلكة الكمية المحجوزة للصنف {0}" @@ -12037,7 +12021,7 @@ msgstr "يُعدّ إدراج بنود المخزون المستهلكة، أو msgid "Consumed Stock Total Value" msgstr "القيمة الإجمالية للمخزون المستهلك" -#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.py:135 +#: erpnext/stock/doctype/stock_entry_type/stock_entry_type.py:136 msgid "Consumed quantity of item {0} exceeds transferred quantity." msgstr "الكمية المستهلكة من العنصر {0} تتجاوز الكمية المنقولة." @@ -12165,7 +12149,7 @@ msgstr "" msgid "Contact Person" msgstr "الشخص الذي يمكن الاتصال به" -#: erpnext/controllers/accounts_controller.py:586 +#: erpnext/controllers/accounts_controller.py:587 msgid "Contact Person does not belong to the {0}" msgstr "جهة الاتصال لا تنتمي إلى {0}" @@ -12359,15 +12343,15 @@ msgstr "معامل التحويل الافتراضي لوحدة القياس ي msgid "Conversion factor for item {0} has been reset to 1.0 as the uom {1} is same as stock uom {2}." msgstr "تمت إعادة تعيين عامل التحويل للعنصر {0} إلى 1.0 لأن وحدة القياس {1} هي نفسها وحدة قياس المخزون {2}." -#: erpnext/controllers/accounts_controller.py:2977 +#: erpnext/controllers/accounts_controller.py:2971 msgid "Conversion rate cannot be 0" msgstr "لا يمكن أن يكون معدل التحويل 0" -#: erpnext/controllers/accounts_controller.py:2984 +#: erpnext/controllers/accounts_controller.py:2978 msgid "Conversion rate is 1.00, but document currency is different from company currency" msgstr "معدل التحويل هو 1.00، لكن عملة المستند تختلف عن عملة الشركة." -#: erpnext/controllers/accounts_controller.py:2980 +#: erpnext/controllers/accounts_controller.py:2974 msgid "Conversion rate must be 1.00 if document currency is same as company currency" msgstr "يجب أن يكون معدل التحويل 1.00 إذا كانت عملة المستند هي نفسها عملة الشركة" @@ -12444,13 +12428,13 @@ msgstr "تصحيحي" msgid "Corrective Action" msgstr "اجراء تصحيحي" -#: erpnext/manufacturing/doctype/job_card/job_card.js:509 +#: erpnext/manufacturing/doctype/job_card/job_card.js:447 msgid "Corrective Job Card" msgstr "بطاقة عمل تصحيحية" #. Label of the corrective_operation_section (Tab Break) field in DocType 'Job #. Card' -#: erpnext/manufacturing/doctype/job_card/job_card.js:516 +#: erpnext/manufacturing/doctype/job_card/job_card.js:456 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "Corrective Operation" msgstr "عملية تصحيحية" @@ -12617,7 +12601,7 @@ msgstr "" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:28 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:47 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:30 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1249 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1172 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:47 #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:42 #: erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:204 @@ -12750,7 +12734,7 @@ msgstr "مركز التكلفة {} هو مركز تكلفة جماعي، ولا msgid "Cost Center: {0} does not exist" msgstr "مركز التكلفة: {0} غير موجود" -#: erpnext/setup/doctype/company/company.js:113 +#: erpnext/setup/doctype/company/company.js:129 msgid "Cost Centers" msgstr "مراكز التكلفة" @@ -12793,17 +12777,13 @@ msgstr "تكلفة السلع والمواد المسلمة" #. Label of the cost_of_good_sold_section (Section Break) field in DocType #. 'Item Default' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:84 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:143 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:88 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:148 #: erpnext/accounts/report/account_balance/account_balance.js:43 #: erpnext/stock/doctype/item_default/item_default.json msgid "Cost of Goods Sold" msgstr "تكلفة البضاعة المباعة" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:793 -msgid "Cost of Goods Sold Account in Items Table" -msgstr "حساب تكلفة البضائع المباعة في جدول الأصناف" - #: erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:40 msgid "Cost of Issued Items" msgstr "تكلفة المواد المصروفة" @@ -12883,7 +12863,7 @@ msgstr "تعذر حذف بيانات العرض التوضيحي" msgid "Could not auto create Customer due to the following missing mandatory field(s):" msgstr "تعذر إنشاء العميل تلقائيًا بسبب الحقول الإلزامية التالية المفقودة:" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:692 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:733 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again" msgstr "تعذر إنشاء إشعار دائن تلقائيًا ، يُرجى إلغاء تحديد "إشعار ائتمان الإصدار" وإرساله مرة أخرى" @@ -13072,7 +13052,7 @@ msgstr "إنشاء الفواتير" msgid "Create Item" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:206 +#: erpnext/manufacturing/doctype/work_order/work_order.js:187 msgid "Create Job Card" msgstr "إنشاء بطاقة العمل" @@ -13171,7 +13151,7 @@ msgstr "إنشاء إدخال دفع لفواتير نقاط البيع المج msgid "Create Payment Request" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:818 +#: erpnext/manufacturing/doctype/work_order/work_order.js:800 msgid "Create Pick List" msgstr "إنشاء قائمة انتقاء" @@ -13316,7 +13296,7 @@ msgstr "" msgid "Create Tasks" msgstr "" -#: erpnext/setup/doctype/company/company.js:157 +#: erpnext/setup/doctype/company/company.js:173 msgid "Create Tax Template" msgstr "إنشاء قالب الضريبة" @@ -13354,12 +13334,12 @@ msgstr "إنشاء صلاحية المستخدم" msgid "Create Users" msgstr "إنشاء المستخدمين" -#: erpnext/stock/doctype/item/item.js:984 +#: erpnext/stock/doctype/item/item.js:971 msgid "Create Variant" msgstr "إنشاء متغير" -#: erpnext/stock/doctype/item/item.js:798 -#: erpnext/stock/doctype/item/item.js:842 +#: erpnext/stock/doctype/item/item.js:785 +#: erpnext/stock/doctype/item/item.js:829 msgid "Create Variants" msgstr "إنشاء المتغيرات" @@ -13390,12 +13370,12 @@ msgstr "" msgid "Create a new rule to automatically classify transactions." msgstr "" -#: erpnext/stock/doctype/item/item.js:825 -#: erpnext/stock/doctype/item/item.js:977 +#: erpnext/stock/doctype/item/item.js:812 +#: erpnext/stock/doctype/item/item.js:964 msgid "Create a variant with the template image." msgstr "أنشئ نسخة بديلة باستخدام صورة القالب." -#: erpnext/stock/stock_ledger.py:2071 +#: erpnext/stock/stock_ledger.py:2037 msgid "Create an incoming stock transaction for the Item." msgstr "قم بإنشاء حركة مخزون واردة للصنف." @@ -13429,7 +13409,7 @@ msgstr "إنشاء {0} {1}؟" msgid "Created By Migration" msgstr "تم إنشاؤه بواسطة الهجرة" -#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:245 +#: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:220 msgid "Created {0} scorecards for {1} between:" msgstr "تم إنشاء {0} بطاقات تسجيل النقاط لـ {1} بين:" @@ -13462,7 +13442,7 @@ msgstr "إنشاء إيصال التسليم ..." msgid "Creating Delivery Schedule..." msgstr "تحديد موعد التسليم..." -#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:140 +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:162 msgid "Creating Dimensions..." msgstr "إنشاء الأبعاد ..." @@ -13655,7 +13635,7 @@ msgstr "الائتمان أيام" msgid "Credit Limit" msgstr "الحد الائتماني" -#: erpnext/selling/doctype/customer/customer.py:650 +#: erpnext/selling/doctype/customer/customer.py:640 msgid "Credit Limit Crossed" msgstr "تم تجاوز الحد الائتماني" @@ -13702,7 +13682,7 @@ msgstr "أشهر الائتمان" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:176 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1273 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1196 #: erpnext/controllers/sales_and_purchase_return.py:453 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:303 #: erpnext/stock/doctype/delivery_note/delivery_note.js:89 @@ -13730,7 +13710,7 @@ msgstr "الائتمان مذكرة صادرة" msgid "Credit Note will update it's own outstanding amount, even if 'Return Against' is specified." msgstr "ستقوم مذكرة الائتمان بتحديث المبلغ المستحق الخاص بها، حتى في حالة تحديد \"الإرجاع مقابل\"." -#: erpnext/stock/doctype/delivery_note/delivery_note.py:689 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:730 msgid "Credit Note {0} has been created automatically" msgstr "تم إنشاء ملاحظة الائتمان {0} تلقائيًا" @@ -13738,7 +13718,7 @@ msgstr "تم إنشاء ملاحظة الائتمان {0} تلقائيًا" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:376 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:384 -#: erpnext/controllers/accounts_controller.py:2376 +#: erpnext/controllers/accounts_controller.py:2377 msgid "Credit To" msgstr "دائن الى" @@ -13747,20 +13727,20 @@ msgstr "دائن الى" msgid "Credit in Company Currency" msgstr "المدين في عملة الشركة" -#: erpnext/selling/doctype/customer/customer.py:616 -#: erpnext/selling/doctype/customer/customer.py:673 +#: erpnext/selling/doctype/customer/customer.py:606 +#: erpnext/selling/doctype/customer/customer.py:663 msgid "Credit limit has been crossed for customer {0} ({1}/{2})" msgstr "تم تجاوز حد الائتمان للعميل {0} ({1} / {2})" -#: erpnext/selling/doctype/customer/customer.py:395 +#: erpnext/selling/doctype/customer/customer.py:385 msgid "Credit limit is already defined for the Company {0}" msgstr "تم تحديد حد الائتمان بالفعل للشركة {0}" -#: erpnext/selling/doctype/customer/customer.py:672 +#: erpnext/selling/doctype/customer/customer.py:662 msgid "Credit limit reached for customer {0}" msgstr "تم بلوغ حد الائتمان للعميل {0}" -#: erpnext/accounts/utils.py:2827 +#: erpnext/accounts/utils.py:2826 msgid "Credit limit warning — submission may be blocked: {0}" msgstr "" @@ -13768,8 +13748,8 @@ msgstr "" msgid "Creditor Turnover Ratio" msgstr "نسبة دوران الدائنين" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:155 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:257 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:159 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:262 msgid "Creditors" msgstr "الدائنين" @@ -13939,7 +13919,7 @@ msgstr "يجب أن يكون صرف العملات ساريًا للشراء أ msgid "Currency and Price List" msgstr "العملة وقائمة الأسعار" -#: erpnext/accounts/doctype/account/account.py:346 +#: erpnext/accounts/doctype/account/account.py:347 msgid "Currency can not be changed after making entries using some other currency" msgstr "لا يمكن تغيير العملة بعد إجراء إدخالات باستخدام بعض العملات الأخرى" @@ -13949,7 +13929,7 @@ msgstr "لا تدعم التقارير المالية المخصصة حاليً #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1604 #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1672 -#: erpnext/accounts/utils.py:2546 +#: erpnext/accounts/utils.py:2545 msgid "Currency for {0} must be {1}" msgstr "العملة ل {0} يجب أن تكون {1} \\n
    \\nCurrency for {0} must be {1}" @@ -14032,8 +14012,8 @@ msgstr "تاريخ بدء الفاتورة الحالي" msgid "Current Level" msgstr "المستوى الحالي" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:153 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:255 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:157 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:260 msgid "Current Liabilities" msgstr "الخصوم المتداولة" @@ -14391,8 +14371,8 @@ msgstr "عنوان العميل" msgid "Customer Addresses And Contacts" msgstr "عناوين العملاء وجهات الإتصال" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:159 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:269 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:163 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:274 msgid "Customer Advances" msgstr "تقدم العملاء" @@ -14406,7 +14386,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:1243 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1166 #: erpnext/buying/doctype/purchase_order/purchase_order.json #: erpnext/stock/doctype/delivery_stop/delivery_stop.json msgid "Customer Contact" @@ -14511,7 +14491,7 @@ msgstr "ملاحظات العميل" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/doctype/tax_rule/tax_rule.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:115 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1301 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1224 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:96 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:187 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:56 @@ -14571,7 +14551,7 @@ msgstr "منتج العميل" msgid "Customer Items" msgstr "منتجات العميل" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1292 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1215 msgid "Customer LPO" msgstr "العميل لبو" @@ -14623,7 +14603,7 @@ msgstr "رقم محمول العميل" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1232 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1155 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:157 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:92 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:35 @@ -14729,7 +14709,7 @@ msgstr "العملاء المقدمة" msgid "Customer Provided Item Cost" msgstr "تكلفة السلعة المقدمة من العميل" -#: erpnext/setup/doctype/company/company.py:486 +#: erpnext/setup/doctype/company/company.py:490 msgid "Customer Service" msgstr "خدمة العملاء" @@ -14787,8 +14767,8 @@ msgid "Customer required for 'Customerwise Discount'" msgstr "الزبون مطلوب للخصم المعني بالزبائن" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1142 -#: erpnext/selling/doctype/sales_order/sales_order.py:438 -#: erpnext/stock/doctype/delivery_note/delivery_note.py:436 +#: erpnext/selling/doctype/sales_order/sales_order.py:446 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:437 msgid "Customer {0} does not belong to project {1}" msgstr "العميل {0} لا ينتمي الى المشروع {1}\\n
    \\nCustomer {0} does not belong to project {1}" @@ -14900,7 +14880,7 @@ msgstr "د - هـ" msgid "DFS" msgstr "DFS" -#: erpnext/projects/doctype/project/project.py:679 +#: erpnext/projects/doctype/project/project.py:717 msgid "Daily Project Summary for {0}" msgstr "ملخص المشروع اليومي لـ {0}" @@ -14991,7 +14971,7 @@ msgstr "تاريخ الميلاد لا يمكن أن يكون بعد تاريخ msgid "Date of Commencement" msgstr "تاريخ البدء" -#: erpnext/setup/doctype/company/company.js:94 +#: erpnext/setup/doctype/company/company.js:110 msgid "Date of Commencement should be greater than Date of Incorporation" msgstr "يجب أن يكون تاريخ البدء أكبر من تاريخ التأسيس" @@ -15217,7 +15197,7 @@ msgstr "" #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:178 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1276 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1199 #: erpnext/controllers/sales_and_purchase_return.py:457 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:304 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:45 @@ -15247,7 +15227,7 @@ msgstr "ستقوم مذكرة الخصم بتحديث المبلغ المستح #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1013 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1024 -#: erpnext/controllers/accounts_controller.py:2376 +#: erpnext/controllers/accounts_controller.py:2377 msgid "Debit To" msgstr "الخصم ل" @@ -15406,14 +15386,14 @@ msgstr "الحساب الافتراضي المتقدم" #. Label of the default_advance_paid_account (Link) field in DocType 'Company' #: erpnext/setup/doctype/company/company.json -#: erpnext/setup/doctype/company/company.py:315 +#: erpnext/setup/doctype/company/company.py:319 msgid "Default Advance Paid Account" msgstr "الحساب المدفوع مقدماً الافتراضي" #. Label of the default_advance_received_account (Link) field in DocType #. 'Company' #: erpnext/setup/doctype/company/company.json -#: erpnext/setup/doctype/company/company.py:304 +#: erpnext/setup/doctype/company/company.py:308 msgid "Default Advance Received Account" msgstr "الحساب الافتراضي للمقدم المستلم" @@ -15432,15 +15412,15 @@ msgstr "الافتراضي BOM" msgid "Default BOM ({0}) must be active for this item or its template" msgstr "يجب أن تكون قائمة المواد الافتراضية ({0}) نشطة لهذا الصنف أو قوالبه" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2268 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2270 msgid "Default BOM for {0} not found" msgstr "فاتورة المواد ل {0} غير موجودة\\n
    \\nDefault BOM for {0} not found" -#: erpnext/controllers/accounts_controller.py:4121 +#: erpnext/controllers/accounts_controller.py:4109 msgid "Default BOM not found for FG Item {0}" msgstr "لم يتم العثور على قائمة مكونات افتراضية لعنصر المنتج النهائي {0}" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2265 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2267 msgid "Default BOM not found for Item {0} and Project {1}" msgstr "لم يتم العثور على قائمة المواد الافتراضية للمادة {0} والمشروع {1}" @@ -15611,6 +15591,16 @@ msgstr "المجموعة الافتراضية للمواد" msgid "Default Item Manufacturer" msgstr "الشركة المصنعة الافتراضية للعنصر" +#. Label of the default_letter_head (Link) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json +msgid "Default Letter Head (DocType)" +msgstr "" + +#. Label of the default_letter_head_report (Link) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json +msgid "Default Letter Head (Report)" +msgstr "" + #. Label of the default_manufacturer_part_no (Data) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Default Manufacturer Part No" @@ -15845,7 +15835,7 @@ msgstr "" msgid "Default settings for your stock-related transactions" msgstr "الإعدادات الافتراضية لمعاملاتك المتعلقة بالأسهم" -#: erpnext/setup/doctype/company/company.js:191 +#: erpnext/setup/doctype/company/company.js:207 msgid "Default tax templates for sales, purchase and items are created." msgstr "يتم إنشاء قوالب ضريبية افتراضية للمبيعات والمشتريات والسلع." @@ -16018,12 +16008,12 @@ msgstr "حذف العملاء المحتملين والعناوين" #. Label of the delete_transactions_status (Select) field in DocType #. 'Transaction Deletion Record' -#: erpnext/setup/doctype/company/company.js:168 +#: erpnext/setup/doctype/company/company.js:184 #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json msgid "Delete Transactions" msgstr "حذف المعاملات" -#: erpnext/setup/doctype/company/company.js:237 +#: erpnext/setup/doctype/company/company.js:253 msgid "Delete all the Transactions for this Company" msgstr "حذف كل المعاملات المتعلقة بالشركة\\n
    \\nDelete all the Transactions for this Company" @@ -16044,8 +16034,8 @@ msgstr "" msgid "Deleting {0} and all associated Common Code documents..." msgstr "حذف {0} وجميع مستندات الكود المشترك المرتبطة بها..." -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1101 -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1120 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1102 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1121 msgid "Deletion in Progress!" msgstr "جارٍ الحذف!" @@ -16156,11 +16146,11 @@ msgstr "الكمية المستلمة" msgid "Delivered Qty (in Stock UOM)" msgstr "الكمية المُسلَّمة (وحدة القياس المتوفرة في المخزون)" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:597 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:596 msgid "Delivered Qty cannot be increased by more than {0} for item {1}" msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:590 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:589 msgid "Delivered Qty cannot be reduced by more than {0} for item {1}" msgstr "" @@ -16241,7 +16231,7 @@ msgstr "مدير التوصيل" #: erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:129 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:415 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:36 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:45 #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.js:22 #: erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:21 @@ -16305,7 +16295,7 @@ msgstr "توجهات إشعارات التسليم" msgid "Delivery Note {0} is not submitted" msgstr "لم يتم اعتماد ملاحظه التسليم {0}\\n
    \\nDelivery Note {0} is not submitted" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1296 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1219 #: erpnext/stock/doctype/delivery_trip/delivery_trip.js:75 msgid "Delivery Notes" msgstr "مذكرات التسليم" @@ -16391,10 +16381,6 @@ msgstr "مستودع تسليم" msgid "Delivery to" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:457 -msgid "Delivery warehouse required for stock item {0}" -msgstr "مستودع التسليم مطلوب للبند المستودعي {0}\\n
    \\nDelivery warehouse required for stock item {0}" - #. Label of the sales_orders_and_material_requests_tab (Tab Break) field in #. DocType 'Master Production Schedule' #: erpnext/manufacturing/doctype/master_production_schedule/master_production_schedule.json @@ -16514,8 +16500,8 @@ msgstr "المبلغ المستهلك" #. Label of the depreciation_tab (Tab Break) field in DocType 'Asset' #. Group in Asset's connections #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:105 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:176 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:109 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:181 #: erpnext/accounts/report/account_balance/account_balance.js:44 #: erpnext/accounts/report/cash_flow/cash_flow.py:162 #: erpnext/assets/doctype/asset/asset.json @@ -16608,7 +16594,7 @@ msgstr "خيارات الإهلاك" msgid "Depreciation Posting Date" msgstr "تاريخ ترحيل الإهلاك" -#: erpnext/assets/doctype/asset/asset.js:917 +#: erpnext/assets/doctype/asset/asset.js:919 msgid "Depreciation Posting Date cannot be before Available-for-use Date" msgstr "لا يمكن أن يكون تاريخ ترحيل الإهلاك قبل تاريخ الإتاحة للاستخدام" @@ -16766,11 +16752,11 @@ msgstr "الفرق ( المدين - الدائن )" msgid "Difference Account" msgstr "حساب الفرق" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:782 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:172 msgid "Difference Account in Items Table" msgstr "حساب الفرق في جدول البنود" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:771 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:160 msgid "Difference Account must be a Asset/Liability type account (Temporary Opening), since this Stock Entry is an Opening Entry" msgstr "يجب أن يكون حساب الفرق حسابًا من نوع الأصول/الخصوم (افتتاح مؤقت)، لأن قيد المخزون هذا هو قيد افتتاحي." @@ -16886,15 +16872,15 @@ msgstr "أبعاد" msgid "Direct Expense" msgstr "المصاريف المباشرة" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:82 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:141 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:86 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:146 msgid "Direct Expenses" msgstr "النفقات المباشرة" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:141 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:237 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:145 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:242 msgid "Direct Income" msgstr "إيراد مباشر" @@ -16975,6 +16961,11 @@ msgstr "" msgid "Disable Serial No And Batch Selector" msgstr "تعطيل رقم التسلسل ومحدد الدفعة" +#. Label of the disable_sdbnb_in_sr (Check) field in DocType 'Company' +#: erpnext/setup/doctype/company/company.json +msgid "Disable Stock Delivered But Not Billed in Sales Return" +msgstr "" + #. Label of the disable_transaction_threshold (Check) field in DocType 'Tax #. Withholding Category' #: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json @@ -17011,11 +17002,11 @@ msgstr "لا يمكن استخدام المستودع المعطل {0} لهذه msgid "Disabled items cannot be selected in any transaction." msgstr "" -#: erpnext/controllers/accounts_controller.py:904 +#: erpnext/controllers/accounts_controller.py:905 msgid "Disabled pricing rules since this {} is an internal transfer" msgstr "تم تعطيل قواعد التسعير لأن هذا {} عبارة عن تحويل داخلي" -#: erpnext/controllers/accounts_controller.py:918 +#: erpnext/controllers/accounts_controller.py:919 msgid "Disabled tax included prices since this {} is an internal transfer" msgstr "الأسعار تشمل الضريبة المعطلة لأن هذا {} عبارة عن تحويل داخلي" @@ -17031,7 +17022,7 @@ msgstr "يعطل الجلب التلقائي للكمية الموجودة" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' -#: erpnext/manufacturing/doctype/work_order/work_order.js:1074 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1056 #: erpnext/stock/doctype/stock_entry/stock_entry.js:370 #: erpnext/stock/doctype/stock_entry/stock_entry.js:413 #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -17039,15 +17030,15 @@ msgstr "يعطل الجلب التلقائي للكمية الموجودة" msgid "Disassemble" msgstr "فكّك" -#: erpnext/manufacturing/doctype/work_order/work_order.js:232 +#: erpnext/manufacturing/doctype/work_order/work_order.js:213 msgid "Disassemble Order" msgstr "ترتيب التفكيك" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2372 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:104 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:463 +#: erpnext/manufacturing/doctype/work_order/work_order.js:445 msgid "Disassemble Qty cannot be less than or equal to 0." msgstr "" @@ -17334,7 +17325,7 @@ msgstr "سبب تقديري" msgid "Dislikes" msgstr "يكره" -#: erpnext/setup/doctype/company/company.py:480 +#: erpnext/setup/doctype/company/company.py:484 msgid "Dispatch" msgstr "ارسال" @@ -17529,8 +17520,8 @@ msgstr "توزيع الاسم" msgid "Distributor" msgstr "موزع" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:191 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:338 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:195 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:343 msgid "Dividends Paid" msgstr "توزيع الأرباح" @@ -17592,7 +17583,7 @@ msgstr "لا تظهر أي رمز مثل $ بجانب العملات." msgid "Do not update variants on save" msgstr "لا تقم بتحديث المتغيرات عند الحفظ" -#: erpnext/assets/doctype/asset/asset.js:955 +#: erpnext/assets/doctype/asset/asset.js:957 msgid "Do you really want to restore this scrapped asset?" msgstr "هل تريد حقا استعادة هذه الأصول المخردة ؟" @@ -17616,7 +17607,7 @@ msgstr "هل تريد أن تخطر جميع العملاء عن طريق الب msgid "Do you want to submit the material request" msgstr "هل ترغب في تقديم طلب المواد" -#: erpnext/manufacturing/doctype/job_card/job_card.js:111 +#: erpnext/manufacturing/doctype/job_card/job_card.js:108 msgid "Do you want to submit the stock entry?" msgstr "هل ترغب في إرسال بيانات المخزون؟" @@ -17683,11 +17674,11 @@ msgstr "" msgid "Document Type " msgstr "نوع الوثيقة" -#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:65 +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:66 msgid "Document Type already used as a dimension" msgstr "" -#: erpnext/setup/install.py:198 +#: erpnext/setup/install.py:230 msgid "Documentation" msgstr "الوثائق" @@ -17850,12 +17841,6 @@ msgstr "فئات رخصة القيادة" msgid "Driving License Category" msgstr "رخصة قيادة الفئة" -#. Label of the drop_ar_procedures (Button) field in DocType 'Accounts -#. Settings' -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -msgid "Drop Procedures" -msgstr "إجراءات التسليم" - #. Label of the drop_ship (Section Break) field in DocType 'POS Invoice Item' #. Label of the drop_ship (Section Break) field in DocType 'Sales Invoice Item' #. Label of the drop_ship (Tab Break) field in DocType 'Purchase Order' @@ -17876,12 +17861,6 @@ msgstr "" msgid "Drop some files here, or click to select files" msgstr "" -#. Description of the 'Drop Procedures' (Button) field in DocType 'Accounts -#. Settings' -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -msgid "Drops existing SQL Procedures and Function setup by Accounts Receivable report" -msgstr "يقوم بحذف إجراءات SQL الحالية وإعدادات الوظائف الخاصة بتقرير حسابات القبض" - #: erpnext/accounts/party.py:700 msgid "Due Date cannot be after {0}" msgstr "لا يمكن أن يكون تاريخ الاستحقاق بعد {0}" @@ -18040,8 +18019,8 @@ msgstr "" msgid "Duration in Days" msgstr "المدة في أيام" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:170 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:286 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:174 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:291 #: erpnext/setup/setup_wizard/operations/taxes_setup.py:256 msgid "Duties and Taxes" msgstr "الرسوم والضرائب" @@ -18124,7 +18103,7 @@ msgstr "" msgid "Each Transaction" msgstr "كل عملية" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:184 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:172 msgid "Earliest" msgstr "أولا" @@ -18238,6 +18217,10 @@ msgstr "الكمية المستهدفة أو المبلغ المستهدف، أ msgid "Either target qty or target amount is mandatory." msgstr "الكمية المستهدفة أو المبلغ المستهدف، أحدهما إلزامي" +#: erpnext/manufacturing/doctype/job_card/job_card.js:675 +msgid "Elapsed Time" +msgstr "" + #. Option for the 'Fuel Type' (Select) field in DocType 'Vehicle' #: erpnext/setup/doctype/vehicle/vehicle.json msgid "Electric" @@ -18257,8 +18240,8 @@ msgstr "كهرباء" msgid "Electricity down" msgstr "انقطاع الكهرباء" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:48 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:82 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:52 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:87 msgid "Electronic Equipment" msgstr "المعدات الإلكترونية" @@ -18462,8 +18445,8 @@ msgstr "" msgid "Employee Advances" msgstr "سلف الموظفين" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:184 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:322 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:188 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:327 msgid "Employee Benefits Obligation" msgstr "التزامات مزايا الموظفين" @@ -18546,7 +18529,7 @@ msgstr "" msgid "Employee {0} does not belong to the company {1}" msgstr "الموظف {0} لا ينتمي إلى الشركة {1}" -#: erpnext/manufacturing/doctype/job_card/job_card.py:376 +#: erpnext/manufacturing/doctype/job_card/job_card.py:377 msgid "Employee {0} is currently working on another workstation. Please assign another employee." msgstr "الموظف {0} يعمل حاليًا على محطة عمل أخرى. يرجى تعيين موظف آخر." @@ -18562,7 +18545,7 @@ msgstr "" msgid "Empty" msgstr "فارغة" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:756 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:757 msgid "Empty To Delete List" msgstr "" @@ -18759,12 +18742,6 @@ msgstr "" msgid "Enable discount accounting for selling" msgstr "" -#. Description of the 'Delivered by Supplier (Drop Ship)' (Check) field in -#. DocType 'Item' -#: erpnext/stock/doctype/item/item.json -msgid "Enable for drop shipping - supplier delivers directly to the customer without passing through your warehouse." -msgstr "" - #. Description of the 'Include Item In Manufacturing' (Check) field in DocType #. 'Item' #: erpnext/stock/doctype/item/item.json @@ -18893,8 +18870,8 @@ msgstr "لا يمكن أن يكون تاريخ الانتهاء قبل تاري #. Label of the end_time (Time) field in DocType 'Stock Reposting Settings' #. Label of the end_time (Time) field in DocType 'Service Day' #. Label of the end_time (Datetime) field in DocType 'Call Log' -#: erpnext/manufacturing/doctype/job_card/job_card.js:389 -#: erpnext/manufacturing/doctype/job_card/job_card.js:459 +#: erpnext/manufacturing/doctype/job_card/job_card.js:332 +#: erpnext/manufacturing/doctype/job_card/job_card.js:400 #: erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json #: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json #: erpnext/support/doctype/service_day/service_day.json @@ -18993,8 +18970,8 @@ msgstr "أدخل يدويًا" msgid "Enter Serial Nos" msgstr "أدخل الأرقام التسلسلية" -#: erpnext/manufacturing/doctype/job_card/job_card.js:416 -#: erpnext/manufacturing/doctype/job_card/job_card.js:485 +#: erpnext/manufacturing/doctype/job_card/job_card.js:361 +#: erpnext/manufacturing/doctype/job_card/job_card.js:423 #: erpnext/manufacturing/doctype/workstation/workstation.js:312 msgid "Enter Value" msgstr "أدخل القيمة" @@ -19019,7 +18996,7 @@ msgstr "أدخل اسمًا لقائمة العطلات هذه." msgid "Enter amount to be redeemed." msgstr "أدخل المبلغ المراد استرداده." -#: erpnext/stock/doctype/item/item.js:1146 +#: erpnext/stock/doctype/item/item.js:1133 msgid "Enter an Item Code, the name will be auto-filled the same as Item Code on clicking inside the Item Name field." msgstr "أدخل رمز الصنف، وسيتم ملء الاسم تلقائيًا بنفس رمز الصنف عند النقر داخل حقل اسم الصنف." @@ -19031,7 +19008,7 @@ msgstr "أدخل البريد الإلكتروني الخاص بالعميل" msgid "Enter customer's phone number" msgstr "أدخل رقم هاتف العميل" -#: erpnext/assets/doctype/asset/asset.js:926 +#: erpnext/assets/doctype/asset/asset.js:928 msgid "Enter date to scrap asset" msgstr "أدخل التاريخ لإلغاء الأصل" @@ -19075,7 +19052,7 @@ msgstr "أدخل اسم المستفيد قبل الإرسال." msgid "Enter the name of the bank or lending institution before submitting." msgstr "أدخل اسم البنك أو المؤسسة المقرضة قبل الإرسال." -#: erpnext/stock/doctype/item/item.js:1172 +#: erpnext/stock/doctype/item/item.js:1159 msgid "Enter the opening stock units." msgstr "أدخل وحدات المخزون الافتتاحي." @@ -19083,7 +19060,7 @@ msgstr "أدخل وحدات المخزون الافتتاحي." msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials." msgstr "أدخل كمية المنتج الذي سيتم تصنيعه من قائمة المواد هذه." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1236 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1218 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set." msgstr "أدخل الكمية المراد تصنيعها. سيتم جلب المواد الخام فقط عند تحديد هذا الخيار." @@ -19095,8 +19072,8 @@ msgstr "أدخل مبلغ {0}." msgid "Entertainment & Leisure" msgstr "الترفيه والاستجمام" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:106 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:181 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:110 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:186 msgid "Entertainment Expenses" msgstr "نفقات الترفيه" @@ -19120,8 +19097,8 @@ msgstr "نوع الدخول" #. Option for the 'Root Type' (Select) field in DocType 'Account Category' #. Option for the 'Root Type' (Select) field in DocType 'Ledger Merge' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:189 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:332 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:193 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:337 #: erpnext/accounts/doctype/account_category/account_category.json #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/report/account_balance/account_balance.js:29 @@ -19182,7 +19159,7 @@ msgstr "حدث خطأ أثناء ترحيل قيود الإهلاك" msgid "Error while processing deferred accounting for {0}" msgstr "حدث خطأ أثناء معالجة المحاسبة المؤجلة لـ {0}" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:554 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:597 msgid "Error while reposting item valuation" msgstr "حدث خطأ أثناء إعادة نشر تقييم السلعة" @@ -19260,7 +19237,7 @@ msgstr "مثال: ABCD. #####. إذا تم ضبط المسلسل ولم يتم msgid "Example: If the transaction amount is 200, then this will be calculated as {} = {}" msgstr "" -#: erpnext/stock/stock_ledger.py:2334 +#: erpnext/stock/stock_ledger.py:2300 msgid "Example: Serial No {0} reserved in {1}." msgstr "مثال: الرقم التسلسلي {0} محجوز في {1}." @@ -19270,7 +19247,7 @@ msgstr "مثال: الرقم التسلسلي {0} محجوز في {1}." msgid "Exception Budget Approver Role" msgstr "دور الموافقة على الموازنة الاستثنائية" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:926 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:47 msgid "Excess Disassembly" msgstr "" @@ -19278,7 +19255,7 @@ msgstr "" msgid "Excess Materials Consumed" msgstr "المواد الزائدة المستهلكة" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1133 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1141 msgid "Excess Transfer" msgstr "التحويل الزائد" @@ -19309,17 +19286,17 @@ msgstr "الربح أو الخسارة في الصرف" #. Invoice Advance' #. Label of the exchange_gain_loss (Currency) field in DocType 'Sales Invoice #. Advance' -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:131 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:217 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:135 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:222 #: erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json #: erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json #: erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json -#: erpnext/setup/doctype/company/company.py:673 +#: erpnext/setup/doctype/company/company.py:678 msgid "Exchange Gain/Loss" msgstr "أرباح / خسائر الناتجة عن صرف العملة" -#: erpnext/controllers/accounts_controller.py:1777 -#: erpnext/controllers/accounts_controller.py:1862 +#: erpnext/controllers/accounts_controller.py:1778 +#: erpnext/controllers/accounts_controller.py:1863 msgid "Exchange Gain/Loss amount has been booked through {0}" msgstr "تم تسجيل مبلغ الربح/الخسارة من خلال {0}" @@ -19458,7 +19435,7 @@ msgstr "مساعد تنفيذي" msgid "Executive Search" msgstr "البحث عن الكفاءات التنفيذية" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:67 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:79 msgid "Exempt Supplies" msgstr "اللوازم المعفاة" @@ -19545,7 +19522,7 @@ msgstr "تاريخ الإغلاق المتوقع" msgid "Expected Delivery Date" msgstr "تاريخ التسليم المتوقع" -#: erpnext/selling/doctype/sales_order/sales_order.py:419 +#: erpnext/selling/doctype/sales_order/sales_order.py:429 msgid "Expected Delivery Date should be after Sales Order Date" msgstr "يجب أن يكون تاريخ التسليم المتوقع بعد تاريخ أمر المبيعات" @@ -19629,7 +19606,7 @@ msgstr "القيمة المتوقعة بعد حياة مفيدة" msgid "Expense" msgstr "نفقة" -#: erpnext/controllers/stock_controller.py:947 +#: erpnext/controllers/stock_controller.py:948 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account" msgstr "حساب نفقات / قروق ({0}) يجب ان يكون حساب ارباح و خسائر" @@ -19707,23 +19684,23 @@ msgstr "اجباري حساب النفقات للصنف {0}" msgid "Expense for this item will be recognized over a period of months. Eg: prepaid insurance or annual software license" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:81 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:140 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:85 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:145 msgid "Expenses" msgstr "النفقات" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:88 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:148 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:92 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:153 #: erpnext/accounts/report/account_balance/account_balance.js:49 msgid "Expenses Included In Asset Valuation" msgstr "النفقات المدرجة في تقييم الأصول" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:92 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:153 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:96 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:158 #: erpnext/accounts/report/account_balance/account_balance.js:51 msgid "Expenses Included In Valuation" msgstr "المصروفات متضمنة في تقييم السعر" @@ -19802,7 +19779,7 @@ msgstr "سجل العمل الخارجي" msgid "Extra Consumed Qty" msgstr "كمية إضافية مستهلكة" -#: erpnext/manufacturing/doctype/job_card/job_card.py:263 +#: erpnext/manufacturing/doctype/job_card/job_card.py:264 msgid "Extra Job Card Quantity" msgstr "عدد بطاقات العمل الإضافية" @@ -19939,7 +19916,7 @@ msgstr "أخفق إعداد الشركة" msgid "Failed to setup defaults" msgstr "فشل في إعداد الإعدادات الافتراضية" -#: erpnext/setup/doctype/company/company.py:855 +#: erpnext/setup/doctype/company/company.py:860 msgid "Failed to setup defaults for country {0}. Please contact support." msgstr "فشل إعداد الإعدادات الافتراضية للبلد {0}. يرجى الاتصال بالدعم." @@ -20094,21 +20071,29 @@ msgstr "رسم الخرائط الميدانية" msgid "Field in Bank Transaction" msgstr "الحقل في المعاملات المصرفية" +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:95 +msgid "Fieldname Conflict" +msgstr "" + +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:87 +msgid "Fieldname {0} already exists in the following doctypes: {1}. A separate dimension field will not be added to these doctypes. GL Entries will use the value of the existing field as the dimension value." +msgstr "" + #. Description of the 'Do not update variants on save' (Check) field in DocType #. 'Item Variant Settings' #: erpnext/stock/doctype/item_variant_settings/item_variant_settings.json msgid "Fields will be copied over only at time of creation." msgstr "سيتم نسخ الحقول فقط في وقت الإنشاء." -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1068 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1069 msgid "File does not belong to this Transaction Deletion Record" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1062 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1063 msgid "File not found" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1076 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1077 msgid "File not found on server" msgstr "" @@ -20316,9 +20301,9 @@ msgstr "تبدأ السنة المالية في" msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) " msgstr "سيتم إنشاء التقارير المالية باستخدام أنواع مستندات إدخال دفتر الأستاذ العام (يجب تمكينها إذا لم يتم ترحيل قسيمة إغلاق الفترة لجميع السنوات بالتسلسل أو إذا كانت مفقودة). " -#: erpnext/manufacturing/doctype/work_order/work_order.js:902 -#: erpnext/manufacturing/doctype/work_order/work_order.js:917 -#: erpnext/manufacturing/doctype/work_order/work_order.js:926 +#: erpnext/manufacturing/doctype/work_order/work_order.js:884 +#: erpnext/manufacturing/doctype/work_order/work_order.js:899 +#: erpnext/manufacturing/doctype/work_order/work_order.js:908 msgid "Finish" msgstr "إنهاء" @@ -20375,15 +20360,15 @@ msgstr "الكمية من المنتج النهائي" msgid "Finished Good Item Quantity" msgstr "المنتج النهائي الجيد الكمية" -#: erpnext/controllers/accounts_controller.py:4107 +#: erpnext/controllers/accounts_controller.py:4095 msgid "Finished Good Item is not specified for service item {0}" msgstr "لم يتم تحديد المنتج النهائي لعنصر الخدمة {0}" -#: erpnext/controllers/accounts_controller.py:4124 +#: erpnext/controllers/accounts_controller.py:4112 msgid "Finished Good Item {0} Qty can not be zero" msgstr "المنتج النهائي {0} لا يمكن أن تكون الكمية صفرًا" -#: erpnext/controllers/accounts_controller.py:4118 +#: erpnext/controllers/accounts_controller.py:4106 msgid "Finished Good Item {0} must be a sub-contracted item" msgstr "يجب أن يكون المنتج النهائي {0} منتجًا تم التعاقد عليه من الباطن" @@ -20429,7 +20414,7 @@ msgid "Finished Good {0} must be a sub-contracted item." msgstr "يجب أن يكون المنتج النهائي {0} عنصرًا تم التعاقد عليه من الباطن." #: erpnext/selling/doctype/sales_order/sales_order.js:1475 -#: erpnext/setup/doctype/company/company.py:385 +#: erpnext/setup/doctype/company/company.py:389 msgid "Finished Goods" msgstr "السلع تامة الصنع" @@ -20470,7 +20455,7 @@ msgstr "مستودع البضائع الجاهزة" msgid "Finished Goods based Operating Cost" msgstr "تكلفة التشغيل بناءً على المنتجات النهائية" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1749 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:862 msgid "Finished Item {0} does not match with Work Order {1}" msgstr "المنتج النهائي {0} لا يتطابق مع أمر العمل {1}" @@ -20648,8 +20633,8 @@ msgstr "نسبة دوران الأصول الثابتة" msgid "Fixed Asset item {0} cannot be used in BOMs." msgstr "لا يمكن استخدام عنصر الأصول الثابتة {0} في قوائم المواد." -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:43 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:76 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:47 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:81 msgid "Fixed Assets" msgstr "الاصول الثابتة" @@ -20722,7 +20707,7 @@ msgstr "اتبع التقويم الأشهر" msgid "Following Material Requests have been raised automatically based on Item's re-order level" msgstr "تم رفع طلبات المواد التالية تلقائيا بناء على مستوى اعادة الطلب للبنود" -#: erpnext/selling/doctype/customer/customer.py:843 +#: erpnext/selling/doctype/customer/customer.py:833 msgid "Following fields are mandatory to create address:" msgstr "الحقول التالية إلزامية لإنشاء العنوان:" @@ -20779,7 +20764,7 @@ msgstr "للشركة" msgid "For Item" msgstr "للمنتج" -#: erpnext/controllers/stock_controller.py:1606 +#: erpnext/controllers/stock_controller.py:1607 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}" msgstr "لا يمكن استلام أكثر من الكمية {1} من المنتج {0} مقابل الكمية {2} {3}" @@ -20789,7 +20774,7 @@ msgid "For Job Card" msgstr "للحصول على بطاقة العمل" #. Label of the for_operation (Link) field in DocType 'Job Card' -#: erpnext/manufacturing/doctype/job_card/job_card.js:529 +#: erpnext/manufacturing/doctype/job_card/job_card.js:465 #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "For Operation" msgstr "للتشغيل" @@ -20810,17 +20795,13 @@ msgstr "لائحة الأسعار" msgid "For Production" msgstr "للإنتاج" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:893 -msgid "For Quantity (Manufactured Qty) is mandatory" -msgstr "للكمية (الكمية المصنعة) إلزامية\\n
    \\nFor Quantity (Manufactured Qty) is mandatory" - #. Label of the material_request_planning (Section Break) field in DocType #. 'Production Plan' #: erpnext/manufacturing/doctype/production_plan/production_plan.json msgid "For Raw Materials" msgstr "للمواد الخام" -#: erpnext/controllers/accounts_controller.py:1442 +#: erpnext/controllers/accounts_controller.py:1443 msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}" msgstr "بالنسبة لفواتير الإرجاع ذات تأثير المخزون، لا يُسمح بوجود عناصر بكمية '0'. تتأثر الصفوف التالية: {0}" @@ -20904,7 +20885,7 @@ msgstr "" msgid "For operation {0} at row {1}, please add raw materials or set a BOM against it." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2653 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2651 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})" msgstr "بالنسبة للعملية {0}: لا يمكن أن تكون الكمية ({1}) أكبر من الكمية المعلقة ({2})." @@ -20921,7 +20902,7 @@ msgstr "" msgid "For projected and forecast quantities, the system will consider all child warehouses under the selected parent warehouse." msgstr "بالنسبة للكميات المتوقعة والمتنبأ بها، سيأخذ النظام في الاعتبار جميع المستودعات الفرعية التابعة للمستودع الرئيسي المحدد." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1781 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:894 msgid "For quantity {0} should not be greater than allowed quantity {1}" msgstr "يجب ألا تتجاوز الكمية {0} الكمية المسموح بها {1}" @@ -20935,7 +20916,7 @@ msgstr "للرجوع إليها" msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included" msgstr "بالنسبة للصف {0} في {1}، يجب تضمين الصف {2} في سعر الصنف. لإضافة الصف {3} إلى سعر الصنف، يجب أيضًا إضافة الصف {3}." -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1726 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1728 msgid "For row {0}: Enter Planned Qty" msgstr "بالنسبة إلى الصف {0}: أدخل الكمية المخطط لها" @@ -20954,7 +20935,7 @@ msgstr "بالنسبة لشرط "تطبيق القاعدة على أخرى& msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes" msgstr "لتسهيل الأمر على العملاء، يمكن استخدام هذه الرموز في نماذج الطباعة مثل الفواتير وإشعارات التسليم." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1064 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:773 msgid "For the item {0}, the consumed quantity should be {1} according to the BOM {2}." msgstr "" @@ -21001,11 +20982,6 @@ msgstr "توقعات" msgid "Forecast Demand" msgstr "توقعات الطلب" -#. Label of the forecast_qty (Float) field in DocType 'Sales Forecast Item' -#: erpnext/manufacturing/doctype/sales_forecast_item/sales_forecast_item.json -msgid "Forecast Qty" -msgstr "الكمية المتوقعة" - #. Label of a Workspace Sidebar Item #: erpnext/workspace_sidebar/manufacturing.json msgid "Forecasting" @@ -21051,7 +21027,7 @@ msgstr "مشاركات المنتدى" msgid "Forum URL" msgstr "رابط المنتدى" -#: erpnext/setup/install.py:210 +#: erpnext/setup/install.py:242 msgid "Frappe School" msgstr "مدرسة فرابيه" @@ -21096,8 +21072,8 @@ msgstr "عنصر حر غير مضبوط في قاعدة التسعير {0}" msgid "Freeze Stocks Older Than (Days)" msgstr "تجميد المخزونات أقدم من (أيام)" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:107 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:185 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:111 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:190 msgid "Freight and Forwarding Charges" msgstr "رسوم الشحن" @@ -21531,8 +21507,8 @@ msgstr "مدفوع بالكامل" msgid "Furlong" msgstr "فورلونج" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:52 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:87 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:56 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:92 msgid "Furniture and Fixtures" msgstr "الأثاث والتجهيزات" @@ -21549,13 +21525,13 @@ msgid "Further nodes can be only created under 'Group' type nodes" msgstr "العقد الإضافية التي يمكن أن تنشأ إلا في ظل العقد نوع ' المجموعة '" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:188 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1288 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1211 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:179 msgid "Future Payment Amount" msgstr "مبلغ الدفع المستقبلي" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:187 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1287 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1210 msgid "Future Payment Ref" msgstr "الدفع في المستقبل المرجع" @@ -21648,9 +21624,9 @@ msgstr "تم تسجيل الربح/الخسارة بالفعل" msgid "Gain/Loss from Revaluation" msgstr "الربح/الخسارة من إعادة التقييم" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:134 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:220 -#: erpnext/setup/doctype/company/company.py:681 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:138 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:225 +#: erpnext/setup/doctype/company/company.py:686 msgid "Gain/Loss on Asset Disposal" msgstr "الربح / الخسارة عند التخلص من الأصول" @@ -22094,7 +22070,7 @@ msgstr "الأهداف" msgid "Goods" msgstr "البضائع" -#: erpnext/setup/doctype/company/company.py:386 +#: erpnext/setup/doctype/company/company.py:390 #: erpnext/stock/doctype/stock_entry/stock_entry_list.js:21 msgid "Goods In Transit" msgstr "البضائع في العبور" @@ -22103,7 +22079,7 @@ msgstr "البضائع في العبور" msgid "Goods Transferred" msgstr "نقل البضائع" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2299 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1379 msgid "Goods are already received against the outward entry {0}" msgstr "تم استلام البضائع بالفعل مقابل الإدخال الخارجي {0}" @@ -22729,7 +22705,7 @@ msgstr "يساعدك ذلك على توزيع الميزانية/الهدف عل msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}" msgstr "فيما يلي سجلات الأخطاء الخاصة بإدخالات الإهلاك الفاشلة المذكورة أعلاه: {0}" -#: erpnext/stock/stock_ledger.py:2056 +#: erpnext/stock/stock_ledger.py:2022 msgid "Here are the options to proceed:" msgstr "فيما يلي الخيارات المتاحة للمتابعة:" @@ -22757,7 +22733,7 @@ msgstr "هنا، يتم ملء أيام إجازاتك الأسبوعية مسب msgid "Hertz" msgstr "هيرتز" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:556 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:599 msgid "Hi," msgstr "أهلاً،" @@ -22956,7 +22932,7 @@ msgstr "كيفية تنسيق وعرض القيم في التقرير المال msgid "Hrs" msgstr "ساعات" -#: erpnext/setup/doctype/company/company.py:492 +#: erpnext/setup/doctype/company/company.py:496 msgid "Human Resources" msgstr "الموارد البشرية" @@ -23124,6 +23100,12 @@ msgstr "في حال تم تحديده، سيتم اعتبار مبلغ الضر msgid "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount" msgstr "إذا كانت محددة، سيتم النظر في مقدار ضريبة كمدرجة بالفعل في قيم الطباعة / مقدار الطباعة" +#. Description of the 'Delivered by Supplier (Drop Ship)' (Check) field in +#. DocType 'Item' +#: erpnext/stock/doctype/item/item.json +msgid "If checked, this item is treated as drop-shipped by default in Sales Orders, Sales Invoices and Purchase Orders. The flag can be overridden on each transaction line." +msgstr "" + #: erpnext/public/js/setup_wizard.js:56 msgid "If checked, we will create demo data for you to explore the system. This demo data can be erased later." msgstr "في حال تفعيل هذا الخيار، سنقوم بإنشاء بيانات تجريبية لتتمكن من استكشاف النظام. ويمكن حذف هذه البيانات التجريبية لاحقاً." @@ -23342,7 +23324,7 @@ msgstr "" msgid "If no taxes are set, and Taxes and Charges Template is selected, the system will automatically apply the taxes from the chosen template." msgstr "إذا لم يتم تحديد أي ضرائب، وتم اختيار نموذج الضرائب والرسوم، فسيقوم النظام تلقائيًا بتطبيق الضرائب من النموذج المختار." -#: erpnext/stock/stock_ledger.py:2066 +#: erpnext/stock/stock_ledger.py:2032 msgid "If not, you can Cancel / Submit this entry" msgstr "وإلا يمكنك إلغاء / إرسال هذا الإدخال" @@ -23374,7 +23356,7 @@ msgstr "إذا تم تحديد قاعدة تسعير لحقل \"السعر\"، msgid "If set, the system does not use the user's Email or the standard outgoing Email account for sending request for quotations." msgstr "في حال تم ضبط هذا الخيار، فإن النظام لا يستخدم بريد المستخدم الإلكتروني أو حساب البريد الإلكتروني الصادر القياسي لإرسال طلبات عروض الأسعار." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1269 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1251 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected." msgstr "إذا نتج عن قائمة المواد مواد خردة، فيجب تحديد مستودع الخردة." @@ -23383,7 +23365,7 @@ msgstr "إذا نتج عن قائمة المواد مواد خردة، فيجب msgid "If the account is frozen, entries are allowed to restricted users." msgstr "إذا الحساب مجمد، يسمح بالدخول إلى المستخدمين المحددين." -#: erpnext/stock/stock_ledger.py:2059 +#: erpnext/stock/stock_ledger.py:2025 msgid "If the item is transacting as a Zero Valuation Rate item in this entry, please enable 'Allow Zero Valuation Rate' in the {0} Item table." msgstr "إذا كان العنصر يتعامل كعنصر سعر تقييم صفري في هذا الإدخال ، فالرجاء تمكين "السماح بمعدل تقييم صفري" في جدول العناصر {0}." @@ -23393,7 +23375,7 @@ msgstr "إذا كان العنصر يتعامل كعنصر سعر تقييم ص msgid "If the reorder check is set at the Group warehouse level, the available quantity becomes the sum of the projected quantities of all its child warehouses." msgstr "إذا تم تعيين فحص إعادة الطلب على مستوى مستودع المجموعة، فإن الكمية المتاحة تصبح مجموع الكميات المتوقعة لجميع المستودعات الفرعية التابعة لها." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1288 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1270 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed." msgstr "إذا كانت قائمة المواد المحددة تحتوي على عمليات مذكورة فيها، فسيقوم النظام بجلب جميع العمليات من قائمة المواد، ويمكن تغيير هذه القيم." @@ -23470,7 +23452,7 @@ msgstr "إذا كانت مدة صلاحية نقاط الولاء غير محد msgid "If yes, then this warehouse will be used to store rejected materials" msgstr "إذا كانت الإجابة بنعم، فسيتم استخدام هذا المستودع لتخزين المواد المرفوضة" -#: erpnext/stock/doctype/item/item.js:1158 +#: erpnext/stock/doctype/item/item.js:1145 msgid "If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item." msgstr "إذا كنت تحتفظ بمخزون من هذا الصنف في مخزونك، فسيقوم نظام ERPNext بإجراء قيد في دفتر الأستاذ للمخزون لكل معاملة لهذا الصنف." @@ -23484,7 +23466,7 @@ msgstr "إذا كنت ترغب في مطابقة معاملات محددة مع msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox." msgstr "إذا كنت لا تزال ترغب في المتابعة، فيرجى تعطيل خانة الاختيار \"تخطي عناصر التجميع الفرعية المتاحة\"." -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1844 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1846 msgid "If you still want to proceed, please enable {0}." msgstr "إذا كنت لا تزال ترغب في المتابعة، يرجى تفعيل {0}." @@ -23568,7 +23550,7 @@ msgstr "تجاهل سجلات إعادة تقييم سعر الصرف وسجلا msgid "Ignore Existing Ordered Qty" msgstr "تجاهل الكمية الموجودة المطلوبة" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1836 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1838 msgid "Ignore Existing Projected Quantity" msgstr "تجاهل الكمية الموجودة المتوقعة" @@ -23659,8 +23641,8 @@ msgstr "يتجاهل هذا النظام حقل \"هل الرصيد الافتت msgid "Image in the description has been removed. To disable this behavior, uncheck \"{0}\" in {1}." msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:135 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:229 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:139 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:234 msgid "Impairment" msgstr "ضعف" @@ -23942,7 +23924,7 @@ msgstr "في حالة البرنامج متعدد المستويات، سيتم msgid "In this case, the amount will be calculated as 25% of the transaction amount. If the transaction amount is 200, then this will be calculated as 200 * 0.25 = 50." msgstr "" -#: erpnext/stock/doctype/item/item.js:1191 +#: erpnext/stock/doctype/item/item.js:1178 msgid "In this section, you can define Company-wide transaction-related defaults for this Item. Eg. Default Warehouse, Default Price List, Supplier, etc." msgstr "في هذا القسم، يمكنك تحديد الإعدادات الافتراضية المتعلقة بالمعاملات على مستوى الشركة لهذا العنصر. على سبيل المثال: المستودع الافتراضي، وقائمة الأسعار الافتراضية، والمورد الافتراضي، وما إلى ذلك." @@ -24173,8 +24155,8 @@ msgstr "بما في ذلك السلع للمجموعات الفرعية" #. Option for the 'Type' (Select) field in DocType 'Process Deferred #. Accounting' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:140 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:236 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:144 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:241 #: erpnext/accounts/doctype/account_category/account_category.json #: erpnext/accounts/doctype/ledger_merge/ledger_merge.json #: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json @@ -24285,7 +24267,7 @@ msgstr "تسجيل دخول غير صحيح (مجموعة) إلى مستودع msgid "Incorrect Company" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1071 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:780 msgid "Incorrect Component Quantity" msgstr "كمية المكونات غير صحيحة" @@ -24419,15 +24401,15 @@ msgstr "يشير إلى أن الحزمة هو جزء من هذا التسليم msgid "Indirect Expense" msgstr "المصاريف غير المباشرة" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:102 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:167 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:106 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:172 msgid "Indirect Expenses" msgstr "نفقات غير مباشرة" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:145 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:242 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:149 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:247 msgid "Indirect Income" msgstr "دخل غير مباشرة" @@ -24495,14 +24477,14 @@ msgstr "بدأت" msgid "Inspected By" msgstr "تفتيش من قبل" -#: erpnext/controllers/stock_controller.py:1500 -#: erpnext/manufacturing/doctype/job_card/job_card.py:833 +#: erpnext/controllers/stock_controller.py:1501 +#: erpnext/manufacturing/doctype/job_card/job_card.py:834 msgid "Inspection Rejected" msgstr "تم رفض التفتيش" #. Label of the inspection_required (Check) field in DocType 'Stock Entry' -#: erpnext/controllers/stock_controller.py:1470 -#: erpnext/controllers/stock_controller.py:1472 +#: erpnext/controllers/stock_controller.py:1471 +#: erpnext/controllers/stock_controller.py:1473 #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Inspection Required" msgstr "التفتيش مطلوب" @@ -24519,8 +24501,8 @@ msgstr "التفتيش المطلوبة قبل تسليم" msgid "Inspection Required before Purchase" msgstr "التفتيش المطلوبة قبل الشراء" -#: erpnext/controllers/stock_controller.py:1485 -#: erpnext/manufacturing/doctype/job_card/job_card.py:814 +#: erpnext/controllers/stock_controller.py:1486 +#: erpnext/manufacturing/doctype/job_card/job_card.py:815 msgid "Inspection Submission" msgstr "طلب فحص" @@ -24550,7 +24532,7 @@ msgstr "ملاحظة التثبيت" msgid "Installation Note Item" msgstr "ملاحظة تثبيت الإغلاق" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:643 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:684 msgid "Installation Note {0} has already been submitted" msgstr "مذكرة التسليم {0} ارسلت\\n
    \\nInstallation Note {0} has already been submitted" @@ -24589,11 +24571,11 @@ msgstr "تعليمات" msgid "Insufficient Capacity" msgstr "سعة غير كافية" -#: erpnext/controllers/accounts_controller.py:4008 -#: erpnext/controllers/accounts_controller.py:4032 -#: erpnext/controllers/accounts_controller.py:4441 -#: erpnext/controllers/accounts_controller.py:4447 -#: erpnext/controllers/accounts_controller.py:4469 +#: erpnext/controllers/accounts_controller.py:4014 +#: erpnext/controllers/accounts_controller.py:4038 +#: erpnext/controllers/accounts_controller.py:4429 +#: erpnext/controllers/accounts_controller.py:4435 +#: erpnext/controllers/accounts_controller.py:4457 msgid "Insufficient Permissions" msgstr "أذونات غير كافية" @@ -24601,13 +24583,12 @@ msgstr "أذونات غير كافية" #: erpnext/stock/doctype/pick_list/pick_list.py:147 #: erpnext/stock/doctype/pick_list/pick_list.py:165 #: erpnext/stock/doctype/pick_list/pick_list.py:1092 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1043 -#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1747 -#: erpnext/stock/stock_ledger.py:2225 +#: erpnext/stock/serial_batch_bundle.py:1226 erpnext/stock/stock_ledger.py:1713 +#: erpnext/stock/stock_ledger.py:2191 msgid "Insufficient Stock" msgstr "المالية غير كافية" -#: erpnext/stock/stock_ledger.py:2240 +#: erpnext/stock/stock_ledger.py:2206 msgid "Insufficient Stock for Batch" msgstr "المخزون غير كافٍ للدفعة" @@ -24727,13 +24708,13 @@ msgstr "مرجع التحويل الداخلي" msgid "Interest" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:132 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:218 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:136 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:223 msgid "Interest Expense" msgstr "مصروفات الفائدة" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:146 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:243 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:150 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:248 msgid "Interest Income" msgstr "دخل الفوائد" @@ -24741,8 +24722,8 @@ msgstr "دخل الفوائد" msgid "Interest and/or dunning fee" msgstr "الفائدة و/أو رسوم المطالبة" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:147 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:244 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:151 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:249 msgid "Interest on Fixed Deposits" msgstr "الفائدة على الودائع الثابتة" @@ -24762,7 +24743,7 @@ msgstr "داخلي" msgid "Internal Customer Accounting" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:256 +#: erpnext/selling/doctype/customer/customer.py:246 msgid "Internal Customer for company {0} already exists" msgstr "يوجد بالفعل عميل داخلي للشركة {0}" @@ -24770,7 +24751,7 @@ msgstr "يوجد بالفعل عميل داخلي للشركة {0}" msgid "Internal Purchase Order" msgstr "أمر شراء داخلي" -#: erpnext/controllers/accounts_controller.py:804 +#: erpnext/controllers/accounts_controller.py:805 msgid "Internal Sale or Delivery Reference missing." msgstr "رقم مرجع البيع أو التسليم الداخلي مفقود." @@ -24778,7 +24759,7 @@ msgstr "رقم مرجع البيع أو التسليم الداخلي مفقود msgid "Internal Sales Order" msgstr "أمر بيع داخلي" -#: erpnext/controllers/accounts_controller.py:806 +#: erpnext/controllers/accounts_controller.py:807 msgid "Internal Sales Reference Missing" msgstr "رقم مرجع المبيعات الداخلي مفقود" @@ -24809,7 +24790,7 @@ msgstr "يوجد بالفعل مورد داخلي لشركة {0}" msgid "Internal Transfer" msgstr "نقل داخلي" -#: erpnext/controllers/accounts_controller.py:815 +#: erpnext/controllers/accounts_controller.py:816 msgid "Internal Transfer Reference Missing" msgstr "رقم مرجع التحويل الداخلي مفقود" @@ -24822,7 +24803,7 @@ msgstr "التحويلات الداخلية" msgid "Internal Work History" msgstr "سجل العمل الداخلي" -#: erpnext/controllers/stock_controller.py:1567 +#: erpnext/controllers/stock_controller.py:1568 msgid "Internal transfers can only be done in company's default currency" msgstr "لا يمكن إجراء التحويلات الداخلية إلا بالعملة الافتراضية للشركة" @@ -24842,8 +24823,8 @@ msgstr "يجب أن تكون الفترة الزمنية بين 1 و 59 دقيق #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1029 #: erpnext/assets/doctype/asset_category/asset_category.py:69 #: erpnext/assets/doctype/asset_category/asset_category.py:97 -#: erpnext/controllers/accounts_controller.py:3225 -#: erpnext/controllers/accounts_controller.py:3233 +#: erpnext/controllers/accounts_controller.py:3219 +#: erpnext/controllers/accounts_controller.py:3227 msgid "Invalid Account" msgstr "حساب غير صالح" @@ -24864,7 +24845,7 @@ msgstr "مبلغ غير صالح" msgid "Invalid Attribute" msgstr "خاصية غير صالحة" -#: erpnext/controllers/accounts_controller.py:626 +#: erpnext/controllers/accounts_controller.py:627 msgid "Invalid Auto Repeat Date" msgstr "تاريخ التكرار التلقائي غير صالح" @@ -24877,7 +24858,7 @@ msgstr "" msgid "Invalid Barcode. There is no Item attached to this barcode." msgstr "الباركود غير صالح. لا يوجد عنصر مرفق بهذا الرمز الشريطي." -#: erpnext/public/js/controllers/transaction.js:3132 +#: erpnext/public/js/controllers/transaction.js:3134 msgid "Invalid Blanket Order for the selected Customer and Item" msgstr "طلب فارغ غير صالح للعميل والعنصر المحدد" @@ -24893,21 +24874,21 @@ msgstr "إجراء الطفل غير صالح" msgid "Invalid Company Field" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2355 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2436 msgid "Invalid Company for Inter Company Transaction." msgstr "شركة غير صالحة للمعاملات بين الشركات." #: erpnext/assets/doctype/asset/asset.py:362 #: erpnext/assets/doctype/asset/asset.py:369 -#: erpnext/controllers/accounts_controller.py:3248 +#: erpnext/controllers/accounts_controller.py:3242 msgid "Invalid Cost Center" msgstr "مركز تكلفة غير صالح" -#: erpnext/selling/doctype/customer/customer.py:369 +#: erpnext/selling/doctype/customer/customer.py:359 msgid "Invalid Customer Group" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:421 +#: erpnext/selling/doctype/sales_order/sales_order.py:431 msgid "Invalid Delivery Date" msgstr "تاريخ تسليم غير صالح" @@ -24967,7 +24948,7 @@ msgstr "إدخال فتح غير صالح" msgid "Invalid POS Invoices" msgstr "فواتير نقاط البيع غير صالحة" -#: erpnext/accounts/doctype/account/account.py:387 +#: erpnext/accounts/doctype/account/account.py:388 msgid "Invalid Parent Account" msgstr "حساب الوالد غير صالح" @@ -25001,12 +24982,12 @@ msgstr "تكوين فقدان العملية غير صالح" msgid "Invalid Purchase Invoice" msgstr "فاتورة شراء غير صالحة" -#: erpnext/controllers/accounts_controller.py:4045 -#: erpnext/controllers/accounts_controller.py:4059 +#: erpnext/controllers/accounts_controller.py:4051 +#: erpnext/controllers/accounts_controller.py:4065 msgid "Invalid Qty" msgstr "كمية غير صالحة" -#: erpnext/controllers/accounts_controller.py:1460 +#: erpnext/controllers/accounts_controller.py:1461 msgid "Invalid Quantity" msgstr "كمية غير صحيحة" @@ -25031,12 +25012,12 @@ msgstr "جدول غير صالح" msgid "Invalid Selling Price" msgstr "سعر البيع غير صالح" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1824 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:937 msgid "Invalid Serial and Batch Bundle" msgstr "رقم تسلسلي وحزمة دفعات غير صالحة" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1105 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1127 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:43 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:65 msgid "Invalid Source and Target Warehouse" msgstr "مصدر ومستودع هدف غير صالحين" @@ -25061,7 +25042,7 @@ msgstr "مبلغ غير صالح في القيود المحاسبية لـ {} {} msgid "Invalid condition expression" msgstr "تعبير شرط غير صالح" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1057 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1058 msgid "Invalid file URL" msgstr "" @@ -25108,7 +25089,7 @@ msgstr "قيمة غير صالحة {0} للحساب {1} مقابل الحساب msgid "Invalid {0}" msgstr "غير صالح {0}" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2353 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2434 msgid "Invalid {0} for Inter Company Transaction." msgstr "غير صالح {0} للمعاملات بين الشركات." @@ -25118,7 +25099,7 @@ msgid "Invalid {0}: {1}" msgstr "{0} غير صالح : {1}\\n
    \\nInvalid {0}: {1}" #. Label of the inventory_section (Tab Break) field in DocType 'Item' -#: erpnext/setup/install.py:385 erpnext/stock/doctype/item/item.json +#: erpnext/setup/install.py:417 erpnext/stock/doctype/item/item.json msgid "Inventory" msgstr "جرد" @@ -25167,8 +25148,8 @@ msgstr "" msgid "Investment Banking" msgstr "الخدمات المصرفية الاستثمارية" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:72 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:124 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:76 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:129 msgid "Investments" msgstr "الاستثمارات" @@ -25218,7 +25199,7 @@ msgstr "خصم الفواتير" msgid "Invoice Document Type Selection Error" msgstr "خطأ في تحديد نوع مستند الفاتورة" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1268 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1191 msgid "Invoice Grand Total" msgstr "الفاتورة الكبرى المجموع" @@ -25323,7 +25304,7 @@ msgstr "لا يمكن إجراء الفاتورة لمدة صفر ساعة" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:171 #: erpnext/accounts/report/accounts_payable/accounts_payable.html:139 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:140 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1270 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1193 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:166 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:194 msgid "Invoiced Amount" @@ -25344,7 +25325,7 @@ msgstr "الكمية المفوترة" #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json #: erpnext/accounts/doctype/pos_profile/pos_profile.json -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2404 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2485 #: erpnext/buying/doctype/supplier/supplier.json #: erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62 msgid "Invoices" @@ -25440,8 +25421,7 @@ msgstr "هل البديل" msgid "Is Billable" msgstr "هو قابل للفوترة" -#. Label of the is_billing_contact (Check) field in DocType 'Contact' -#: erpnext/erpnext_integrations/custom/contact.json +#: erpnext/setup/install.py:170 msgid "Is Billing Contact" msgstr "هل يوجد اتصال بالفواتير؟" @@ -25883,8 +25863,7 @@ msgstr "هل القالب" msgid "Is Transporter" msgstr "هو الناقل" -#. Label of the is_your_company_address (Check) field in DocType 'Address' -#: erpnext/accounts/custom/address.json +#: erpnext/setup/install.py:161 msgid "Is Your Company Address" msgstr "هل عنوان شركتك هو" @@ -25990,8 +25969,8 @@ msgstr "نوع القضية" #. Description of the 'Is Rate Adjustment Entry (Debit Note)' (Check) field in #. DocType 'Sales Invoice' #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -msgid "Issue a debit note with 0 qty against an existing Sales Invoice" -msgstr "إصدار إشعار مدين بكمية صفر مقابل فاتورة مبيعات قائمة" +msgid "Issue a debit note against an existing Sales Invoice to adjust the rate. The quantity will be retained from the original invoice." +msgstr "" #. Option for the 'Current State' (Select) field in DocType 'Share Balance' #. Option for the 'Status' (Select) field in DocType 'Material Request' @@ -26025,7 +26004,7 @@ msgstr "تاريخ الإصدار" msgid "It can take upto few hours for accurate stock values to be visible after merging items." msgstr "قد يستغرق الأمر بضع ساعات حتى تظهر قيم المخزون الدقيقة بعد دمج العناصر." -#: erpnext/public/js/controllers/transaction.js:2533 +#: erpnext/public/js/controllers/transaction.js:2535 msgid "It is needed to fetch Item Details." msgstr "هناك حاجة لجلب تفاصيل البند." @@ -26397,7 +26376,7 @@ msgstr "سلة التسوق" #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:86 #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:119 #: erpnext/projects/doctype/timesheet/timesheet.js:214 -#: erpnext/public/js/controllers/transaction.js:2827 +#: erpnext/public/js/controllers/transaction.js:2829 #: erpnext/public/js/stock_reservation.js:112 #: erpnext/public/js/stock_reservation.js:318 erpnext/public/js/utils.js:579 #: erpnext/public/js/utils.js:736 @@ -26459,7 +26438,7 @@ msgstr "سلة التسوق" #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.js:8 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:433 #: erpnext/stock/report/serial_no_ledger/serial_no_ledger.js:7 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:138 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:126 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:104 #: erpnext/stock/report/stock_qty_vs_batch_qty/stock_qty_vs_batch_qty.py:25 #: erpnext/stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:26 @@ -26658,7 +26637,7 @@ msgstr "بيانات الصنف" #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.js:37 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:99 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:148 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:136 #: erpnext/stock/report/stock_analytics/stock_analytics.js:8 #: erpnext/stock/report/stock_analytics/stock_analytics.py:52 #: erpnext/stock/report/stock_balance/stock_balance.js:32 @@ -26881,7 +26860,7 @@ msgstr "مادة المصنع" #: erpnext/manufacturing/report/production_planning_report/production_planning_report.py:371 #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:92 #: erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:138 -#: erpnext/public/js/controllers/transaction.js:2833 +#: erpnext/public/js/controllers/transaction.js:2835 #: erpnext/public/js/utils.js:826 #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order/sales_order.js:1324 @@ -26921,7 +26900,7 @@ msgstr "مادة المصنع" #: erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:54 #: erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py:133 #: erpnext/stock/report/serial_no_and_batch_traceability/serial_no_and_batch_traceability.py:440 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:145 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:133 #: erpnext/stock/report/stock_analytics/stock_analytics.py:45 #: erpnext/stock/report/stock_balance/stock_balance.py:480 #: erpnext/stock/report/stock_ledger/stock_ledger.py:292 @@ -26965,10 +26944,6 @@ msgstr "المنتج غير متوفر" msgid "Item Price" msgstr "سعر الصنف" -#: erpnext/stock/get_item_details.py:1136 -msgid "Item Price Added for {0} in Price List {1}" -msgstr "" - #. Label of the item_price_settings_section (Section Break) field in DocType #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -26984,9 +26959,10 @@ msgstr "إعدادات سعر المنتج" msgid "Item Price Stock" msgstr "سعر صنف المخزون" -#: erpnext/stock/get_item_details.py:1160 -msgid "Item Price added for {0} in Price List {1}" -msgstr "تم اضافتة سعر الصنف لـ {0} في قائمة الأسعار {1}" +#: erpnext/stock/get_item_details.py:1155 +#: erpnext/stock/get_item_details.py:1179 +msgid "Item Price added for {0} in Price List - {1}" +msgstr "" #: erpnext/stock/doctype/item_price/item_price.py:140 msgid "Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, Batch, UOM, Qty, and Dates." @@ -26996,7 +26972,7 @@ msgstr "يظهر سعر الصنف عدة مرات بناءً على قائمة msgid "Item Price created at rate {0}" msgstr "" -#: erpnext/stock/get_item_details.py:1119 +#: erpnext/stock/get_item_details.py:1138 msgid "Item Price updated for {0} in Price List {1}" msgstr "سعر الصنف محدث ل{0} في قائمة الأسعار {1}" @@ -27183,7 +27159,7 @@ msgstr "الصنف تفاصيل متغير" msgid "Item Variant Settings" msgstr "إعدادات متنوع السلعة" -#: erpnext/stock/doctype/item/item.js:1007 +#: erpnext/stock/doctype/item/item.js:994 msgid "Item Variant {0} already exists with same attributes" msgstr "متغير الصنف {0} موجود بالفعل مع نفس الخصائص" @@ -27288,7 +27264,7 @@ msgstr "المنتج والمستودع" msgid "Item and Warranty Details" msgstr "البند والضمان تفاصيل" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3482 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:297 msgid "Item for row {0} does not match Material Request" msgstr "عنصر الصف {0} لا يتطابق مع طلب المواد" @@ -27318,11 +27294,7 @@ msgstr "اسم السلعة" msgid "Item operation" msgstr "عملية الصنف" -#: erpnext/controllers/accounts_controller.py:4099 -msgid "Item qty can not be updated as raw materials are already processed." -msgstr "لا يمكن تحديث كمية الصنف لأن المواد الخام قد تمت معالجتها بالفعل." - -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1242 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:605 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}" msgstr "تم تحديث سعر السلعة إلى الصفر حيث تم تحديد خيار \"السماح بسعر تقييم صفري\" للسلعة {0}" @@ -27345,7 +27317,7 @@ msgstr "جارٍ إعادة نشر تقييم الأصناف. قد يُظهر ا msgid "Item variant {0} exists with same attributes" msgstr "متغير العنصر {0} موجود بنفس السمات\\n
    \\nItem variant {0} exists with same attributes" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:564 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:563 msgid "Item with name {0} not found in the Purchase Order" msgstr "" @@ -27374,7 +27346,7 @@ msgstr "الصنف{0} غير موجود في النظام أو انتهت صلا msgid "Item {0} does not exist." msgstr "العنصر {0} غير موجود\\n
    \\nItem {0} does not exist." -#: erpnext/controllers/selling_controller.py:855 +#: erpnext/controllers/selling_controller.py:856 msgid "Item {0} entered multiple times." msgstr "تم إدخال العنصر {0} عدة مرات." @@ -27386,11 +27358,11 @@ msgstr "تمت إرجاع الصنف{0} من قبل" msgid "Item {0} has been disabled" msgstr "الصنف{0} تم تعطيله" -#: erpnext/selling/doctype/sales_order/sales_order.py:790 +#: erpnext/selling/doctype/sales_order/sales_order.py:793 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No" msgstr "العنصر {0} ليس له رقم تسلسلي. يتم تسليم العناصر ذات الأرقام التسلسلية فقط بناءً على الرقم التسلسلي." -#: erpnext/buying/doctype/purchase_order/purchase_order.py:583 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:582 msgid "Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity." msgstr "" @@ -27414,7 +27386,7 @@ msgstr "تم إلغاء العنصر {0}\\n
    \\nItem {0} is cancelled" msgid "Item {0} is disabled" msgstr "تم تعطيل البند {0}" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:569 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:568 msgid "Item {0} is not a drop ship item. Only drop ship items can have Delivered Qty updated." msgstr "" @@ -27434,7 +27406,7 @@ msgstr "العنصر {0} ليس عنصرًا متعاقدًا عليه من ال msgid "Item {0} is not a template item." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2211 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1302 msgid "Item {0} is not active or end of life has been reached" msgstr "البند {0} غير نشط أو تم التوصل إلى نهاية الحياة" @@ -27450,7 +27422,7 @@ msgstr "يجب أن يكون العنصر {0} عنصرًا غير متوفر ف msgid "Item {0} must be a non-stock item" msgstr "الصنف {0} يجب ألا يكون صنف مخزن
    Item {0} must be a non-stock item" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1575 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:59 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}" msgstr "العنصر {0} غير موجود في جدول \"المواد الخام الموردة\" في {1} {2}" @@ -27466,7 +27438,7 @@ msgstr "البند {0} الكمية المطلوبة {1} لا يمكن أن تك msgid "Item {0}: {1} qty produced. " msgstr "العنصر {0}: {1} الكمية المنتجة." -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1462 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1384 msgid "Item {} does not exist." msgstr "العنصر {} غير موجود." @@ -27512,7 +27484,7 @@ msgstr "سجل حركة مبيعات وفقاً للصنف" msgid "Item-wise sales Register" msgstr "" -#: erpnext/stock/get_item_details.py:724 +#: erpnext/stock/get_item_details.py:743 msgid "Item/Item Code required to get Item Tax Template." msgstr "يلزم وجود رمز الصنف/الصنف للحصول على نموذج ضريبة الصنف." @@ -27536,7 +27508,7 @@ msgstr "كتالوج العناصر" msgid "Items Filter" msgstr "تصفية الاصناف" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1688 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1690 #: erpnext/selling/doctype/sales_order/sales_order.js:1757 msgid "Items Required" msgstr "العناصر المطلوبة" @@ -27560,11 +27532,11 @@ msgstr "اصناف يمكن طلبه" msgid "Items and Pricing" msgstr "السلع والتسعيرات" -#: erpnext/controllers/accounts_controller.py:4255 +#: erpnext/controllers/accounts_controller.py:4243 msgid "Items cannot be updated as Subcontracting Inward Order(s) exist against this Subcontracted Sales Order." msgstr "لا يمكن تحديث العناصر لوجود أوامر واردة من الباطن مرتبطة بأمر البيع هذا." -#: erpnext/controllers/accounts_controller.py:4248 +#: erpnext/controllers/accounts_controller.py:4236 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}." msgstr "لا يمكن تحديث العناصر لأن أمر التعاقد من الباطن يتم إنشاؤه مقابل أمر الشراء {0}." @@ -27576,7 +27548,7 @@ msgstr "عناصر لطلب المواد الخام" msgid "Items not found." msgstr "لم يتم العثور على العناصر." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1238 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:601 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}" msgstr "تم تحديث سعر الأصناف إلى الصفر حيث تم تحديد خيار \"السماح بسعر تقييم صفري\" للأصناف التالية: {0}" @@ -27586,7 +27558,7 @@ msgstr "تم تحديث سعر الأصناف إلى الصفر حيث تم تح msgid "Items to Be Repost" msgstr "عناصر سيتم إعادة نشرها" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1687 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1689 msgid "Items to Manufacture are required to pull the Raw Materials associated with it." msgstr "العناصر المطلوب تصنيعها لسحب المواد الخام المرتبطة بها." @@ -27651,9 +27623,9 @@ msgstr "القدرة الوظيفية" #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/job_card/job_card.py:998 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1004 #: erpnext/manufacturing/doctype/operation/operation.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:415 +#: erpnext/manufacturing/doctype/work_order/work_order.js:396 #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:29 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:86 @@ -27715,7 +27687,7 @@ msgstr "سجل وقت بطاقة العمل" msgid "Job Card and Capacity Planning" msgstr "بطاقة العمل وتخطيط القدرات" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1474 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1491 msgid "Job Card {0} has been completed" msgstr "تم إكمال بطاقة العمل {0}" @@ -27791,7 +27763,7 @@ msgstr "اسم العامل" msgid "Job Worker Warehouse" msgstr "مستودع عامل التوظيف" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2708 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2706 msgid "Job card {0} created" msgstr "تم إنشاء بطاقة العمل {0}" @@ -28011,7 +27983,7 @@ msgstr "كيلوواط" msgid "Kilowatt-Hour" msgstr "كيلوواط ساعة" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1000 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1006 msgid "Kindly cancel the Manufacturing Entries first against the work order {0}." msgstr "يرجى إلغاء إدخالات التصنيع أولاً مقابل أمر العمل {0}." @@ -28139,7 +28111,7 @@ msgstr "تاريخ الانتهاء الأخير" msgid "Last Fiscal Year" msgstr "" -#: erpnext/accounts/doctype/account/account.py:660 +#: erpnext/accounts/doctype/account/account.py:661 msgid "Last GL Entry update was done {}. This operation is not allowed while system is actively being used. Please wait for 5 minutes before retrying." msgstr "تم آخر تحديث لإدخال دفتر الأستاذ العام {}. لا يُسمح بهذه العملية أثناء استخدام النظام. يُرجى الانتظار 5 دقائق قبل إعادة المحاولة." @@ -28221,7 +28193,7 @@ msgstr "لا يمكن أن يكون تاريخ فحص الكربون الأخي msgid "Last transacted" msgstr "آخر عملية تم إجراؤها" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:185 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:173 msgid "Latest" msgstr "اخير" @@ -28472,12 +28444,12 @@ msgstr "ملاعب ليجاسي" msgid "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization." msgstr "كيان قانوني / شركة تابعة لها مخطط حسابات منفصل خاص بالمنظمة." -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:111 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:190 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:115 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:195 msgid "Legal Expenses" msgstr "نفقات قانونية" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:19 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:31 msgid "Legend" msgstr "أسطورة" @@ -28700,8 +28672,8 @@ msgstr "تاريخ بدء القرض" msgid "Loan Start Date and Loan Period are mandatory to save the Invoice Discounting" msgstr "تاريخ بدء القرض وفترة القرض إلزامية لحفظ خصم الفاتورة" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:176 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:300 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:180 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:305 msgid "Loans (Liabilities)" msgstr "القروض (الخصوم)" @@ -28746,8 +28718,8 @@ msgstr "سجل معدل بيع وشراء سلعة ما" msgid "Logo" msgstr "شعار" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:183 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:318 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:187 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:323 msgid "Long-term Provisions" msgstr "أحكام طويلة الأجل" @@ -28991,10 +28963,10 @@ msgstr "عطل الآلة" msgid "Machine operator errors" msgstr "أخطاء مشغل الآلة" -#: erpnext/setup/doctype/company/company.py:719 -#: erpnext/setup/doctype/company/company.py:734 -#: erpnext/setup/doctype/company/company.py:735 -#: erpnext/setup/doctype/company/company.py:736 +#: erpnext/setup/doctype/company/company.py:724 +#: erpnext/setup/doctype/company/company.py:739 +#: erpnext/setup/doctype/company/company.py:740 +#: erpnext/setup/doctype/company/company.py:741 msgid "Main" msgstr "رئيسي" @@ -29237,9 +29209,9 @@ msgstr "المواد الرئيسية والاختيارية التي تم در #. Label of the make (Data) field in DocType 'Vehicle' #: erpnext/accounts/doctype/journal_entry/journal_entry.js:127 -#: erpnext/manufacturing/doctype/job_card/job_card.js:550 -#: erpnext/manufacturing/doctype/work_order/work_order.js:857 -#: erpnext/manufacturing/doctype/work_order/work_order.js:891 +#: erpnext/manufacturing/doctype/job_card/job_card.js:480 +#: erpnext/manufacturing/doctype/work_order/work_order.js:839 +#: erpnext/manufacturing/doctype/work_order/work_order.js:873 #: erpnext/setup/doctype/vehicle/vehicle.json msgid "Make" msgstr "سنة الصنع" @@ -29259,7 +29231,7 @@ msgstr "انشئ قيد اهلاك" msgid "Make Difference Entry" msgstr "جعل دخول الفرق" -#: erpnext/stock/doctype/item/item.js:696 +#: erpnext/stock/doctype/item/item.js:683 msgid "Make Lead Time" msgstr "حدد وقتاً كافياً للتنفيذ" @@ -29297,12 +29269,12 @@ msgstr "انشاء فاتورة المبيعات" msgid "Make Serial No / Batch from Work Order" msgstr "إنشاء رقم تسلسلي / دفعة من أمر العمل" -#: erpnext/manufacturing/doctype/job_card/job_card.js:109 +#: erpnext/manufacturing/doctype/job_card/job_card.js:106 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.js:256 msgid "Make Stock Entry" msgstr "جعل دخول الأسهم" -#: erpnext/manufacturing/doctype/job_card/job_card.js:424 +#: erpnext/manufacturing/doctype/job_card/job_card.js:369 msgid "Make Subcontracting PO" msgstr "إنشاء أمر شراء للتعاقد من الباطن" @@ -29318,11 +29290,11 @@ msgstr "إجراء مكالمة" msgid "Make project from a template." msgstr "جعل المشروع من قالب." -#: erpnext/stock/doctype/item/item.js:804 +#: erpnext/stock/doctype/item/item.js:791 msgid "Make {0} Variant" msgstr "إنشاء نسخة {0}" -#: erpnext/stock/doctype/item/item.js:806 +#: erpnext/stock/doctype/item/item.js:793 msgid "Make {0} Variants" msgstr "إنشاء متغيرات {0}" @@ -29330,8 +29302,8 @@ msgstr "إنشاء متغيرات {0}" msgid "Making Journal Entries against advance accounts: {0} is not recommended. These Journals won't be available for Reconciliation." msgstr "لا يُنصح بإجراء قيود يومية على الحسابات المقدمة: {0} . لن تكون هذه القيود متاحة للمطابقة." -#: erpnext/setup/doctype/company/company.js:161 -#: erpnext/setup/doctype/company/company.js:172 +#: erpnext/setup/doctype/company/company.js:177 +#: erpnext/setup/doctype/company/company.js:188 msgid "Manage" msgstr "يدير" @@ -29350,7 +29322,7 @@ msgstr "" msgid "Manage your orders" msgstr "إدارة طلباتك" -#: erpnext/setup/doctype/company/company.py:498 +#: erpnext/setup/doctype/company/company.py:502 msgid "Management" msgstr "الإدارة" @@ -29366,7 +29338,7 @@ msgstr "المدير العام" msgid "Mandatory Accounting Dimension" msgstr "البعد المحاسبي الإلزامي" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1881 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1962 msgid "Mandatory Field" msgstr "حقل إلزامي" @@ -29465,8 +29437,8 @@ msgstr "لا يمكن إنشاء الإدخال اليدوي! قم بتعطيل #: erpnext/stock/doctype/material_request_item/material_request_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1319 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1335 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:696 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:713 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json @@ -29570,7 +29542,7 @@ msgstr "الشركات المصنعة المستخدمة في المنتجات" #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:29 -#: erpnext/setup/doctype/company/company.json erpnext/setup/install.py:390 +#: erpnext/setup/doctype/company/company.json erpnext/setup/install.py:422 #: erpnext/setup/setup_wizard/data/industry_type.txt:31 #: erpnext/stock/doctype/batch/batch.json erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/item_lead_time/item_lead_time.json @@ -29615,10 +29587,6 @@ msgstr "تاريخ التصنيع" msgid "Manufacturing Manager" msgstr "مدير التصنيع" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2569 -msgid "Manufacturing Quantity is mandatory" -msgstr "كمية التصنيع إلزامية\\n
    \\nManufacturing Quantity is mandatory" - #. Label of the manufacturing_section_section (Section Break) field in DocType #. 'Sales Order Item' #: erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -29799,12 +29767,12 @@ msgstr "تم إغلاق الملف" msgid "Market Segment" msgstr "سوق القطاع" -#: erpnext/setup/doctype/company/company.py:450 +#: erpnext/setup/doctype/company/company.py:454 msgid "Marketing" msgstr "التسويق" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:112 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:191 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:116 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:196 msgid "Marketing Expenses" msgstr "نفقات تسويقية" @@ -29883,7 +29851,7 @@ msgstr "" msgid "Material" msgstr "مواد" -#: erpnext/manufacturing/doctype/work_order/work_order.js:882 +#: erpnext/manufacturing/doctype/work_order/work_order.js:864 msgid "Material Consumption" msgstr "اهلاك المواد" @@ -29891,7 +29859,7 @@ msgstr "اهلاك المواد" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' #: erpnext/setup/setup_wizard/operations/install_fixtures.py:114 #: erpnext/stock/doctype/stock_entry/stock_entry.json -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1320 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:697 #: erpnext/stock/doctype/stock_entry_type/stock_entry_type.json msgid "Material Consumption for Manufacture" msgstr "اهلاك المواد للتصنيع" @@ -29972,7 +29940,7 @@ msgstr "أستلام مواد" #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:33 #: erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:184 #: erpnext/buying/workspace/buying/buying.json -#: erpnext/manufacturing/doctype/job_card/job_card.js:166 +#: erpnext/manufacturing/doctype/job_card/job_card.js:214 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:159 #: erpnext/manufacturing/doctype/production_plan/production_plan.json #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json @@ -30069,11 +30037,11 @@ msgstr "المادة طلب خطة البند" msgid "Material Request Type" msgstr "نوع طلب المواد" -#: erpnext/selling/doctype/sales_order/sales_order.py:1158 +#: erpnext/selling/doctype/sales_order/sales_order.py:1171 msgid "Material Request already created for the ordered quantity" msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:1969 +#: erpnext/selling/doctype/sales_order/sales_order.py:1991 msgid "Material Request not created, as quantity for Raw Materials already available." msgstr "لم يتم إنشاء طلب المواد ، ككمية للمواد الخام المتاحة بالفعل." @@ -30141,7 +30109,7 @@ msgstr "المواد المُعادة من العمل قيد التنفيذ" #. Option for the 'Purpose' (Select) field in DocType 'Pick List' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' -#: erpnext/manufacturing/doctype/job_card/job_card.js:180 +#: erpnext/manufacturing/doctype/job_card/job_card.js:225 #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/setup/setup_wizard/operations/install_fixtures.py:83 #: erpnext/stock/doctype/item/item.json @@ -30207,12 +30175,12 @@ msgstr "مواد للمورد" msgid "Materials To Be Transferred" msgstr "" -#: erpnext/controllers/subcontracting_controller.py:1543 +#: erpnext/controllers/subcontracting_controller.py:1545 msgid "Materials are already received against the {0} {1}" msgstr "تم استلام المواد بالفعل مقابل {0} {1}" -#: erpnext/manufacturing/doctype/job_card/job_card.py:184 -#: erpnext/manufacturing/doctype/job_card/job_card.py:854 +#: erpnext/manufacturing/doctype/job_card/job_card.py:185 +#: erpnext/manufacturing/doctype/job_card/job_card.py:855 msgid "Materials needs to be transferred to the work in progress warehouse for the job card {0}" msgstr "يجب نقل المواد إلى مستودع العمل الجاري لبطاقة العمل {0}" @@ -30283,9 +30251,9 @@ msgstr "أقصى درجة" msgid "Max discount allowed for item: {0} is {1}%" msgstr "الحد الأقصى للخصم المسموح به لهذا المنتج: {0} هو {1}%" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1058 -#: erpnext/manufacturing/doctype/work_order/work_order.js:1065 -#: erpnext/manufacturing/doctype/work_order/work_order.js:1088 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1040 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1047 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1070 #: erpnext/stock/doctype/pick_list/pick_list.js:203 #: erpnext/stock/doctype/stock_entry/stock_entry.js:382 msgid "Max: {0}" @@ -30317,11 +30285,11 @@ msgstr "الحد الأقصى لمبلغ الدفع" msgid "Maximum Producible Items" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4088 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:1049 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}." msgstr "الحد الأقصى للعينات - {0} يمكن الاحتفاظ بالدفعة {1} والبند {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4079 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:1038 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}." msgstr "الحد الأقصى للعينات - {0} تم الاحتفاظ به مسبقا للدفعة {1} و العنصر {2} في الدفعة {3}." @@ -30382,7 +30350,7 @@ msgstr "ميغا جول" msgid "Megawatt" msgstr "ميغاواط" -#: erpnext/stock/stock_ledger.py:2072 +#: erpnext/stock/stock_ledger.py:2038 msgid "Mention Valuation Rate in the Item master." msgstr "اذكر معدل التقييم في مدير السلعة." @@ -30440,7 +30408,7 @@ msgstr "دمج مع حساب موجود" msgid "Merged" msgstr "تم الدمج" -#: erpnext/accounts/doctype/account/account.py:603 +#: erpnext/accounts/doctype/account/account.py:604 msgid "Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency" msgstr "لا يمكن دمج السجلات إلا إذا كانت الخصائص التالية متطابقة في كلا السجلين: المجموعة، والنوع الجذر، والشركة، وعملة الحساب." @@ -30470,7 +30438,7 @@ msgstr "سيتم إرسال رسالة إلى المستخدمين للحصول msgid "Messages greater than 160 characters will be split into multiple messages" msgstr "سيتم تقسيم الرسائل التي تزيد عن 160 حرفا إلى رسائل متعددة" -#: erpnext/setup/install.py:137 +#: erpnext/setup/install.py:138 msgid "Messaging CRM Campaign" msgstr "" @@ -30671,7 +30639,7 @@ msgstr "الكمية الادنى لايمكن ان تكون اكبر من ال msgid "Min Qty should be greater than Recurse Over Qty" msgstr "يجب أن تكون الكمية الدنيا أكبر من الكمية المطلوبة للتكرار." -#: erpnext/stock/doctype/item/item.js:958 +#: erpnext/stock/doctype/item/item.js:945 msgid "Min Value: {0}, Max Value: {1}, in Increments of: {2}" msgstr "القيمة الدنيا: {0}، القيمة القصوى: {1}، بزيادات قدرها: {2}" @@ -30760,8 +30728,8 @@ msgstr "الدقائق" msgid "Miscellaneous" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:116 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:224 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:120 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:229 msgid "Miscellaneous Expenses" msgstr "نفقات متنوعة" @@ -30769,15 +30737,15 @@ msgstr "نفقات متنوعة" msgid "Mismatch" msgstr "عدم تطابق" -#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1463 +#: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:1385 msgid "Missing" msgstr "مفتقد" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:97 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:201 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:594 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2421 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3029 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2502 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3110 #: erpnext/assets/doctype/asset_category/asset_category.py:126 msgid "Missing Account" msgstr "حساب مفقود" @@ -30807,7 +30775,7 @@ msgstr "فلاتر مفقودة" msgid "Missing Finance Book" msgstr "كتاب التمويل المفقود" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1759 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:872 msgid "Missing Finished Good" msgstr "مفقود، تم الانتهاء منه، جيد" @@ -30815,7 +30783,7 @@ msgstr "مفقود، تم الانتهاء منه، جيد" msgid "Missing Formula" msgstr "الصيغة المفقودة" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1078 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:787 msgid "Missing Item" msgstr "العنصر المفقود" @@ -30852,7 +30820,7 @@ msgid "Missing required filter: {0}" msgstr "الفلتر المطلوب مفقود: {0}" #: erpnext/manufacturing/doctype/bom/bom.py:1228 -#: erpnext/manufacturing/doctype/work_order/work_order.py:1498 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1499 msgid "Missing value" msgstr "قيمة مفقودة" @@ -31101,7 +31069,7 @@ msgstr "" msgid "Multiple Accounts (Journal Template)" msgstr "" -#: erpnext/selling/doctype/customer/customer.py:440 +#: erpnext/selling/doctype/customer/customer.py:430 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually." msgstr "تم العثور على عدة برامج ولاء للعميل {}. يرجى الاختيار يدويًا." @@ -31127,11 +31095,11 @@ msgstr "متغيرات متعددة" msgid "Multiple company fields available: {0}. Please select manually." msgstr "" -#: erpnext/controllers/accounts_controller.py:1306 +#: erpnext/controllers/accounts_controller.py:1307 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year" msgstr "يوجد سنوات مالية متعددة لنفس التاريخ {0}. الرجاء تحديد الشركة لهذه السنة المالية\\n
    \\nMultiple fiscal years exist for the date {0}. Please set company in Fiscal Year" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:879 msgid "Multiple items cannot be marked as finished item" msgstr "لا يمكن وضع علامة \"منتج نهائي\" على عدة عناصر" @@ -31140,7 +31108,7 @@ msgid "Music" msgstr "موسيقى" #. Label of the must_be_whole_number (Check) field in DocType 'UOM' -#: erpnext/manufacturing/doctype/work_order/work_order.py:1445 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1446 #: erpnext/setup/doctype/uom/uom.json #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:267 #: erpnext/utilities/transaction_base.py:628 @@ -31227,7 +31195,7 @@ msgstr "" msgid "Naming Series updated" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:938 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:939 msgid "Naming series '{0}' for DocType '{1}' does not contain standard '.' or '{{' separator. Using fallback extraction." msgstr "" @@ -31586,7 +31554,7 @@ msgstr "الوزن الصافي" msgid "Net Weight UOM" msgstr "الوزن الصافي لوحدة القياس" -#: erpnext/controllers/accounts_controller.py:1666 +#: erpnext/controllers/accounts_controller.py:1667 msgid "Net total calculation precision loss" msgstr "صافي إجمالي فقدان دقة الحساب" @@ -31763,7 +31731,7 @@ msgstr "اسم المخزن الجديد" msgid "New Workplace" msgstr "مكان العمل الجديد" -#: erpnext/selling/doctype/customer/customer.py:405 +#: erpnext/selling/doctype/customer/customer.py:395 msgid "New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}" msgstr "حد الائتمان الجديد أقل من المبلغ المستحق الحالي للعميل. حد الائتمان يجب أن يكون على الأقل {0}\\n
    \\nNew credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}" @@ -31817,7 +31785,7 @@ msgstr "سيتم إرسال البريد الإلكترونية التالي ف msgid "No Account Data row found" msgstr "" -#: erpnext/setup/doctype/company/test_company.py:93 +#: erpnext/setup/doctype/company/test_company.py:94 msgid "No Account matched these filters: {}" msgstr "لا يوجد حساب مطابق لهذه الفلاتر: {}" @@ -31830,7 +31798,7 @@ msgstr "لا رد فعل" msgid "No Answer" msgstr "لا يوجد رد" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2526 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2607 msgid "No Customer found for Inter Company Transactions which represents company {0}" msgstr "لم يتم العثور على زبون للمعاملات بين الشركات التي تمثل الشركة {0}" @@ -31843,7 +31811,7 @@ msgstr "لم يتم العثور على عملاء بالخيارات المحد msgid "No Delivery Note selected for Customer {}" msgstr "لم يتم تحديد ملاحظة التسليم للعميل {}" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:755 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:756 msgid "No DocTypes in To Delete list. Please generate or import the list before submitting." msgstr "" @@ -31859,7 +31827,7 @@ msgstr "أي عنصر مع الباركود {0}" msgid "No Item with Serial No {0}" msgstr "أي عنصر مع المسلسل لا {0}" -#: erpnext/controllers/subcontracting_controller.py:1459 +#: erpnext/controllers/subcontracting_controller.py:1461 msgid "No Items selected for transfer." msgstr "لم يتم تحديد أي عناصر للنقل." @@ -31923,7 +31891,7 @@ msgstr "لا يوجد مخزون متوفر حالياً" msgid "No Summary" msgstr "لا يوجد ملخص" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2510 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2591 msgid "No Supplier found for Inter Company Transactions which represents company {0}" msgstr "لم يتم العثور على مورد للمعاملات بين الشركات التي تمثل الشركة {0}" @@ -31935,7 +31903,7 @@ msgstr "لم يتم العثور على بيانات اقتطاع الضرائب msgid "No Tax withholding account set for Company {0} in Tax Withholding Category {1}." msgstr "لم يتم تعيين حساب اقتطاع ضريبي للشركة {0} في فئة اقتطاع الضرائب {1}." -#: erpnext/accounts/report/gross_profit/gross_profit.py:998 +#: erpnext/accounts/report/gross_profit/gross_profit.py:990 msgid "No Terms" msgstr "لا توجد شروط" @@ -31965,7 +31933,7 @@ msgstr "" msgid "No accounts found." msgstr "" -#: erpnext/selling/doctype/sales_order/sales_order.py:796 +#: erpnext/selling/doctype/sales_order/sales_order.py:799 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" msgstr "لم يتم العثور على BOM نشط للعنصر {0}. لا يمكن ضمان التسليم عن طريق الرقم التسلسلي" @@ -32287,7 +32255,7 @@ msgstr "لا توجد قيم" msgid "No vouchers found for this transaction" msgstr "" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2574 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2655 msgid "No {0} found for Inter Company Transactions." msgstr "لم يتم العثور على {0} معاملات Inter Company." @@ -32332,8 +32300,8 @@ msgstr "غير ربحية" msgid "Non stock items" msgstr "البنود غير الأسهم" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:182 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:317 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:186 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:322 msgid "Non-Current Liabilities" msgstr "الالتزامات غير المتداولة" @@ -32434,7 +32402,7 @@ msgstr "لم نتمكن من العثور على أقدم سنة مالية لل msgid "Not allow to set alternative item for the item {0}" msgstr "لا تسمح بتعيين عنصر بديل للعنصر {0}" -#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:59 +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:60 msgid "Not allowed to create accounting dimension for {0}" msgstr "غير مسموح بإنشاء بعد محاسبي لـ {0}" @@ -32488,7 +32456,7 @@ msgstr "ملاحظة: إذا كنت ترغب في استخدام المنتج ا msgid "Note: Item {0} added multiple times" msgstr "ملاحظة: تمت إضافة العنصر {0} عدة مرات" -#: erpnext/controllers/accounts_controller.py:712 +#: erpnext/controllers/accounts_controller.py:713 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified" msgstr "ملاحظة : لن يتم إنشاء تدوين المدفوعات نظرا لأن \" حساب النقد او المصرف\" لم يتم تحديده" @@ -32738,18 +32706,18 @@ msgstr "قراءة عداد المسافات (الأخيرة)" msgid "Offer Date" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:56 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:92 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:60 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:97 msgid "Office Equipment" msgstr "معدات مكتبية" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:120 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:196 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:124 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:201 msgid "Office Maintenance Expenses" msgstr "نفقات صيانة المكاتب" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:121 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:200 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:125 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:205 msgid "Office Rent" msgstr "ايجار مكتب" @@ -32877,7 +32845,7 @@ msgstr "" msgid "Once set, this invoice will be on hold till the set date" msgstr "بمجرد تعيينها ، ستكون هذه الفاتورة قيد الانتظار حتى التاريخ المحدد" -#: erpnext/manufacturing/doctype/work_order/work_order.js:769 +#: erpnext/manufacturing/doctype/work_order/work_order.js:751 msgid "Once the Work Order is Closed. It can't be resumed." msgstr "بمجرد إغلاق أمر العمل، لا يمكن استئنافه." @@ -32917,7 +32885,7 @@ msgstr "لا يتم دعم سوى \"إدخالات الدفع\" التي تتم msgid "Only CSV and Excel files can be used to for importing data. Please check the file format you are trying to upload" msgstr "لا يمكن استخدام سوى ملفات CSV و Excel لاستيراد البيانات. يرجى التحقق من تنسيق الملف الذي تحاول تحميله." -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1071 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1072 msgid "Only CSV files are allowed" msgstr "" @@ -32936,7 +32904,7 @@ msgstr "يتم خصم الضريبة فقط على المبلغ الزائد " msgid "Only Include Allocated Payments" msgstr "قم بتضمين المدفوعات المخصصة فقط" -#: erpnext/accounts/doctype/account/account.py:136 +#: erpnext/accounts/doctype/account/account.py:137 msgid "Only Parent can be of type {0}" msgstr "لا يمكن أن يكون من النوع {0}إلا الوالد" @@ -32973,7 +32941,7 @@ msgstr "يجب أن يكون أحد خياري الإيداع أو السحب ف msgid "Only one operation can have 'Is Final Finished Good' checked when 'Track Semi Finished Goods' is enabled." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1334 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:712 msgid "Only one {0} entry can be created against the Work Order {1}" msgstr "لا يمكن إنشاء سوى إدخال واحد {0} مقابل أمر العمل {1}" @@ -33191,8 +33159,8 @@ msgstr "الرصيد الافتتاحي = بداية الفترة، الرصيد msgid "Opening Balance Details" msgstr "تفاصيل الرصيد الافتتاحي" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:192 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:343 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:196 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:348 msgid "Opening Balance Equity" msgstr "الرصيد الافتتاحي لحقوق الملكية" @@ -33248,7 +33216,7 @@ msgid "Opening Invoice Tool" msgstr "" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1651 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1990 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2071 msgid "Opening Invoice has rounding adjustment of {0}.

    '{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 "" @@ -33316,7 +33284,10 @@ msgid "Opening stock creation has been queued and will be created in the backgro msgstr "تمت إضافة عملية إنشاء المخزون الافتتاحي إلى قائمة الانتظار، وسيتم إنشاؤها في الخلفية. يرجى مراجعة إدخال المخزون بعد فترة." #. Label of the operating_component (Link) field in DocType 'Workstation Cost' +#. Label of the operating_component (Data) field in DocType 'Landed Cost Taxes +#. and Charges' #: erpnext/manufacturing/doctype/workstation_cost/workstation_cost.json +#: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json msgid "Operating Component" msgstr "مكون التشغيل" @@ -33348,7 +33319,7 @@ msgstr "تكاليف التشغيل (عملة الشركة)" msgid "Operating Cost Per BOM Quantity" msgstr "تكلفة التشغيل لكل كمية من قائمة المواد" -#: erpnext/manufacturing/doctype/bom/bom.py:1731 +#: erpnext/manufacturing/doctype/bom/bom.py:1749 msgid "Operating Cost as per Work Order / BOM" msgstr "تكلفة التشغيل حسب أمر العمل / BOM" @@ -33391,15 +33362,15 @@ msgstr "وصف العملية" #. Label of the operation_row_id (Int) field in DocType 'BOM Item' #. Label of the operation_id (Data) field in DocType 'Job Card' +#. Label of the operation_id (Data) field in DocType 'Landed Cost Taxes and +#. Charges' #: erpnext/manufacturing/doctype/bom_item/bom_item.json #: erpnext/manufacturing/doctype/job_card/job_card.json +#: erpnext/manufacturing/doctype/work_order/work_order.js:332 +#: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json msgid "Operation ID" msgstr "معرف العملية" -#: erpnext/manufacturing/doctype/work_order/work_order.js:351 -msgid "Operation Id" -msgstr "معرف العملية" - #. Label of the operation_row_id (Int) field in DocType 'Job Card' #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "Operation Row ID" @@ -33424,7 +33395,7 @@ msgstr "رقم صف العملية" msgid "Operation Time" msgstr "وقت العملية" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1504 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1505 msgid "Operation Time must be greater than 0 for Operation {0}" msgstr "زمن العملية يجب أن يكون أكبر من 0 للعملية {0}\\n
    \\nOperation Time must be greater than 0 for Operation {0}" @@ -33439,11 +33410,11 @@ msgstr "اكتمال عملية لكيفية العديد من السلع تام msgid "Operation time does not depend on quantity to produce" msgstr "لا يعتمد وقت التشغيل على كمية الإنتاج" -#: erpnext/manufacturing/doctype/job_card/job_card.js:592 +#: erpnext/manufacturing/doctype/job_card/job_card.js:518 msgid "Operation {0} added multiple times in the work order {1}" msgstr "تمت إضافة العملية {0} عدة مرات في أمر العمل {1}" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1247 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1255 msgid "Operation {0} does not belong to the work order {1}" msgstr "العملية {0} لا تنتمي إلى أمر العمل {1}" @@ -33459,9 +33430,9 @@ msgstr "العملية {0} أطول من أي ساعات عمل متاحة في #. Label of the operations (Table) field in DocType 'Work Order' #. Label of the operation (Section Break) field in DocType 'Email Digest' #: erpnext/manufacturing/doctype/bom/bom.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:332 +#: erpnext/manufacturing/doctype/work_order/work_order.js:313 #: erpnext/manufacturing/doctype/work_order/work_order.json -#: erpnext/setup/doctype/company/company.py:468 +#: erpnext/setup/doctype/company/company.py:472 #: erpnext/setup/doctype/email_digest/email_digest.json #: erpnext/templates/generators/bom.html:61 msgid "Operations" @@ -33634,7 +33605,7 @@ msgstr "تم إنشاء الفرصة {0}" msgid "Optimize Route" msgstr "تحسين الطريق" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1035 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1017 msgid "Optional. Select a specific manufacture entry to reverse." msgstr "" @@ -33784,7 +33755,7 @@ msgstr "الكمية التي تم طلبها" #: erpnext/buying/doctype/supplier/supplier_dashboard.py:11 #: erpnext/selling/doctype/customer/customer_dashboard.py:20 -#: erpnext/selling/doctype/sales_order/sales_order.py:1005 +#: erpnext/selling/doctype/sales_order/sales_order.py:1018 #: erpnext/setup/doctype/company/company_dashboard.py:23 msgid "Orders" msgstr "أوامر" @@ -34002,7 +33973,7 @@ msgstr "الرصيد المستحق (عملة الشركة)" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/report/accounts_payable/accounts_payable.html:140 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:141 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1277 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1200 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:169 #: erpnext/accounts/report/purchase_register/purchase_register.py:289 #: erpnext/accounts/report/sales_register/sales_register.py:319 @@ -34068,7 +34039,7 @@ msgstr "بدل التسليم/الاستلام الزائد (%)" msgid "Over Picking Allowance" msgstr "بدل الإفراط في الانتقاء" -#: erpnext/controllers/stock_controller.py:1737 +#: erpnext/controllers/stock_controller.py:1738 msgid "Over Receipt" msgstr "إيصال زائد" @@ -34096,7 +34067,7 @@ msgstr "مبالغ محجوزة" msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role." msgstr "تم تجاهل الفوترة الزائدة لـ {0} {1} للعنصر {2} لأن لديك الدور {3} ." -#: erpnext/controllers/accounts_controller.py:2184 +#: erpnext/controllers/accounts_controller.py:2185 msgid "Overbilling of {} ignored because you have {} role." msgstr "تم تجاهل الفوترة الزائدة لـ {} لأن لديك دور {} ." @@ -34581,7 +34552,7 @@ msgstr "عنصر معبأ" msgid "Packed Items" msgstr "عناصر معبأة" -#: erpnext/controllers/stock_controller.py:1571 +#: erpnext/controllers/stock_controller.py:1572 msgid "Packed Items cannot be transferred internally" msgstr "لا يمكن نقل العناصر المعبأة داخلياً" @@ -34618,7 +34589,7 @@ msgstr "قائمة بمحتويات الشحنة" msgid "Packing Slip Item" msgstr "مادة كشف التعبئة" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:659 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:700 msgid "Packing Slip(s) cancelled" msgstr "تم إلغاء قائمة الشحنة" @@ -34659,7 +34630,7 @@ msgstr "مدفوع" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:173 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1271 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1194 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:167 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:201 #: erpnext/accounts/report/pos_register/pos_register.py:209 @@ -34819,7 +34790,7 @@ msgstr "دفعة الأم" msgid "Parent Company" msgstr "الشركة الام" -#: erpnext/setup/doctype/company/company.py:603 +#: erpnext/setup/doctype/company/company.py:607 msgid "Parent Company must be a group company" msgstr "يجب أن تكون الشركة الأم شركة مجموعة" @@ -35159,7 +35130,7 @@ msgstr "أجزاء في المليون" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:105 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:82 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:65 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1204 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1127 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:82 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:147 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:49 @@ -35186,7 +35157,7 @@ msgstr "الطرف المعني" #. Name of a DocType #: erpnext/accounts/doctype/party_account/party_account.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1216 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1139 msgid "Party Account" msgstr "حساب طرف" @@ -35219,7 +35190,7 @@ msgstr "" msgid "Party Account No. (Bank Statement)" msgstr "رقم حساب الطرف (كشف حساب بنكي)" -#: erpnext/controllers/accounts_controller.py:2468 +#: erpnext/controllers/accounts_controller.py:2469 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same" msgstr "يجب أن تكون عملة حساب الطرف {0} ({1}) وعملة المستند ({2}) متطابقتين." @@ -35371,7 +35342,7 @@ msgstr "عنصر خاص بالحزب" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:92 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:69 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:52 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1198 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1121 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:69 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:141 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:42 @@ -35480,7 +35451,7 @@ msgstr "الأحداث السابقة" msgid "Pause" msgstr "وقفة" -#: erpnext/manufacturing/doctype/job_card/job_card.js:263 +#: erpnext/manufacturing/doctype/job_card/job_card.js:660 msgid "Pause Job" msgstr "إيقاف العمل مؤقتًا" @@ -35531,7 +35502,7 @@ msgid "Payable" msgstr "واجب الدفع" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:50 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1214 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1137 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:209 #: erpnext/accounts/report/purchase_register/purchase_register.py:194 #: erpnext/accounts/report/purchase_register/purchase_register.py:235 @@ -35565,7 +35536,7 @@ msgstr "إعدادات الدافع" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js:55 #: erpnext/accounts/doctype/sales_invoice/sales_invoice.js:98 #: erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py:25 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:42 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:51 #: erpnext/buying/doctype/purchase_order/purchase_order.js:394 #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:24 #: erpnext/selling/doctype/sales_order/sales_order.js:1213 @@ -35712,7 +35683,7 @@ msgstr "تم تعديل تدوين مدفوعات بعد سحبه. يرجى سح msgid "Payment Entry is already created" msgstr "تدوين المدفوعات تم انشاؤه بالفعل" -#: erpnext/controllers/accounts_controller.py:1617 +#: erpnext/controllers/accounts_controller.py:1618 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice." msgstr "تم ربط إدخال الدفعة {0} بالطلب {1}، تحقق مما إذا كان يجب سحبه كدفعة مقدمة في هذه الفاتورة." @@ -36002,7 +35973,7 @@ msgstr "سيتم وضع طلبات الدفع المقدمة من فواتير #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/buying/doctype/purchase_order/purchase_order.json -#: erpnext/controllers/accounts_controller.py:2748 +#: erpnext/controllers/accounts_controller.py:2749 #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.json msgid "Payment Schedule" @@ -36031,7 +36002,7 @@ msgstr "" #: erpnext/accounts/doctype/payment_schedule/payment_schedule.json #: erpnext/accounts/doctype/payment_term/payment_term.json #: erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1267 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1190 #: erpnext/accounts/report/gross_profit/gross_profit.py:449 #: erpnext/accounts/workspace/invoicing/invoicing.json #: erpnext/public/js/controllers/transaction.js:498 @@ -36158,7 +36129,7 @@ msgstr "" msgid "Payment methods are mandatory. Please add at least one payment method." msgstr "طرق الدفع إلزامية. الرجاء إضافة طريقة دفع واحدة على الأقل." -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3033 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3114 msgid "Payment methods refreshed. Please review before proceeding." msgstr "" @@ -36233,8 +36204,8 @@ msgstr "تم تحديث المدفوعات." msgid "Payroll Entry" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:156 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:262 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:160 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:267 msgid "Payroll Payable" msgstr "رواتب واجبة الدفع" @@ -36281,10 +36252,14 @@ msgstr "الأنشطة المعلقة" msgid "Pending Amount" msgstr "في انتظار المبلغ" +#. Label of the pending_qty (Float) field in DocType 'Job Card' #. Label of the pending_qty (Float) field in DocType 'Production Plan Item' +#. Label of the pending_qty (Float) field in DocType 'Work Order Operation' #: erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py:254 +#: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:356 +#: erpnext/manufacturing/doctype/work_order/work_order.js:337 +#: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:182 #: erpnext/selling/doctype/sales_order/sales_order.js:1726 #: erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45 @@ -36293,9 +36268,18 @@ msgstr "الكمية التي قيد الانتظار" #: erpnext/buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:54 #: erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.py:44 +#: erpnext/manufacturing/doctype/job_card/job_card.js:273 msgid "Pending Quantity" msgstr "في انتظار الكمية" +#: erpnext/manufacturing/doctype/job_card/job_card.js:70 +msgid "Pending Quantity cannot be greater than {0}" +msgstr "" + +#: erpnext/manufacturing/doctype/job_card/job_card.js:62 +msgid "Pending Quantity cannot be less than 0" +msgstr "" + #. Option for the 'Status' (Select) field in DocType 'Task' #. Option in a Select field in the tasks Web Form #: erpnext/projects/doctype/task/task.json @@ -36325,6 +36309,14 @@ msgstr "الأنشطة في انتظار لهذا اليوم" msgid "Pending processing" msgstr "في انتظار المعالجة" +#: erpnext/manufacturing/doctype/job_card/job_card.py:1464 +msgid "Pending quantity cannot be greater than the for quantity." +msgstr "" + +#: erpnext/manufacturing/doctype/job_card/job_card.py:1458 +msgid "Pending quantity cannot be negative." +msgstr "" + #: erpnext/setup/setup_wizard/data/industry_type.txt:36 msgid "Pension Funds" msgstr "صناديق التقاعد" @@ -36999,8 +36991,8 @@ msgstr "لوحة معلومات النبات" msgid "Plant Floor" msgstr "أرضيات المصانع" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:57 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:97 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:61 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:102 msgid "Plants and Machineries" msgstr "وحدات التصنيع والآلات" @@ -37084,7 +37076,7 @@ msgstr "يرجى إضافة عمود الحساب المصرفي" msgid "Please add the account to root level Company - {0}" msgstr "يرجى إضافة الحساب إلى مستوى الشركة الرئيسي - {0}" -#: erpnext/accounts/doctype/account/account.py:233 +#: erpnext/accounts/doctype/account/account.py:234 msgid "Please add the account to root level Company - {}" msgstr "الرجاء إضافة الحساب إلى شركة على مستوى الجذر - {}" @@ -37092,7 +37084,7 @@ msgstr "الرجاء إضافة الحساب إلى شركة على مستوى msgid "Please add {1} role to user {0}." msgstr "يرجى إضافة الدور {1} إلى المستخدم {0}." -#: erpnext/controllers/stock_controller.py:1748 +#: erpnext/controllers/stock_controller.py:1749 msgid "Please adjust the qty or edit {0} to proceed." msgstr "يرجى تعديل الكمية أو تحرير {0} للمتابعة." @@ -37100,7 +37092,7 @@ msgstr "يرجى تعديل الكمية أو تحرير {0} للمتابعة." msgid "Please attach CSV file" msgstr "يرجى إرفاق ملف CSV" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3174 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3255 msgid "Please cancel and amend the Payment Entry" msgstr "يرجى إلغاء وتعديل إدخال الدفع" @@ -37134,7 +37126,7 @@ msgstr "يرجى التحقق إما من قسم العمليات أو من قس msgid "Please check the 'Activate Serial and Batch No for Item' checkbox in the {0} to make Serial and Batch Bundle for the item." msgstr "" -#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:562 +#: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:605 msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again." msgstr "يرجى مراجعة رسالة الخطأ واتخاذ الإجراءات اللازمة لإصلاح الخطأ ثم إعادة تشغيل عملية إعادة النشر مرة أخرى." @@ -37159,11 +37151,15 @@ msgstr "الرجاء النقر على \"إنشاء جدول\" لجلب الرق msgid "Please click on 'Generate Schedule' to get schedule" msgstr "الرجاء الضغط علي ' إنشاء الجدول ' للحصول علي جدول\\n
    \\nPlease click on 'Generate Schedule' to get schedule" +#: erpnext/manufacturing/doctype/job_card/job_card.js:58 +msgid "Please complete the job first before entering Pending Quantity" +msgstr "" + #: erpnext/accounts/doctype/bank_transaction_rule/bank_transaction_rule.py:80 msgid "Please configure accounts for the Bank Entry rule." msgstr "" -#: erpnext/selling/doctype/customer/customer.py:642 +#: erpnext/selling/doctype/customer/customer.py:632 msgid "Please contact any of the following users to extend the credit limits for {0}: {1}" msgstr "يرجى الاتصال بأي من المستخدمين التاليين لتمديد حدود الائتمان لـ {0}: {1}" @@ -37171,11 +37167,11 @@ msgstr "يرجى الاتصال بأي من المستخدمين التاليي msgid "Please contact any of the following users to {} this transaction." msgstr "يرجى الاتصال بأي من المستخدمين التاليين لإتمام هذه المعاملة." -#: erpnext/selling/doctype/customer/customer.py:635 +#: erpnext/selling/doctype/customer/customer.py:625 msgid "Please contact your administrator to extend the credit limits for {0}." msgstr "يرجى الاتصال بمسؤول النظام لتمديد حدود الائتمان لـ {0}." -#: erpnext/accounts/doctype/account/account.py:384 +#: erpnext/accounts/doctype/account/account.py:385 msgid "Please convert the parent account in corresponding child company to a group account." msgstr "الرجاء تحويل الحساب الرئيسي في الشركة الفرعية المقابلة إلى حساب مجموعة." @@ -37187,11 +37183,11 @@ msgstr "الرجاء إنشاء عميل من العميل المحتمل {0}." msgid "Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled." msgstr "يرجى إنشاء قسائم تكلفة الشحن مقابل الفواتير التي تم تمكين خيار \"تحديث المخزون\" فيها." -#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:74 +#: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:75 msgid "Please create a new Accounting Dimension if required." msgstr "يرجى إنشاء بُعد محاسبي جديد إذا لزم الأمر." -#: erpnext/controllers/accounts_controller.py:805 +#: erpnext/controllers/accounts_controller.py:806 msgid "Please create purchase from internal sale or delivery document itself" msgstr "يرجى إنشاء عملية شراء من مستند البيع أو التسليم الداخلي نفسه" @@ -37235,7 +37231,7 @@ msgstr "يرجى تفعيل هذا الخيار فقط إذا كنت تفهم آ msgid "Please enable {0} in the {1}." msgstr "يرجى تفعيل {0} في {1}." -#: erpnext/controllers/selling_controller.py:857 +#: erpnext/controllers/selling_controller.py:858 msgid "Please enable {} in {} to allow same item in multiple rows" msgstr "يرجى تفعيل {} في {} للسماح بظهور العنصر نفسه في صفوف متعددة" @@ -37255,7 +37251,7 @@ msgstr "يرجى التأكد من أن حساب {} هو حساب في المي msgid "Please ensure {} account {} is a Receivable account." msgstr "يرجى التأكد من أن حساب {} هو حساب مستحق القبض." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:757 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:145 msgid "Please enter Difference Account or set default Stock Adjustment Account for company {0}" msgstr "الرجاء إدخال حساب الفرق أو تعيين حساب تسوية المخزون الافتراضي للشركة {0}" @@ -37276,7 +37272,7 @@ msgstr "" msgid "Please enter Cost Center" msgstr "يرجى إدخال مركز التكلفة\\n
    \\nPlease enter Cost Center" -#: erpnext/selling/doctype/sales_order/sales_order.py:425 +#: erpnext/selling/doctype/sales_order/sales_order.py:435 msgid "Please enter Delivery Date" msgstr "الرجاء إدخال تاريخ التسليم" @@ -37293,7 +37289,7 @@ msgstr "الرجاء إدخال حساب النفقات\\n
    \\nPlease enter Ex msgid "Please enter Item Code to get Batch Number" msgstr "الرجاء إدخال رمز العنصر للحصول على رقم الدفعة\\n
    \\nPlease enter Item Code to get Batch Number" -#: erpnext/public/js/controllers/transaction.js:2989 +#: erpnext/public/js/controllers/transaction.js:2991 msgid "Please enter Item Code to get batch no" msgstr "الرجاء إدخال كود البند للحصول على رقم الدفعة" @@ -37309,7 +37305,7 @@ msgstr "يرجى إدخال تفاصيل الصيانة أولاً" msgid "Please enter Planned Qty for Item {0} at row {1}" msgstr "الرجاء إدخال الكمية المخططة للبند {0} في الصف {1}" -#: erpnext/manufacturing/doctype/work_order/work_order.js:73 +#: erpnext/manufacturing/doctype/work_order/work_order.js:44 msgid "Please enter Production Item first" msgstr "الرجاء إدخال بند الإنتاج أولا" @@ -37366,7 +37362,7 @@ msgstr "يرجى إدخال تاريخ تسليم واحد على الأقل و msgid "Please enter company name first" msgstr "الرجاء إدخال اسم الشركة اولاً" -#: erpnext/controllers/accounts_controller.py:2974 +#: erpnext/controllers/accounts_controller.py:2968 msgid "Please enter default currency in Company Master" msgstr "الرجاء إدخال العملة الافتراضية في شركة الرئيسية" @@ -37394,7 +37390,7 @@ msgstr "من فضلك ادخل تاريخ ترك العمل." msgid "Please enter serial nos" msgstr "يرجى إدخال الأرقام التسلسلية" -#: erpnext/setup/doctype/company/company.js:214 +#: erpnext/setup/doctype/company/company.js:230 msgid "Please enter the company name to confirm" msgstr "الرجاء إدخال اسم الشركة للتأكيد" @@ -37462,11 +37458,11 @@ msgstr "يرجى التأكد من أن الموظفين أعلاه يقدمون msgid "Please make sure the file you are using has 'Parent Account' column present in the header." msgstr "" -#: erpnext/setup/doctype/company/company.js:216 +#: erpnext/setup/doctype/company/company.js:232 msgid "Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone." msgstr "يرجى التأكد من أنك تريد حقا حذف جميع المعاملات لهذه الشركة. ستبقى بياناتك الرئيسية (الماستر) كما هيا. لا يمكن التراجع عن هذا الإجراء." -#: erpnext/stock/doctype/item/item.js:709 +#: erpnext/stock/doctype/item/item.js:696 msgid "Please mention 'Weight UOM' along with Weight." msgstr "يرجى ذكر \"وحدة قياس الوزن\" مع كلمة \"الوزن\"." @@ -37525,7 +37521,7 @@ msgstr "يرجى تحديد نوع القالب لتنزيل القالب msgid "Please select Apply Discount On" msgstr "الرجاء اختيار (تطبيق تخفيض على)" -#: erpnext/selling/doctype/sales_order/sales_order.py:1884 +#: erpnext/selling/doctype/sales_order/sales_order.py:1906 msgid "Please select BOM against item {0}" msgstr "الرجاء اختيار بوم ضد العنصر {0}" @@ -37571,7 +37567,7 @@ msgstr "يرجى تحديد تاريخ الانتهاء لاستكمال سجل msgid "Please select Customer first" msgstr "يرجى اختيار العميل أولا" -#: erpnext/setup/doctype/company/company.py:534 +#: erpnext/setup/doctype/company/company.py:538 msgid "Please select Existing Company for creating Chart of Accounts" msgstr "الرجاء اختيار الشركة الحالية لإنشاء دليل الحسابات" @@ -37580,8 +37576,8 @@ msgstr "الرجاء اختيار الشركة الحالية لإنشاء دل msgid "Please select Finished Good Item for Service Item {0}" msgstr "يرجى تحديد \"المنتج النهائي\" لعنصر الخدمة {0}" -#: erpnext/assets/doctype/asset/asset.js:752 -#: erpnext/assets/doctype/asset/asset.js:767 +#: erpnext/assets/doctype/asset/asset.js:754 +#: erpnext/assets/doctype/asset/asset.js:769 msgid "Please select Item Code first" msgstr "يرجى اختيار رمز البند أولاً" @@ -37613,7 +37609,7 @@ msgstr "الرجاء تحديد تاريخ النشر أولا\\n
    \\nPlease s msgid "Please select Price List" msgstr "الرجاء اختيار قائمة الأسعار\\n
    \\nPlease select Price List" -#: erpnext/selling/doctype/sales_order/sales_order.py:1886 +#: erpnext/selling/doctype/sales_order/sales_order.py:1908 msgid "Please select Qty against item {0}" msgstr "الرجاء اختيار الكمية ضد العنصر {0}" @@ -37633,7 +37629,7 @@ msgstr "الرجاء تحديد تاريخ البدء وتاريخ الانته msgid "Please select Stock Asset Account" msgstr "الرجاء تحديد حساب أصول الأسهم" -#: erpnext/controllers/accounts_controller.py:2823 +#: erpnext/controllers/accounts_controller.py:2824 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}" msgstr "يرجى تحديد حساب الأرباح/الخسائر غير المحققة أو إضافة حساب الأرباح/الخسائر غير المحققة الافتراضي للشركة {0}" @@ -37650,7 +37646,7 @@ msgstr "الرجاء اختيار الشركة" #: erpnext/manufacturing/doctype/bom/bom.js:727 #: erpnext/manufacturing/doctype/bom/bom.py:280 #: erpnext/public/js/controllers/accounts.js:277 -#: erpnext/public/js/controllers/transaction.js:3288 +#: erpnext/public/js/controllers/transaction.js:3290 msgid "Please select a Company first." msgstr "الرجاء تحديد شركة أولاً." @@ -37674,7 +37670,7 @@ msgstr "الرجاء اختيار مورد" msgid "Please select a Warehouse" msgstr "الرجاء اختيار مستودع" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1601 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1618 msgid "Please select a Work Order first." msgstr "يرجى اختيار أمر عمل أولاً." @@ -37751,7 +37747,7 @@ msgstr "يرجى تحديد رمز المنتج قبل تحديد المستود msgid "Please select at least one filter: Item Code, Batch, or Serial No." msgstr "يرجى تحديد فلتر واحد على الأقل: رمز الصنف، أو رقم الدفعة، أو الرقم التسلسلي." -#: erpnext/buying/doctype/purchase_order/purchase_order.py:557 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:556 msgid "Please select at least one item to update delivered quantity." msgstr "" @@ -37771,7 +37767,7 @@ msgstr "" msgid "Please select atleast one item to continue" msgstr "يرجى اختيار عنصر واحد على الأقل للمتابعة" -#: erpnext/manufacturing/doctype/work_order/work_order.js:399 +#: erpnext/manufacturing/doctype/work_order/work_order.js:380 msgid "Please select atleast one operation to create Job Card" msgstr "يرجى تحديد عملية واحدة على الأقل لإنشاء بطاقة عمل" @@ -37829,7 +37825,7 @@ msgstr "يرجى تحديد الشركة" msgid "Please select the Multiple Tier Program type for more than one collection rules." msgstr "يرجى تحديد نوع البرنامج متعدد الطبقات لأكثر من قواعد مجموعة واحدة." -#: erpnext/stock/doctype/item/item.js:371 +#: erpnext/stock/doctype/item/item.js:364 msgid "Please select the Warehouse first" msgstr "يرجى تحديد المستودع أولاً" @@ -37883,7 +37879,7 @@ msgstr "يرجى تعيين '{0}' في الشركة: {1}" msgid "Please set Account" msgstr "يرجى إنشاء حساب" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1881 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1962 msgid "Please set Account for Change Amount" msgstr "يرجى تحديد الحساب لمبلغ الباقي" @@ -37977,7 +37973,7 @@ msgstr "الرجاء تعيين شركة" msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}" msgstr "يرجى تحديد مركز تكلفة للأصل أو تحديد مركز تكلفة استهلاك الأصول للشركة {}" -#: erpnext/projects/doctype/project/project.py:735 +#: erpnext/projects/doctype/project/project.py:773 msgid "Please set a default Holiday List for Company {0}" msgstr "يرجى تحديد قائمة العطلات الافتراضية للشركة {0}" @@ -38014,23 +38010,23 @@ msgstr "يرجى ضبط صف واحد على الأقل في جدول الضرا msgid "Please set both the Tax ID and Fiscal Code on Company {0}" msgstr "يرجى تحديد كل من رقم التعريف الضريبي والرمز المالي للشركة {0}" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2418 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2499 msgid "Please set default Cash or Bank account in Mode of Payment {0}" msgstr "الرجاء تحديد الحساب البنكي أو النقدي الافتراضي في نوع الدفع\\n
    \\nPlease set default Cash or Bank account in Mode of Payment {0}" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:94 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:198 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3026 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3107 msgid "Please set default Cash or Bank account in Mode of Payment {}" msgstr "الرجاء تعيين حساب نقدي أو مصرفي افتراضي في طريقة الدفع {}" #: erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.py:96 #: erpnext/accounts/doctype/pos_profile/pos_profile.py:200 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3028 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3109 msgid "Please set default Cash or Bank account in Mode of Payments {}" msgstr "الرجاء تعيين حساب نقدي أو مصرفي افتراضي في طريقة الدفع {}" -#: erpnext/accounts/utils.py:2541 +#: erpnext/accounts/utils.py:2540 msgid "Please set default Exchange Gain/Loss Account in Company {}" msgstr "يرجى تعيين حساب الربح/الخسارة الافتراضي في الشركة {}" @@ -38059,7 +38055,7 @@ msgstr "يرجى تعيين {0} الافتراضي للشركة {1}" msgid "Please set filter based on Item or Warehouse" msgstr "يرجى ضبط الفلتر على أساس البند أو المخزن" -#: erpnext/controllers/accounts_controller.py:2384 +#: erpnext/controllers/accounts_controller.py:2385 msgid "Please set one of the following:" msgstr "يرجى تحديد أحد الخيارات التالية:" @@ -38067,7 +38063,7 @@ msgstr "يرجى تحديد أحد الخيارات التالية:" msgid "Please set opening number of booked depreciations" msgstr "يرجى تحديد عدد الإهلاكات المحجوزة في بداية الفترة" -#: erpnext/public/js/controllers/transaction.js:2676 +#: erpnext/public/js/controllers/transaction.js:2678 msgid "Please set recurring after saving" msgstr "يرجى تحديد (تكرار) بعد الحفظ" @@ -38079,15 +38075,15 @@ msgstr "يرجى ضبط عنوان العميل" msgid "Please set the Default Cost Center in {0} company." msgstr "يرجى تعيين مركز التكلفة الافتراضي في الشركة {0}." -#: erpnext/manufacturing/doctype/work_order/work_order.js:686 +#: erpnext/manufacturing/doctype/work_order/work_order.js:668 msgid "Please set the Item Code first" msgstr "يرجى تعيين رمز العنصر أولا" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1664 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1681 msgid "Please set the Target Warehouse in the Job Card" msgstr "يرجى تحديد المستودع المستهدف في بطاقة الوظيفة" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1668 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1685 msgid "Please set the WIP Warehouse in the Job Card" msgstr "يرجى تحديد مستودع العمل قيد التنفيذ في بطاقة العمل" @@ -38126,7 +38122,7 @@ msgstr "يرجى ضبط {0} في مُنشئ قائمة المواد {1}" msgid "Please set {0} in Company {1} to account for Exchange Gain / Loss" msgstr "يرجى تعيين {0} في الشركة {1} لحساب مكاسب/خسائر الصرف" -#: erpnext/controllers/accounts_controller.py:594 +#: erpnext/controllers/accounts_controller.py:595 msgid "Please set {0} to {1}, the same account that was used in the original invoice {2}." msgstr "يرجى تعيين {0} إلى {1}، وهو نفس الحساب الذي تم استخدامه في الفاتورة الأصلية {2}." @@ -38148,7 +38144,7 @@ msgstr "يرجى تحديد شركة" msgid "Please specify Company to proceed" msgstr "الرجاء تحديد الشركة للمضى قدما\\n
    \\nPlease specify Company to proceed" -#: erpnext/controllers/accounts_controller.py:3207 +#: erpnext/controllers/accounts_controller.py:3201 #: erpnext/public/js/controllers/accounts.js:117 msgid "Please specify a valid Row ID for row {0} in table {1}" msgstr "يرجى تحديد هوية الصف صالحة لصف {0} في الجدول {1}" @@ -38266,8 +38262,8 @@ msgstr "Post Post String" msgid "Post Title Key" msgstr "عنوان العنوان الرئيسي" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:122 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:201 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:126 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:206 msgid "Postal Expenses" msgstr "نفقات بريدية" @@ -38350,7 +38346,7 @@ msgstr "" #: erpnext/accounts/report/accounts_payable/accounts_payable.js:16 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:15 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:18 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1196 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1119 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:15 #: erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py:38 #: erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:7 @@ -38472,10 +38468,6 @@ msgstr "تاريخ ووقت النشر" msgid "Posting Time" msgstr "نشر التوقيت" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2519 -msgid "Posting date and posting time is mandatory" -msgstr "تاريخ النشر و وقت النشر الزامي\\n
    \\nPosting date and posting time is mandatory" - #: banking/src/components/features/BankReconciliation/MatchAndReconcile.tsx:841 msgid "Posting date does not match the selected transaction" msgstr "" @@ -38549,15 +38541,15 @@ msgstr "مدعوم من {0}" msgid "Pre Sales" msgstr "قبل البيع" -#: erpnext/accounts/utils.py:2779 +#: erpnext/accounts/utils.py:2778 msgid "Pre-Submit Warning" msgstr "" -#: erpnext/accounts/utils.py:2828 +#: erpnext/accounts/utils.py:2827 msgid "Pre-Submit Warning: Credit Limit" msgstr "" -#: erpnext/accounts/utils.py:2840 +#: erpnext/accounts/utils.py:2839 msgid "Pre-Submit Warning: Packed Qty" msgstr "" @@ -38807,7 +38799,7 @@ msgstr "قائمة الأسعار البلد" msgid "Price List Currency" msgstr "قائمة الأسعار العملات" -#: erpnext/stock/get_item_details.py:1334 +#: erpnext/stock/get_item_details.py:1357 msgid "Price List Currency not selected" msgstr "قائمة أسعار العملات غير محددة" @@ -39162,7 +39154,7 @@ msgstr "اطبع الايصال" msgid "Print Receipt on Order Complete" msgstr "اطبع الإيصال عند إتمام الطلب" -#: erpnext/setup/install.py:114 +#: erpnext/setup/install.py:115 msgid "Print UOM after Quantity" msgstr "اطبع UOM بعد الكمية" @@ -39171,8 +39163,8 @@ msgstr "اطبع UOM بعد الكمية" msgid "Print Without Amount" msgstr "طباعة بدون قيمة" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:123 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:202 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:127 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:207 msgid "Print and Stationery" msgstr "طباعة وقرطاسية" @@ -39180,7 +39172,7 @@ msgstr "طباعة وقرطاسية" msgid "Print settings updated in respective print format" msgstr "تم تحديث إعدادات الطباعة في تنسيق الطباعة الخاصة\\n
    \\nPrint settings updated in respective print format" -#: erpnext/setup/install.py:121 +#: erpnext/setup/install.py:122 msgid "Print taxes with zero amount" msgstr "طباعة الضرائب مع مبلغ صفر" @@ -39283,10 +39275,6 @@ msgstr "مشكلة" msgid "Procedure" msgstr "إجراء" -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.js:47 -msgid "Procedures dropped" -msgstr "تم إسقاط الإجراءات" - #. Label of the process_deferred_accounting (Link) field in DocType 'Journal #. Entry' #. Name of a DocType @@ -39340,7 +39328,7 @@ msgstr "لا يمكن أن تتجاوز نسبة الفاقد في العملي msgid "Process Loss Qty" msgstr "كمية الفاقد في العملية" -#: erpnext/manufacturing/doctype/job_card/job_card.js:346 +#: erpnext/manufacturing/doctype/job_card/job_card.js:289 msgid "Process Loss Quantity" msgstr "كمية الفاقد في العملية" @@ -39421,6 +39409,10 @@ msgstr "عملية الاشتراك" msgid "Process in Single Transaction" msgstr "معالجة في معاملة واحدة" +#: erpnext/manufacturing/doctype/job_card/job_card.py:1461 +msgid "Process loss quantity cannot be negative." +msgstr "" + #. Label of the processed_boms (Long Text) field in DocType 'BOM Update Log' #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json msgid "Processed BOMs" @@ -39582,7 +39574,7 @@ msgstr "معرف سعر المنتج" #. Label of a Card Break in the Manufacturing Workspace #: erpnext/manufacturing/doctype/workstation/workstation.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json -#: erpnext/setup/doctype/company/company.py:474 +#: erpnext/setup/doctype/company/company.py:478 msgid "Production" msgstr "الإنتاج" @@ -39796,7 +39788,7 @@ msgstr "لا يمكن أن تتجاوز نسبة التقدم في مهمة ما msgid "Progress (%)" msgstr "تقدم (٪)" -#: erpnext/projects/doctype/project/project.py:374 +#: erpnext/projects/doctype/project/project.py:412 msgid "Project Collaboration Invitation" msgstr "دعوة للمشاركة في المشاريع" @@ -39840,7 +39832,7 @@ msgstr "حالة المشروع" msgid "Project Summary" msgstr "ملخص المشروع" -#: erpnext/projects/doctype/project/project.py:673 +#: erpnext/projects/doctype/project/project.py:711 msgid "Project Summary for {0}" msgstr "ملخص المشروع لـ {0}" @@ -39971,7 +39963,7 @@ msgstr "الكمية المتوقعة" #. Label of a Card Break in the Projects Workspace #. Title of a Workspace Sidebar #: erpnext/config/projects.py:7 erpnext/desktop_icon/projects.json -#: erpnext/projects/doctype/project/project.py:451 +#: erpnext/projects/doctype/project/project.py:489 #: erpnext/projects/workspace/projects/projects.json #: erpnext/selling/doctype/customer/customer_dashboard.py:26 #: erpnext/selling/doctype/sales_order/sales_order_dashboard.py:28 @@ -40117,7 +40109,7 @@ msgid "Prospects Engaged But Not Converted" msgstr "آفاق تشارك ولكن لم تتحول" #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:198 -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:785 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:786 msgid "Protected DocType" msgstr "" @@ -40132,7 +40124,7 @@ msgstr "تزويد بعنوان البريد الإلكتروني المسجل msgid "Providing" msgstr "توفير" -#: erpnext/setup/doctype/company/company.py:573 +#: erpnext/setup/doctype/company/company.py:577 msgid "Provisional Account" msgstr "الحساب المؤقت" @@ -40204,7 +40196,7 @@ msgstr "نشر" #: erpnext/accounts/doctype/tax_rule/tax_rule.json #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json #: erpnext/projects/doctype/project/project_dashboard.py:16 -#: erpnext/setup/doctype/company/company.py:462 erpnext/setup/install.py:404 +#: erpnext/setup/doctype/company/company.py:466 erpnext/setup/install.py:436 #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/item_lead_time/item_lead_time.json #: erpnext/stock/doctype/item_reorder/item_reorder.json @@ -40528,7 +40520,7 @@ msgstr "تم إنشاء أمر الشراء {0}" msgid "Purchase Order {0} is not submitted" msgstr "طلب الشراء {0} يجب أن يعتمد\\n
    \\nPurchase Order {0} is not submitted" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:922 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:930 msgid "Purchase Orders" msgstr "طلبات الشراء" @@ -40558,7 +40550,7 @@ msgstr "أوامر الشراء إلى الفاتورة" msgid "Purchase Orders to Receive" msgstr "أوامر الشراء لتلقي" -#: erpnext/controllers/accounts_controller.py:2016 +#: erpnext/controllers/accounts_controller.py:2017 msgid "Purchase Orders {0} are un-linked" msgstr "أوامر الشراء {0} غير مرتبطة" @@ -40692,7 +40684,7 @@ msgstr "شراء العودة" #. Label of the purchase_tax_template (Link) field in DocType 'Tax Rule' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/tax_rule/tax_rule.json -#: erpnext/setup/doctype/company/company.js:145 +#: erpnext/setup/doctype/company/company.js:161 #: erpnext/workspace_sidebar/taxes.json msgid "Purchase Tax Template" msgstr "قالب الضرائب على المشتريات" @@ -40799,10 +40791,6 @@ msgstr "المشتريات" msgid "Purpose" msgstr "غرض" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:574 -msgid "Purpose must be one of {0}" -msgstr "الهدف يجب ان يكون واحد ل {0}\\n
    \\nPurpose must be one of {0}" - #. Label of the purposes (Table) field in DocType 'Maintenance Visit' #: erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json msgid "Purposes" @@ -40858,6 +40846,7 @@ msgstr "" #. Label of the qty (Float) field in DocType 'Delivery Schedule Item' #. Label of the qty (Float) field in DocType 'Product Bundle Item' #. Label of the qty (Float) field in DocType 'Landed Cost Item' +#. Label of the qty (Float) field in DocType 'Landed Cost Taxes and Charges' #. Option for the 'Distribute Charges Based On' (Select) field in DocType #. 'Landed Cost Voucher' #. Label of the qty (Float) field in DocType 'Packed Item' @@ -40906,6 +40895,7 @@ msgstr "" #: erpnext/selling/doctype/sales_order/sales_order.js:1506 #: erpnext/selling/report/sales_order_analysis/sales_order_analysis.py:255 #: erpnext/stock/doctype/landed_cost_item/landed_cost_item.json +#: erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json #: erpnext/stock/doctype/packed_item/packed_item.json #: erpnext/stock/doctype/pick_list_item/pick_list_item.json @@ -41014,11 +41004,11 @@ msgstr "الكمية لكل وحدة" msgid "Qty To Manufacture" msgstr "الكمية للتصنيع" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1441 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1442 msgid "Qty To Manufacture ({0}) cannot be a fraction for the UOM {2}. To allow this, disable '{1}' in the UOM {2}." msgstr "لا يمكن أن تكون كمية التصنيع ({0}) كسرًا في وحدة القياس {2}. للسماح بذلك، عطّل '{1}' في وحدة القياس {2}." -#: erpnext/manufacturing/doctype/job_card/job_card.py:260 +#: erpnext/manufacturing/doctype/job_card/job_card.py:261 msgid "Qty To Manufacture in the job card cannot be greater than Qty To Manufacture in the work order for the operation {0}.

    Solution: Either you can reduce the Qty To Manufacture in the job card or set the 'Overproduction Percentage For Work Order' in the {1}." msgstr "" @@ -41069,8 +41059,8 @@ msgstr "الكمية حسب السهم لوحدة قياس السهم" msgid "Qty for which recursion isn't applicable." msgstr "الكمية التي لا ينطبق عليها التكرار." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1063 -#: erpnext/manufacturing/doctype/work_order/work_order.js:1086 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1045 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1068 msgid "Qty for {0}" msgstr "الكمية ل {0}" @@ -41125,8 +41115,8 @@ msgstr "" msgid "Qty to Fetch" msgstr "الكمية المطلوب جلبها" -#: erpnext/manufacturing/doctype/job_card/job_card.js:318 -#: erpnext/manufacturing/doctype/job_card/job_card.py:890 +#: erpnext/manufacturing/doctype/job_card/job_card.js:247 +#: erpnext/manufacturing/doctype/job_card/job_card.py:893 msgid "Qty to Manufacture" msgstr "الكمية للتصنيع" @@ -41362,17 +41352,17 @@ msgstr "قالب فحص الجودة" msgid "Quality Inspection Template Name" msgstr "قالب فحص الجودة اسم" -#: erpnext/manufacturing/doctype/job_card/job_card.py:799 +#: erpnext/manufacturing/doctype/job_card/job_card.py:800 msgid "Quality Inspection is required for the item {0} before completing the job card {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:810 -#: erpnext/manufacturing/doctype/job_card/job_card.py:819 +#: erpnext/manufacturing/doctype/job_card/job_card.py:811 +#: erpnext/manufacturing/doctype/job_card/job_card.py:820 msgid "Quality Inspection {0} is not submitted for the item: {1}" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:829 -#: erpnext/manufacturing/doctype/job_card/job_card.py:838 +#: erpnext/manufacturing/doctype/job_card/job_card.py:830 +#: erpnext/manufacturing/doctype/job_card/job_card.py:839 msgid "Quality Inspection {0} is rejected for the item: {1}" msgstr "" @@ -41386,7 +41376,7 @@ msgstr "فحص الجودة" msgid "Quality Inspections" msgstr "عمليات فحص الجودة" -#: erpnext/setup/doctype/company/company.py:504 +#: erpnext/setup/doctype/company/company.py:508 msgid "Quality Management" msgstr "إدارة الجودة" @@ -41653,7 +41643,7 @@ msgstr "" msgid "Quantity must be less than or equal to {0}" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1116 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1098 #: erpnext/stock/doctype/pick_list/pick_list.js:209 msgid "Quantity must not be more than {0}" msgstr "الكمية يجب ألا تكون أكثر من {0}" @@ -41663,21 +41653,21 @@ msgid "Quantity required for Item {0} in row {1}" msgstr "الكمية مطلوبة للبند {0} في الصف {1}\\n
    \\nQuantity required for Item {0} in row {1}" #: erpnext/manufacturing/doctype/bom/bom.py:724 -#: erpnext/manufacturing/doctype/job_card/job_card.js:399 -#: erpnext/manufacturing/doctype/job_card/job_card.js:469 +#: erpnext/manufacturing/doctype/job_card/job_card.js:342 +#: erpnext/manufacturing/doctype/job_card/job_card.js:410 #: erpnext/manufacturing/doctype/workstation/workstation.js:303 msgid "Quantity should be greater than 0" msgstr "الكمية يجب أن تكون أبر من 0\\n
    \\nQuantity should be greater than 0" -#: erpnext/manufacturing/doctype/work_order/work_order.js:361 +#: erpnext/manufacturing/doctype/work_order/work_order.js:342 msgid "Quantity to Manufacture" msgstr "كمية لتصنيع" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2646 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2644 msgid "Quantity to Manufacture can not be zero for the operation {0}" msgstr "لا يمكن أن تكون الكمية للتصنيع صفراً للتشغيل {0}" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1433 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1434 msgid "Quantity to Manufacture must be greater than 0." msgstr "\"الكمية لتصنيع\" يجب أن تكون أكبر من 0." @@ -41819,11 +41809,11 @@ msgstr "مناقصة لـ" msgid "Quotation Trends" msgstr "مؤشرات المناقصة" -#: erpnext/selling/doctype/sales_order/sales_order.py:489 +#: erpnext/selling/doctype/sales_order/sales_order.py:494 msgid "Quotation {0} is cancelled" msgstr "العرض المسعر {0} تم إلغائه" -#: erpnext/selling/doctype/sales_order/sales_order.py:402 +#: erpnext/selling/doctype/sales_order/sales_order.py:413 msgid "Quotation {0} not of type {1}" msgstr "عرض مسعر {0} ليس من النوع {1}" @@ -42130,7 +42120,7 @@ msgstr "المعدل الذي يتم تحويل العملة إلى عملة ا msgid "Rate at which this tax is applied" msgstr "السعر الذي يتم فيه تطبيق هذه الضريبة" -#: erpnext/controllers/accounts_controller.py:3925 +#: erpnext/controllers/accounts_controller.py:3931 msgid "Rate of '{}' items cannot be changed" msgstr "لا يمكن تغيير سعر العناصر '{}'" @@ -42296,7 +42286,7 @@ msgstr "المواد الخام المستهلكة" msgid "Raw Materials Consumption" msgstr "استهلاك المواد الخام" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:320 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:60 msgid "Raw Materials Missing" msgstr "" @@ -42335,12 +42325,6 @@ msgstr "لا يمكن ترك المواد الخام فارغة." msgid "Raw Materials to Customer" msgstr "المواد الخام للعميل" -#. Option for the 'Data Fetch Method' (Select) field in DocType 'Accounts -#. Settings' -#: erpnext/accounts/doctype/accounts_settings/accounts_settings.json -msgid "Raw SQL" -msgstr "SQL الخام" - #. Description of the 'Validate consumed quantity (as per BOM)' (Check) field #. in DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json @@ -42349,7 +42333,7 @@ msgstr "سيتم التحقق من كمية المواد الخام المسته #: erpnext/buying/doctype/purchase_order/purchase_order.js:345 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:124 -#: erpnext/manufacturing/doctype/work_order/work_order.js:785 +#: erpnext/manufacturing/doctype/work_order/work_order.js:767 #: erpnext/selling/doctype/sales_order/sales_order.js:1012 #: erpnext/selling/doctype/sales_order/sales_order_list.js:70 #: erpnext/stock/doctype/material_request/material_request.js:243 @@ -42530,7 +42514,7 @@ msgid "Receivable / Payable Account" msgstr "القبض / حساب الدائنة" #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:79 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1212 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1135 #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:241 #: erpnext/accounts/report/sales_register/sales_register.py:217 #: erpnext/accounts/report/sales_register/sales_register.py:271 @@ -42991,7 +42975,7 @@ msgstr "مرجع #" msgid "Reference #{0} dated {1}" msgstr "المرجع # {0} بتاريخ {1}" -#: erpnext/public/js/controllers/transaction.js:2789 +#: erpnext/public/js/controllers/transaction.js:2791 msgid "Reference Date for Early Payment Discount" msgstr "تاريخ مرجعي لخصم الدفع المبكر" @@ -43155,11 +43139,11 @@ msgstr "المرجع: {0}، رمز العنصر: {1} والعميل: {2}" msgid "References" msgstr "المراجع" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:403 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:404 msgid "References to Sales Invoices are Incomplete" msgstr "المراجع المتعلقة بفواتير المبيعات غير مكتملة" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:395 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:396 msgid "References to Sales Orders are Incomplete" msgstr "المراجع المتعلقة بأوامر البيع غير مكتملة" @@ -43321,7 +43305,7 @@ msgid "Remaining Amount" msgstr "المبلغ المتبقي" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:189 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1289 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1212 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:180 msgid "Remaining Balance" msgstr "الرصيد المتبقي" @@ -43379,7 +43363,7 @@ msgstr "كلام" #: erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:11 #: erpnext/accounts/report/accounts_payable/accounts_payable.html:135 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.html:136 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1321 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1244 #: erpnext/accounts/report/general_ledger/general_ledger.html:163 #: erpnext/accounts/report/general_ledger/general_ledger.py:818 #: erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:112 @@ -43443,7 +43427,7 @@ msgstr "إعادة تسمية سمة السمة في سمة البند." msgid "Rename Log" msgstr "إعادة تسمية الدخول" -#: erpnext/accounts/doctype/account/account.py:558 +#: erpnext/accounts/doctype/account/account.py:559 msgid "Rename Not Allowed" msgstr "إعادة تسمية غير مسموح به" @@ -43460,7 +43444,7 @@ msgstr "تمت إضافة مهام إعادة تسمية نوع المستند { msgid "Rename jobs for doctype {0} have not been enqueued." msgstr "لم يتم وضع مهام إعادة تسمية نوع المستند {0} في قائمة الانتظار." -#: erpnext/accounts/doctype/account/account.py:550 +#: erpnext/accounts/doctype/account/account.py:551 msgid "Renaming it is only allowed via parent company {0}, to avoid mismatch." msgstr "يُسمح بإعادة تسميته فقط عبر الشركة الأم {0} ، لتجنب عدم التطابق." @@ -43580,11 +43564,11 @@ msgstr "بنود التقرير" msgid "Report Template" msgstr "نموذج تقرير" -#: erpnext/accounts/doctype/account/account.py:462 +#: erpnext/accounts/doctype/account/account.py:463 msgid "Report Type is mandatory" msgstr "نوع التقرير إلزامي\\n
    \\nReport Type is mandatory" -#: erpnext/setup/install.py:216 +#: erpnext/setup/install.py:248 msgid "Report an Issue" msgstr "الإبلاغ عن مشكلة" @@ -43829,7 +43813,7 @@ msgstr "طلب المعلومات" #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:328 -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:430 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:434 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.js:88 #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:70 @@ -44010,7 +43994,7 @@ msgstr "يتطلب وفاء" msgid "Research" msgstr "ابحاث" -#: erpnext/setup/doctype/company/company.py:510 +#: erpnext/setup/doctype/company/company.py:514 msgid "Research & Development" msgstr "البحث و التطوير" @@ -44055,7 +44039,7 @@ msgstr "حجز" msgid "Reservation Based On" msgstr "الحجز مبني على" -#: erpnext/manufacturing/doctype/work_order/work_order.js:943 +#: erpnext/manufacturing/doctype/work_order/work_order.js:925 #: erpnext/selling/doctype/sales_order/sales_order.js:107 #: erpnext/stock/doctype/pick_list/pick_list.js:153 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:179 @@ -44099,7 +44083,7 @@ msgstr "مخصص للتجميع الفرعي" msgid "Reserved" msgstr "محجوز" -#: erpnext/controllers/stock_controller.py:1329 +#: erpnext/controllers/stock_controller.py:1330 msgid "Reserved Batch Conflict" msgstr "تعارض الدُفعات المحجوزة" @@ -44169,14 +44153,14 @@ msgstr "الكمية المحجوزة" msgid "Reserved Quantity for Production" msgstr "الكمية المحجوزة للإنتاج" -#: erpnext/stock/stock_ledger.py:2340 +#: erpnext/stock/stock_ledger.py:2306 msgid "Reserved Serial No." msgstr "رقم تسلسلي محجوز" #. Label of the reserved_stock (Float) field in DocType 'Bin' #. Name of a report #: erpnext/manufacturing/doctype/plant_floor/stock_summary_template.html:24 -#: erpnext/manufacturing/doctype/work_order/work_order.js:959 +#: erpnext/manufacturing/doctype/work_order/work_order.js:941 #: erpnext/public/js/stock_reservation.js:236 #: erpnext/selling/doctype/sales_order/sales_order.js:128 #: erpnext/selling/doctype/sales_order/sales_order.js:495 @@ -44185,13 +44169,13 @@ msgstr "رقم تسلسلي محجوز" #: erpnext/stock/doctype/pick_list/pick_list.js:173 #: erpnext/stock/report/reserved_stock/reserved_stock.json #: erpnext/stock/report/stock_balance/stock_balance.py:576 -#: erpnext/stock/stock_ledger.py:2324 +#: erpnext/stock/stock_ledger.py:2290 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:204 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:332 msgid "Reserved Stock" msgstr "المخزون المحجوز" -#: erpnext/stock/stock_ledger.py:2369 +#: erpnext/stock/stock_ledger.py:2335 msgid "Reserved Stock for Batch" msgstr "المخزون المحجوز للدفعة" @@ -44457,7 +44441,7 @@ msgstr "النتيجة عنوان الحقل" msgid "Resume" msgstr "استئنف" -#: erpnext/manufacturing/doctype/job_card/job_card.js:247 +#: erpnext/manufacturing/doctype/job_card/job_card.js:659 msgid "Resume Job" msgstr "سيرة ذاتية للوظيفة" @@ -44482,8 +44466,8 @@ msgstr "بائع تجزئة" msgid "Retain Sample" msgstr "الاحتفاظ عينة" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:196 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:348 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:200 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:353 msgid "Retained Earnings" msgstr "أرباح محتجزة" @@ -44558,7 +44542,7 @@ msgstr "العودة ضد شراء إيصال" msgid "Return Against Subcontracting Receipt" msgstr "رد المبلغ المدفوع مقابل إيصال التعاقد من الباطن" -#: erpnext/manufacturing/doctype/work_order/work_order.js:302 +#: erpnext/manufacturing/doctype/work_order/work_order.js:283 msgid "Return Components" msgstr "مكونات الإرجاع" @@ -44692,8 +44676,8 @@ msgstr "النتائج" msgid "Revaluation Journals" msgstr "دفاتر إعادة التقييم" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:197 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:353 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:201 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:358 msgid "Revaluation Surplus" msgstr "فائض إعادة التقييم" @@ -44921,11 +44905,11 @@ msgstr "نوع الجذر" msgid "Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity" msgstr "يجب أن يكون نوع الجذر لـ {0} أحد الأصول أو الخصوم أو الإيرادات أو المصروفات أو حقوق الملكية." -#: erpnext/accounts/doctype/account/account.py:459 +#: erpnext/accounts/doctype/account/account.py:460 msgid "Root Type is mandatory" msgstr "نوع الجذر إلزامي\\n
    \\nRoot Type is mandatory" -#: erpnext/accounts/doctype/account/account.py:215 +#: erpnext/accounts/doctype/account/account.py:216 msgid "Root cannot be edited." msgstr "الجذرلا يمكن تعديل." @@ -44944,8 +44928,8 @@ msgstr "كمية القضبان المستديرة" #. Option for the 'Account Type' (Select) field in DocType 'Account' #. Label of the round_off_section (Section Break) field in DocType 'Company' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:124 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:206 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:128 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:211 #: erpnext/accounts/report/account_balance/account_balance.js:56 #: erpnext/setup/doctype/company/company.json msgid "Round Off" @@ -45125,17 +45109,17 @@ msgstr "الصف # {0}: لا يمكن أن يكون المعدل أكبر من msgid "Row # {0}: Returned Item {1} does not exist in {2} {3}" msgstr "الصف رقم {0}: العنصر الذي تم إرجاعه {1} غير موجود في {2} {3}" -#: erpnext/manufacturing/doctype/work_order/work_order.py:279 +#: erpnext/manufacturing/doctype/work_order/work_order.py:280 msgid "Row #1: Sequence ID must be 1 for Operation {0}." msgstr "الصف رقم 1: يجب أن يكون معرف التسلسل 1 للعملية {0}." #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:565 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2073 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2154 msgid "Row #{0} (Payment Table): Amount must be negative" msgstr "الصف # {0} (جدول الدفع): يجب أن يكون المبلغ سلبيًا" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:563 -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2068 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2149 msgid "Row #{0} (Payment Table): Amount must be positive" msgstr "الصف رقم {0} (جدول الدفع): يجب أن يكون المبلغ موجبا" @@ -45160,7 +45144,7 @@ msgstr "الصف #{0}: لا يمكن أن يكون المستودع المقبو msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}" msgstr "الصف #{0}: المستودع المقبول إلزامي للصنف المقبول {1}" -#: erpnext/controllers/accounts_controller.py:1294 +#: erpnext/controllers/accounts_controller.py:1295 msgid "Row #{0}: Account {1} does not belong to company {2}" msgstr "الصف # {0}: الحساب {1} لا ينتمي إلى الشركة {2}" @@ -45221,31 +45205,31 @@ msgstr "الصف #{0}: لا يمكن إلغاء إدخال المخزون هذا msgid "Row #{0}: Cannot create entry with different taxable AND withholding document links." msgstr "الصف #{0}: لا يمكن إنشاء إدخال بروابط مستندات مختلفة للضرائب والحجز." -#: erpnext/controllers/accounts_controller.py:3802 +#: erpnext/controllers/accounts_controller.py:3808 msgid "Row #{0}: Cannot delete item {1} which has already been billed." msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تحرير فاتورة به بالفعل." -#: erpnext/controllers/accounts_controller.py:3776 +#: erpnext/controllers/accounts_controller.py:3782 msgid "Row #{0}: Cannot delete item {1} which has already been delivered" msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تسليمه بالفعل" -#: erpnext/controllers/accounts_controller.py:3795 +#: erpnext/controllers/accounts_controller.py:3801 msgid "Row #{0}: Cannot delete item {1} which has already been received" msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم استلامه بالفعل" -#: erpnext/controllers/accounts_controller.py:3782 +#: erpnext/controllers/accounts_controller.py:3788 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it." msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تعيين ترتيب العمل إليه." -#: erpnext/controllers/accounts_controller.py:3788 +#: erpnext/controllers/accounts_controller.py:3794 msgid "Row #{0}: Cannot delete item {1} which is already ordered against this Sales Order." msgstr "الصف #{0}: لا يمكن حذف العنصر {1} الذي تم طلبه بالفعل مقابل أمر البيع هذا." -#: erpnext/controllers/accounts_controller.py:3936 +#: erpnext/controllers/accounts_controller.py:3942 msgid "Row #{0}: Cannot set Rate if the billed amount is greater than the amount for Item {1}." msgstr "الصف #{0}: لا يمكن تحديد السعر إذا كان المبلغ المطلوب دفعه أكبر من المبلغ الخاص بالعنصر {1}." -#: erpnext/manufacturing/doctype/job_card/job_card.py:1128 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1136 msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}" msgstr "الصف #{0}: لا يمكن نقل أكثر من الكمية المطلوبة {1} للعنصر {2} مقابل بطاقة العمل {3}" @@ -45295,11 +45279,11 @@ msgstr "الصف #{0}: لا يمكن إضافة العنصر المقدم من msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times in the Subcontracting Inward process." msgstr "الصف #{0}: لا يمكن إضافة العنصر المقدم من العميل {1} عدة مرات في عملية التعاقد من الباطن الواردة." -#: erpnext/manufacturing/doctype/work_order/work_order.py:356 +#: erpnext/manufacturing/doctype/work_order/work_order.py:357 msgid "Row #{0}: Customer Provided Item {1} cannot be added multiple times." msgstr "الصف #{0}: لا يمكن إضافة العنصر المقدم من العميل {1} عدة مرات." -#: erpnext/manufacturing/doctype/work_order/work_order.py:381 +#: erpnext/manufacturing/doctype/work_order/work_order.py:382 msgid "Row #{0}: Customer Provided Item {1} does not exist in the Required Items table linked to the Subcontracting Inward Order." msgstr "الصف #{0}: العنصر المقدم من العميل {1} غير موجود في جدول العناصر المطلوبة المرتبط بأمر التوريد الداخلي للتعاقد من الباطن." @@ -45307,7 +45291,7 @@ msgstr "الصف #{0}: العنصر المقدم من العميل {1} غير م msgid "Row #{0}: Customer Provided Item {1} exceeds quantity available through Subcontracting Inward Order" msgstr "الصف #{0}: يتجاوز المنتج المقدم من العميل {1} الكمية المتاحة من خلال طلب الشراء الداخلي للتعاقد من الباطن" -#: erpnext/manufacturing/doctype/work_order/work_order.py:369 +#: erpnext/manufacturing/doctype/work_order/work_order.py:370 msgid "Row #{0}: Customer Provided Item {1} has insufficient quantity in the Subcontracting Inward Order. Available quantity is {2}." msgstr "الصف #{0}: الكمية المتوفرة من الصنف المقدم من العميل {1} غير كافية في طلب الشراء الداخلي للمقاول من الباطن. الكمية المتاحة هي {2}." @@ -45363,7 +45347,7 @@ msgstr "الصف #{0}: لم يتم تحديد عنصر المنتج النهائ msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item" msgstr "الصف #{0}: يجب أن يكون المنتج النهائي {1} منتجًا تم التعاقد عليه من الباطن" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:530 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:395 msgid "Row #{0}: Finished Good must be {1}" msgstr "الصف #{0}: يجب أن يكون المنتج النهائي {1}" @@ -45392,7 +45376,7 @@ msgstr "الصف #{0}: يجب أن يكون معدل الاستهلاك أكبر msgid "Row #{0}: From Date cannot be before To Date" msgstr "الصف #{0}: لا يمكن أن يكون تاريخ البدء قبل تاريخ الانتهاء" -#: erpnext/manufacturing/doctype/job_card/job_card.py:880 +#: erpnext/manufacturing/doctype/job_card/job_card.py:881 msgid "Row #{0}: From Time and To Time fields are required" msgstr "الصف #{0}: حقلا \"من وقت\" و\"إلى وقت\" مطلوبان." @@ -45400,7 +45384,7 @@ msgstr "الصف #{0}: حقلا \"من وقت\" و\"إلى وقت\" مطلوبا msgid "Row #{0}: Item added" msgstr "الصف # {0}: تمت إضافة العنصر" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1629 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:78 msgid "Row #{0}: Item {1} cannot be transferred more than {2} against {3} {4}" msgstr "الصف #{0}: لا يمكن نقل العنصر {1} إلى أكثر من {2} مقابل {3} {4}" @@ -45469,7 +45453,7 @@ msgstr "الصف #{0}: لا يمكن أن يكون تاريخ الاستهلاك msgid "Row #{0}: Next Depreciation Date cannot be before Purchase Date" msgstr "الصف #{0}: لا يمكن أن يكون تاريخ الاستهلاك التالي قبل تاريخ الشراء" -#: erpnext/selling/doctype/sales_order/sales_order.py:675 +#: erpnext/selling/doctype/sales_order/sales_order.py:678 msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists" msgstr "الصف رقم {0}: غير مسموح تغيير المورد لأن أمر الشراء موجود مسبقاً\\n
    \\nRow #{0}: Not allowed to change Supplier as Purchase Order already exists" @@ -45481,10 +45465,6 @@ msgstr "الصف #{0}: الصف {1} فقط متاح للحجز للعنصر {2}" msgid "Row #{0}: Opening Accumulated Depreciation must be less than or equal to {1}" msgstr "الصف #{0}: يجب أن يكون الاستهلاك المتراكم الافتتاحي أقل من أو يساوي {1}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:955 -msgid "Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}." -msgstr "الصف # {0}: العملية {1} لم تكتمل لـ {2} الكمية من السلع تامة الصنع في أمر العمل {3}. يرجى تحديث حالة التشغيل عبر بطاقة العمل {4}." - #: erpnext/controllers/subcontracting_inward_controller.py:208 #: erpnext/controllers/subcontracting_inward_controller.py:342 msgid "Row #{0}: Overconsumption of Customer Provided Item {1} against Work Order {2} is not allowed in the Subcontracting Inward process." @@ -45510,7 +45490,7 @@ msgstr "الصف #{0}: الرجاء تحديد مستودع التجميع ال msgid "Row #{0}: Please set reorder quantity" msgstr "الصف # {0}: يرجى تعيين إعادة ترتيب الكمية\\n
    \\nRow #{0}: Please set reorder quantity" -#: erpnext/controllers/accounts_controller.py:617 +#: erpnext/controllers/accounts_controller.py:618 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master" msgstr "الصف #{0}: يرجى تحديث حساب الإيرادات/المصروفات المؤجلة في صف البند أو الحساب الافتراضي في بيانات الشركة الرئيسية" @@ -45532,15 +45512,15 @@ msgstr "الصف #{0}: يجب أن تكون الكمية عددًا موجبًا msgid "Row #{0}: Qty should be less than or equal to Available Qty to Reserve (Actual Qty - Reserved Qty) {1} for Iem {2} against Batch {3} in Warehouse {4}." msgstr "الصف #{0}: يجب أن تكون الكمية أقل من أو تساوي الكمية المتاحة للحجز (الكمية الفعلية - الكمية المحجوزة) {1} للصنف {2} مقابل الدفعة {3} في المستودع {4}." -#: erpnext/controllers/stock_controller.py:1466 +#: erpnext/controllers/stock_controller.py:1467 msgid "Row #{0}: Quality Inspection is required for Item {1}" msgstr "الصف #{0}: يلزم فحص الجودة للعنصر {1}" -#: erpnext/controllers/stock_controller.py:1481 +#: erpnext/controllers/stock_controller.py:1482 msgid "Row #{0}: Quality Inspection {1} is not submitted for the item: {2}" msgstr "الصف #{0}: لم يتم تقديم فحص الجودة {1} للعنصر: {2}" -#: erpnext/controllers/stock_controller.py:1496 +#: erpnext/controllers/stock_controller.py:1497 msgid "Row #{0}: Quality Inspection {1} was rejected for item {2}" msgstr "الصف #{0}: تم رفض فحص الجودة {1} للعنصر {2}" @@ -45548,7 +45528,7 @@ msgstr "الصف #{0}: تم رفض فحص الجودة {1} للعنصر {2}" msgid "Row #{0}: Quantity cannot be a non-positive number. Please increase the quantity or remove the Item {1}" msgstr "الصف #{0}: لا يمكن أن تكون الكمية عددًا غير موجب. يُرجى زيادة الكمية أو إزالة العنصر {1}" -#: erpnext/controllers/accounts_controller.py:1457 +#: erpnext/controllers/accounts_controller.py:1458 msgid "Row #{0}: Quantity for Item {1} cannot be zero." msgstr "الصف # {0}: كمية البند {1} لا يمكن أن يكون صفرا" @@ -45564,8 +45544,8 @@ msgstr "" msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0." msgstr "الصف #{0}: يجب أن تكون الكمية المراد حجزها للعنصر {1} أكبر من 0." -#: erpnext/controllers/accounts_controller.py:872 -#: erpnext/controllers/accounts_controller.py:884 +#: erpnext/controllers/accounts_controller.py:873 +#: erpnext/controllers/accounts_controller.py:885 #: erpnext/utilities/transaction_base.py:172 #: erpnext/utilities/transaction_base.py:178 msgid "Row #{0}: Rate must be same as {1}: {2} ({3} / {4})" @@ -45614,7 +45594,7 @@ msgid "Row #{0}: Selling rate for item {1} is lower than its {2}.\n" "\t\t\t\t\tthis validation." msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.py:285 +#: erpnext/manufacturing/doctype/work_order/work_order.py:286 msgid "Row #{0}: Sequence ID must be {1} or {2} for Operation {3}." msgstr "الصف #{0}: يجب أن يكون معرف التسلسل {1} أو {2} للعملية {3}." @@ -45634,19 +45614,19 @@ msgstr "الصف #{0}: تم تحديد الرقم التسلسلي {1} بالف msgid "Row #{0}: Serial No(s) {1} are not a part of the linked Subcontracting Inward Order. Please select valid Serial No(s)." msgstr "الصف #{0}: الأرقام التسلسلية {1} ليست جزءًا من أمر التوريد الداخلي المرتبط بالتعاقد من الباطن. يرجى تحديد رقم تسلسلي صحيح." -#: erpnext/controllers/accounts_controller.py:645 +#: erpnext/controllers/accounts_controller.py:646 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date" msgstr "الصف # {0}: لا يمكن أن يكون تاريخ انتهاء الخدمة قبل تاريخ ترحيل الفاتورة" -#: erpnext/controllers/accounts_controller.py:639 +#: erpnext/controllers/accounts_controller.py:640 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date" msgstr "الصف # {0}: لا يمكن أن يكون تاريخ بدء الخدمة أكبر من تاريخ انتهاء الخدمة" -#: erpnext/controllers/accounts_controller.py:633 +#: erpnext/controllers/accounts_controller.py:634 msgid "Row #{0}: Service Start and End Date is required for deferred accounting" msgstr "الصف # {0}: مطلوب بداية وتاريخ انتهاء الخدمة للمحاسبة المؤجلة" -#: erpnext/selling/doctype/sales_order/sales_order.py:497 +#: erpnext/selling/doctype/sales_order/sales_order.py:502 msgid "Row #{0}: Set Supplier for item {1}" msgstr "الصف # {0}: حدد المورد للبند {1}" @@ -45658,19 +45638,19 @@ msgstr "الصف #{0}: بما أن خيار \"تتبع المنتجات نصف msgid "Row #{0}: Source Warehouse must be same as Customer Warehouse {1} from the linked Subcontracting Inward Order" msgstr "الصف #{0}: يجب أن يكون مستودع المصدر هو نفسه مستودع العميل {1} من أمر التوريد الداخلي المرتبط بالتعاقد من الباطن" -#: erpnext/manufacturing/doctype/work_order/work_order.py:390 +#: erpnext/manufacturing/doctype/work_order/work_order.py:391 msgid "Row #{0}: Source Warehouse {1} for item {2} cannot be a customer warehouse." msgstr "الصف #{0}: لا يمكن أن يكون مستودع المصدر {1} للعنصر {2} مستودع عميل." -#: erpnext/manufacturing/doctype/work_order/work_order.py:345 +#: erpnext/manufacturing/doctype/work_order/work_order.py:346 msgid "Row #{0}: Source Warehouse {1} for item {2} must be same as Source Warehouse {3} in the Work Order." msgstr "الصف #{0}: يجب أن يكون مستودع المصدر {1} للعنصر {2} هو نفسه مستودع المصدر {3} في أمر العمل." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1102 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:40 msgid "Row #{0}: Source and Target Warehouse cannot be the same for Material Transfer" msgstr "الصف #{0}: لا يمكن أن يكون مستودع المصدر ومستودع الهدف متطابقين لنقل المواد" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1124 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:62 msgid "Row #{0}: Source, Target Warehouse and Inventory Dimensions cannot be the exact same for Material Transfer" msgstr "الصف #{0}: لا يمكن أن تكون أبعاد المستودع المصدر والمستودع الهدف والمخزون متطابقة تمامًا في عملية نقل المواد." @@ -45686,6 +45666,10 @@ msgstr "الصف #{0}: الحالة إلزامية" msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}" msgstr "الصف # {0}: يجب أن تكون الحالة {1} بالنسبة لخصم الفاتورة {2}" +#: erpnext/stock/doctype/delivery_note/delivery_note.py:485 +msgid "Row #{0}: Stock Delivered But Not Billed account cannot be used for items linked to a Sales Invoice" +msgstr "" + #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:403 msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}." msgstr "الصف #{0}: لا يمكن حجز المخزون للصنف {1} مقابل دفعة معطلة {2}." @@ -45702,7 +45686,7 @@ msgstr "الصف #{0}: لا يمكن حجز المخزون في مستودع ا msgid "Row #{0}: Stock is already reserved for the Item {1}." msgstr "الصف #{0}: تم حجز المخزون بالفعل للصنف {1}." -#: erpnext/stock/doctype/delivery_note/delivery_note.py:557 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:598 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}." msgstr "الصف #{0}: تم حجز المخزون للصنف {1} في المستودع {2}." @@ -45779,7 +45763,7 @@ msgstr "الصف رقم {0}: {1} مطلوب لإنشاء فواتير الافت msgid "Row #{0}: {1} of {2} should be {3}. Please update the {1} or select a different account." msgstr "الصف #{0}: {1} من {2} يجب أن يكون {3}. يرجى تحديث {1} أو اختيار حساب آخر." -#: erpnext/controllers/accounts_controller.py:4042 +#: erpnext/controllers/accounts_controller.py:4048 msgid "Row #{0}:Quantity for Item {1} cannot be zero." msgstr "" @@ -45888,7 +45872,7 @@ msgstr "الصف رقم {}: {} {} لا ينتمي إلى الشركة {}. يرج msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}" msgstr "رقم الصف {0}: مطلوب تحديد مستودع. يُرجى تحديد مستودع افتراضي للصنف {1} والشركة {2}" -#: erpnext/manufacturing/doctype/job_card/job_card.py:747 +#: erpnext/manufacturing/doctype/job_card/job_card.py:748 msgid "Row {0} : Operation is required against the raw material item {1}" msgstr "الصف {0}: العملية مطلوبة مقابل عنصر المادة الخام {1}" @@ -45896,7 +45880,7 @@ msgstr "الصف {0}: العملية مطلوبة مقابل عنصر الماد msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required." msgstr "الكمية المختارة من الصف {0} أقل من الكمية المطلوبة، يلزم كمية إضافية {1} {2} ." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1653 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:94 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}" msgstr "الصف {0}# العنصر {1} غير موجود في جدول \"المواد الخام الموردة\" في {2} {3}" @@ -45928,11 +45912,11 @@ msgstr "الصف {0}: يجب أن يكون المبلغ المخصص {1} أقل msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}" msgstr "الصف {0}: يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي مبلغ الدفعة المتبقية {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1314 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:691 msgid "Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials." msgstr "الصف {0}: بما أن {1} مُفعّل، فلا يمكن إضافة المواد الخام إلى المدخل {2} . استخدم المدخل {3} لاستهلاك المواد الخام." -#: erpnext/stock/doctype/material_request/material_request.py:862 +#: erpnext/stock/doctype/material_request/material_request.py:861 msgid "Row {0}: Bill of Materials not found for the Item {1}" msgstr "صف {0}: من مواد مشروع القانون لم يتم العثور على هذا البند {1}" @@ -45950,7 +45934,7 @@ msgstr "الصف {0}: يجب أن تكون الكمية المستهلكة {1} { msgid "Row {0}: Conversion Factor is mandatory" msgstr "الصف {0}: معامل التحويل إلزامي" -#: erpnext/controllers/accounts_controller.py:3245 +#: erpnext/controllers/accounts_controller.py:3239 msgid "Row {0}: Cost Center {1} does not belong to Company {2}" msgstr "الصف {0}: مركز التكلفة {1} لا ينتمي إلى الشركة {2}" @@ -45970,7 +45954,7 @@ msgstr "الصف {0}: العملة للـ BOM #{1} يجب أن يساوي الع msgid "Row {0}: Debit entry can not be linked with a {1}" msgstr "الصف {0}: لا يمكن ربط قيد مدين مع {1}" -#: erpnext/controllers/selling_controller.py:879 +#: erpnext/controllers/selling_controller.py:880 msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same" msgstr "الصف {0}: لا يمكن أن يكون مستودع التسليم ({1}) ومستودع العميل ({2}) متماثلين" @@ -45978,7 +45962,7 @@ msgstr "الصف {0}: لا يمكن أن يكون مستودع التسليم ({ msgid "Row {0}: Delivery Warehouse cannot be same as Customer Warehouse for Item {1}." msgstr "الصف {0}: لا يمكن أن يكون مستودع التسليم هو نفسه مستودع العميل بالنسبة للعنصر {1}." -#: erpnext/controllers/accounts_controller.py:2736 +#: erpnext/controllers/accounts_controller.py:2737 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date" msgstr "الصف {0}: لا يمكن أن يكون تاريخ الاستحقاق في جدول شروط الدفع قبل تاريخ الترحيل" @@ -46023,16 +46007,16 @@ msgstr "الصف {0}: للمورد {1} ، مطلوب عنوان البريد ا msgid "Row {0}: From Time and To Time is mandatory." msgstr "صف {0}: (من الوقت) و (إلى وقت) تكون إلزامية." -#: erpnext/manufacturing/doctype/job_card/job_card.py:325 +#: erpnext/manufacturing/doctype/job_card/job_card.py:326 #: erpnext/projects/doctype/timesheet/timesheet.py:225 msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}" msgstr "الصف {0}: من وقت إلى وقت {1} يتداخل مع {2}" -#: erpnext/controllers/stock_controller.py:1562 +#: erpnext/controllers/stock_controller.py:1563 msgid "Row {0}: From Warehouse is mandatory for internal transfers" msgstr "الصف {0}: من المستودع إلزامي للتحويلات الداخلية" -#: erpnext/manufacturing/doctype/job_card/job_card.py:316 +#: erpnext/manufacturing/doctype/job_card/job_card.py:317 msgid "Row {0}: From time must be less than to time" msgstr "الصف {0}: من وقت يجب أن يكون أقل من الوقت" @@ -46048,7 +46032,7 @@ msgstr "الصف {0}: مرجع غير صالحة {1}" msgid "Row {0}: Item Tax template updated as per validity and rate applied" msgstr "الصف {0}: تم تحديث نموذج ضريبة الصنف وفقًا للصلاحية والسعر المطبق" -#: erpnext/controllers/selling_controller.py:644 +#: erpnext/controllers/selling_controller.py:645 msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer" msgstr "الصف {0}: تم تحديث سعر الصنف وفقًا لسعر التقييم نظرًا لكونه تحويلًا داخليًا للمخزون" @@ -46072,7 +46056,7 @@ msgstr "الصف {0}: لا يمكن أن تكون كمية العنصر {1}أع msgid "Row {0}: Operation time should be greater than 0 for operation {1}" msgstr "" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:614 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:655 msgid "Row {0}: Packed Qty must be equal to {1} Qty." msgstr "الصف {0}: يجب أن تكون الكمية المعبأة مساوية للكمية {1} ." @@ -46140,7 +46124,7 @@ msgstr "الصف {0}: فاتورة الشراء {1} ليس لها أي تأثي msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}." msgstr "الصف {0}: لا يمكن أن تكون الكمية أكبر من {1} للعنصر {2}." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:621 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:195 msgid "Row {0}: Qty in Stock UOM can not be zero." msgstr "الصف {0}: لا يمكن أن تكون الكمية في المخزون بوحدة القياس صفرًا." @@ -46152,10 +46136,6 @@ msgstr "الصف {0}: يجب أن تكون الكمية أكبر من 0." msgid "Row {0}: Quantity cannot be negative." msgstr "الصف {0}: لا يمكن أن تكون الكمية سالبة." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1029 -msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})" -msgstr "الصف {0}: الكمية غير متوفرة {4} في المستودع {1} في وقت نشر الإدخال ({2} {3})" - #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:886 msgid "Row {0}: Sales Invoice {1} is already created for {2}" msgstr "الصف {0}: تم إنشاء فاتورة المبيعات {1} بالفعل لـ {2}" @@ -46164,11 +46144,11 @@ msgstr "الصف {0}: تم إنشاء فاتورة المبيعات {1} بالف msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed" msgstr "الصف {0}: لا يمكن تغيير المناوبة لأن عملية الإهلاك قد تمت بالفعل" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1666 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/subcontracting.py:105 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}" msgstr "الصف {0}: العنصر المتعاقد عليه من الباطن إلزامي للمادة الخام {1}" -#: erpnext/controllers/stock_controller.py:1553 +#: erpnext/controllers/stock_controller.py:1554 msgid "Row {0}: Target Warehouse is mandatory for internal transfers" msgstr "الصف {0}: المستودع المستهدف إلزامي للتحويلات الداخلية" @@ -46180,11 +46160,11 @@ msgstr "الصف {0}: المهمة {1} لا تنتمي إلى المشروع {2} msgid "Row {0}: The entire expense amount for account {1} in {2} has already been allocated." msgstr "الصف {0}: تم تخصيص مبلغ المصروفات بالكامل للحساب {1} في {2} بالفعل." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:667 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:108 msgid "Row {0}: The item {1}, quantity must be positive number" msgstr "الصف {0}: العنصر {1} ، يجب أن تكون الكمية رقمًا موجبًا" -#: erpnext/controllers/accounts_controller.py:3222 +#: erpnext/controllers/accounts_controller.py:3216 msgid "Row {0}: The {3} Account {1} does not belong to the company {2}" msgstr "الصف {0}: الحساب {3} {1} لا ينتمي إلى الشركة {2}" @@ -46192,11 +46172,11 @@ msgstr "الصف {0}: الحساب {3} {1} لا ينتمي إلى الشركة { msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}" msgstr "الصف {0}: لتعيين دورية {1} ، يجب أن يكون الفرق بين تاريخي البداية والنهاية أكبر من أو يساوي {2}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3577 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:348 msgid "Row {0}: Transferred quantity cannot be greater than the requested quantity." msgstr "الصف {0}: لا يمكن أن تكون الكمية المنقولة أكبر من الكمية المطلوبة." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:615 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:189 msgid "Row {0}: UOM Conversion Factor is mandatory" msgstr "الصف {0}: عامل تحويل UOM إلزامي\\n
    \\nRow {0}: UOM Conversion Factor is mandatory" @@ -46209,11 +46189,11 @@ msgid "Row {0}: Warehouse {1} is linked to company {2}. Please select a warehous msgstr "" #: erpnext/manufacturing/doctype/bom/bom.py:1248 -#: erpnext/manufacturing/doctype/work_order/work_order.py:419 +#: erpnext/manufacturing/doctype/work_order/work_order.py:420 msgid "Row {0}: Workstation or Workstation Type is mandatory for an operation {1}" msgstr "الصف {0}: محطة العمل أو نوع محطة العمل إلزامي للعملية {1}" -#: erpnext/controllers/accounts_controller.py:1176 +#: erpnext/controllers/accounts_controller.py:1177 msgid "Row {0}: user has not applied the rule {1} on the item {2}" msgstr "الصف {0}: لم يطبق المستخدم القاعدة {1} على العنصر {2}" @@ -46225,7 +46205,7 @@ msgstr "الصف {0}: {1} تم تقديم طلب بالفعل للحساب في msgid "Row {0}: {1} must be greater than 0" msgstr "الصف {0}: يجب أن يكون {1} أكبر من 0" -#: erpnext/controllers/accounts_controller.py:782 +#: erpnext/controllers/accounts_controller.py:783 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}" msgstr "الصف {0}: {1} {2} لا يمكن أن يكون هو نفسه {3} (حساب الطرفية) {4}" @@ -46271,7 +46251,7 @@ msgstr "تمت إزالة الصفوف في {0}" msgid "Rows with Same Account heads will be merged on Ledger" msgstr "سيتم دمج الصفوف التي تحتوي على نفس رؤوس الحسابات في دفتر الأستاذ" -#: erpnext/controllers/accounts_controller.py:2747 +#: erpnext/controllers/accounts_controller.py:2748 msgid "Rows with duplicate due dates in other rows were found: {0}" msgstr "تم العثور على صفوف ذات تواريخ استحقاق مكررة في صفوف أخرى: {0}" @@ -46279,7 +46259,7 @@ msgstr "تم العثور على صفوف ذات تواريخ استحقاق م msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually." msgstr "الصفوف: {0} تحتوي على \"إدخال الدفع\" كنوع مرجعي. لا ينبغي تعيين هذا يدويًا." -#: erpnext/controllers/accounts_controller.py:283 +#: erpnext/controllers/accounts_controller.py:284 msgid "Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry." msgstr "الصفوف: {0} في القسم {1} غير صالحة. يجب أن يشير اسم المرجع إلى قيد دفع أو قيد يومية صالح." @@ -46486,8 +46466,8 @@ msgstr "مخزونات السلامة" #. Label of the salary_information (Tab Break) field in DocType 'Employee' #. Label of the salary (Currency) field in DocType 'Employee External Work #. History' -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:125 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:211 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:129 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:216 #: erpnext/setup/doctype/employee/employee.json #: erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json msgid "Salary" @@ -46509,8 +46489,8 @@ msgstr "طريقة تحصيل الراتب" #. Option for the 'Order Type' (Select) field in DocType 'Quotation' #. Option for the 'Order Type' (Select) field in DocType 'Sales Order' #. Label of the sales_details (Tab Break) field in DocType 'Item' -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:142 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:238 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:146 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:243 #: erpnext/accounts/doctype/item_tax_template/item_tax_template_dashboard.py:9 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json #: erpnext/accounts/doctype/payment_term/payment_term_dashboard.py:8 @@ -46524,18 +46504,18 @@ msgstr "طريقة تحصيل الراتب" #: erpnext/regional/report/vat_audit_report/vat_audit_report.py:143 #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.json -#: erpnext/setup/doctype/company/company.py:456 -#: erpnext/setup/doctype/company/company.py:648 +#: erpnext/setup/doctype/company/company.py:460 +#: erpnext/setup/doctype/company/company.py:653 #: erpnext/setup/doctype/company/company_dashboard.py:9 #: erpnext/setup/doctype/sales_person/sales_person_dashboard.py:12 -#: erpnext/setup/install.py:399 +#: erpnext/setup/install.py:431 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:297 #: erpnext/stock/doctype/item/item.json #: erpnext/stock/doctype/pick_list/pick_list_dashboard.py:16 msgid "Sales" msgstr "مبيعات" -#: erpnext/setup/doctype/company/company.py:648 +#: erpnext/setup/doctype/company/company.py:653 msgid "Sales Account" msgstr "حساب مبيعات" @@ -46559,8 +46539,8 @@ msgstr "مساهمات وحوافز المبيعات" msgid "Sales Defaults" msgstr "القيم الافتراضية للمبيعات" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:126 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:212 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:130 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:217 msgid "Sales Expenses" msgstr "نفقات المبيعات" @@ -46729,11 +46709,11 @@ msgstr "لم يتم إنشاء فاتورة المبيعات بواسطة الم msgid "Sales Invoice mode is activated in POS. Please create Sales Invoice instead." msgstr "تم تفعيل وضع فاتورة المبيعات في نظام نقاط البيع. يرجى إنشاء فاتورة مبيعات بدلاً من ذلك." -#: erpnext/stock/doctype/delivery_note/delivery_note.py:634 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:675 msgid "Sales Invoice {0} has already been submitted" msgstr "سبق أن تم ترحيل فاتورة المبيعات {0}" -#: erpnext/selling/doctype/sales_order/sales_order.py:593 +#: erpnext/selling/doctype/sales_order/sales_order.py:597 msgid "Sales Invoice {0} must be deleted before cancelling this Sales Order" msgstr "يجب حذف فاتورة المبيعات {0} قبل إلغاء أمر البيع هذا" @@ -46935,8 +46915,8 @@ msgstr "طلب البيع مطلوب للبند {0}\\n
    \\nSales Order require msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}" msgstr "يوجد بالفعل أمر بيع {0} مرتبط بأمر شراء العميل {1}. للسماح بإنشاء أوامر بيع متعددة، فعّل الخيار {2} في {3}." -#: erpnext/selling/doctype/sales_order/sales_order.py:1921 -#: erpnext/selling/doctype/sales_order/sales_order.py:1934 +#: erpnext/selling/doctype/sales_order/sales_order.py:1943 +#: erpnext/selling/doctype/sales_order/sales_order.py:1956 msgid "Sales Order {0} is not available for production" msgstr "" @@ -46944,12 +46924,12 @@ msgstr "" msgid "Sales Order {0} is not submitted" msgstr "لا يتم اعتماد أمر التوريد {0}\\n
    \\nSales Order {0} is not submitted" -#: erpnext/manufacturing/doctype/work_order/work_order.py:495 +#: erpnext/manufacturing/doctype/work_order/work_order.py:496 msgid "Sales Order {0} is not valid" msgstr "أمر البيع {0} غير موجود\\n
    \\nSales Order {0} is not valid" #: erpnext/controllers/selling_controller.py:476 -#: erpnext/manufacturing/doctype/work_order/work_order.py:500 +#: erpnext/manufacturing/doctype/work_order/work_order.py:501 msgid "Sales Order {0} is {1}" msgstr "طلب المبيعات {0} هو {1}" @@ -47005,7 +46985,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:130 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1310 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1233 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:114 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:196 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:74 @@ -47111,7 +47091,7 @@ msgstr "ملخص دفع المبيعات" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:158 #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:136 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1307 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1230 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:120 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:193 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:80 @@ -47204,7 +47184,7 @@ msgstr "سجل مبيعات" msgid "Sales Representative" msgstr "مندوب مبيعات" -#: erpnext/accounts/report/gross_profit/gross_profit.py:997 +#: erpnext/accounts/report/gross_profit/gross_profit.py:989 #: erpnext/stock/doctype/delivery_note/delivery_note.js:270 msgid "Sales Return" msgstr "مبيعات المعاده" @@ -47228,7 +47208,7 @@ msgstr "ملخص المبيعات" #. Label of the sales_tax_template (Link) field in DocType 'Tax Rule' #. Label of a Workspace Sidebar Item #: erpnext/accounts/doctype/tax_rule/tax_rule.json -#: erpnext/setup/doctype/company/company.js:133 +#: erpnext/setup/doctype/company/company.js:149 #: erpnext/workspace_sidebar/taxes.json msgid "Sales Tax Template" msgstr "قالب ضريبة المبيعات" @@ -47379,12 +47359,12 @@ msgstr "مستودع الاحتفاظ بالعينات" #. Label of the sample_size (Float) field in DocType 'Quality Inspection' #: erpnext/manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93 -#: erpnext/public/js/controllers/transaction.js:2846 +#: erpnext/public/js/controllers/transaction.js:2848 #: erpnext/stock/doctype/quality_inspection/quality_inspection.json msgid "Sample Size" msgstr "حجم العينة" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:4070 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:1021 msgid "Sample quantity {0} cannot be more than received quantity {1}" msgstr "كمية العينة {0} لا يمكن أن تكون أكثر من الكمية المستلمة {1}" @@ -47747,8 +47727,8 @@ msgstr "دور ثانوي" msgid "Secretary" msgstr "سكرتير" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:177 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:301 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:181 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:306 msgid "Secured Loans" msgstr "القروض المضمونة" @@ -47786,7 +47766,7 @@ msgstr "اختر البند البديل" msgid "Select Alternative Items for Sales Order" msgstr "اختر عناصر بديلة لطلب البيع" -#: erpnext/stock/doctype/item/item.js:820 +#: erpnext/stock/doctype/item/item.js:807 msgid "Select Attribute Values" msgstr "حدد قيم السمات" @@ -47828,7 +47808,7 @@ msgstr "حدد الشركة" msgid "Select Company Address" msgstr "حدد عنوان الشركة" -#: erpnext/manufacturing/doctype/job_card/job_card.js:547 +#: erpnext/manufacturing/doctype/job_card/job_card.js:477 msgid "Select Corrective Operation" msgstr "حدد العملية التصحيحية" @@ -47864,7 +47844,7 @@ msgstr "حدد الأبعاد" msgid "Select Dispatch Address " msgstr "حدد عنوان الإرسال " -#: erpnext/manufacturing/doctype/job_card/job_card.js:229 +#: erpnext/manufacturing/doctype/job_card/job_card.js:702 msgid "Select Employees" msgstr "حدد الموظفين" @@ -47889,7 +47869,7 @@ msgstr "اختيار العناصر" msgid "Select Items based on Delivery Date" msgstr "حدد العناصر بناءً على تاريخ التسليم" -#: erpnext/public/js/controllers/transaction.js:2885 +#: erpnext/public/js/controllers/transaction.js:2887 msgid "Select Items for Quality Inspection" msgstr "اختيار الأصناف لفحص الجودة" @@ -47927,7 +47907,7 @@ msgstr "" msgid "Select Possible Supplier" msgstr "اختار المورد المحتمل" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1122 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1104 #: erpnext/stock/doctype/pick_list/pick_list.js:219 msgid "Select Quantity" msgstr "إختيار الكمية" @@ -48025,7 +48005,7 @@ msgstr "" msgid "Select all" msgstr "" -#: erpnext/stock/doctype/item/item.js:1153 +#: erpnext/stock/doctype/item/item.js:1140 msgid "Select an Item Group." msgstr "حدد مجموعة عناصر." @@ -48041,7 +48021,7 @@ msgstr "حدد فاتورة لتحميل ملخص البيانات" msgid "Select an item from each set to be used in the Sales Order." msgstr "اختر عنصرًا واحدًا من كل مجموعة لاستخدامه في أمر البيع." -#: erpnext/stock/doctype/item/item.js:834 +#: erpnext/stock/doctype/item/item.js:821 msgid "Select at least one value from each of the attributes." msgstr "اختر قيمة واحدة على الأقل من كل سمة من السمات." @@ -48059,7 +48039,7 @@ msgstr "حدد اسم الشركة الأول." msgid "Select date" msgstr "" -#: erpnext/controllers/accounts_controller.py:2995 +#: erpnext/controllers/accounts_controller.py:2989 msgid "Select finance book for the item {0} at row {1}" msgstr "حدد دفتر تمويل للعنصر {0} في الصف {1}" @@ -48091,7 +48071,7 @@ msgstr "حدد الحساب البنكي للتوفيق." msgid "Select the Default Workstation where the Operation will be performed. This will be fetched in BOMs and Work Orders." msgstr "حدد محطة العمل الافتراضية التي سيتم فيها تنفيذ العملية. سيتم جلب هذه المحطة من قوائم المواد وأوامر العمل." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1224 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1206 msgid "Select the Item to be manufactured." msgstr "حدد المنتج المراد تصنيعه." @@ -48108,7 +48088,7 @@ msgstr "اختر المستودع" msgid "Select the customer or supplier." msgstr "حدد العميل أو المورد." -#: erpnext/assets/doctype/asset/asset.js:929 +#: erpnext/assets/doctype/asset/asset.js:931 msgid "Select the date" msgstr "حدد التاريخ" @@ -48143,7 +48123,7 @@ msgstr "حدد، لجعل العميل قابلا للبحث باستخدام ه msgid "Selected POS Opening Entry should be open." msgstr "يجب أن يكون الإدخال الافتتاحي المحدد لنقاط البيع مفتوحًا." -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2569 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2650 msgid "Selected Price List should have buying and selling fields checked." msgstr "قائمة الأسعار المختارة يجب أن يكون لديها حقول بيع وشراء محددة." @@ -48174,22 +48154,22 @@ msgstr "يجب أن يكون المستند المحدد في حالة الإر msgid "Self delivery" msgstr "التوصيل الذاتي" -#: erpnext/assets/doctype/asset/asset.js:640 +#: erpnext/assets/doctype/asset/asset.js:642 #: erpnext/stock/doctype/batch/batch_dashboard.py:9 #: erpnext/stock/doctype/item/item_dashboard.py:20 msgid "Sell" msgstr "باع" #: erpnext/assets/doctype/asset/asset.js:171 -#: erpnext/assets/doctype/asset/asset.js:629 +#: erpnext/assets/doctype/asset/asset.js:631 msgid "Sell Asset" msgstr "بيع الأصل" -#: erpnext/assets/doctype/asset/asset.js:634 +#: erpnext/assets/doctype/asset/asset.js:636 msgid "Sell Qty" msgstr "بيع الكمية" -#: erpnext/assets/doctype/asset/asset.js:650 +#: erpnext/assets/doctype/asset/asset.js:652 msgid "Sell quantity cannot exceed the asset quantity" msgstr "لا يمكن أن تتجاوز كمية البيع كمية الأصل" @@ -48197,7 +48177,7 @@ msgstr "لا يمكن أن تتجاوز كمية البيع كمية الأصل" msgid "Sell quantity cannot exceed the asset quantity. Asset {0} has only {1} item(s)." msgstr "لا يمكن أن تتجاوز كمية البيع كمية الأصل. يحتوي الأصل {0} على {1} عنصر فقط." -#: erpnext/assets/doctype/asset/asset.js:646 +#: erpnext/assets/doctype/asset/asset.js:648 msgid "Sell quantity must be greater than zero" msgstr "يجب أن تكون كمية البيع أكبر من الصفر" @@ -48450,7 +48430,7 @@ msgstr "أرقام التسلسل / الدفعات" #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:74 #: erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:114 -#: erpnext/public/js/controllers/transaction.js:2859 +#: erpnext/public/js/controllers/transaction.js:2861 #: erpnext/public/js/utils/serial_no_batch_selector.js:433 #: erpnext/selling/doctype/installation_note_item/installation_note_item.json #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -48655,7 +48635,7 @@ msgstr "" msgid "Serial Nos are created successfully" msgstr "تم إنشاء الأرقام التسلسلية بنجاح" -#: erpnext/stock/stock_ledger.py:2330 +#: erpnext/stock/stock_ledger.py:2296 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding." msgstr "يتم حجز الأرقام التسلسلية في إدخالات حجز المخزون، لذا عليك إلغاء حجزها قبل المتابعة." @@ -49139,7 +49119,7 @@ msgstr "تعيين السلف والتخصيص (FIFO)" #. Label of the set_basic_rate_manually (Check) field in DocType 'Stock Entry #. Detail' -#: erpnext/stock/doctype/stock_entry/stock_entry.py:300 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:706 #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "Set Basic Rate Manually" msgstr "قم بتعيين السعر الأساسي يدويًا" @@ -49158,8 +49138,8 @@ msgstr "مستودع توصيل المجموعات" msgid "Set Dropship Items Delivered Quantity" msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.js:418 -#: erpnext/manufacturing/doctype/job_card/job_card.js:487 +#: erpnext/manufacturing/doctype/job_card/job_card.js:363 +#: erpnext/manufacturing/doctype/job_card/job_card.js:425 msgid "Set Finished Good Quantity" msgstr "مجموعة كاملة، كمية جيدة" @@ -49326,11 +49306,11 @@ msgstr "تم تعيينه بواسطة قالب ضريبة الصنف" msgid "Set closing balance as per bank statement" msgstr "" -#: erpnext/setup/doctype/company/company.py:546 +#: erpnext/setup/doctype/company/company.py:550 msgid "Set default inventory account for perpetual inventory" msgstr "تعيين حساب المخزون الافتراضي للمخزون الدائم" -#: erpnext/setup/doctype/company/company.py:572 +#: erpnext/setup/doctype/company/company.py:576 msgid "Set default {0} account for non stock items" msgstr "قم بتعيين الحساب الافتراضي {0} للعناصر غير المخزنة" @@ -49362,7 +49342,7 @@ msgstr "تعيين معدل عنصر التجميع الفرعي استنادا msgid "Set targets Item Group-wise for this Sales Person." msgstr "تحديد أهداف المجموعة السلعة الحكيم لهذا الشخص المبيعات." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1281 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1263 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)" msgstr "حدد تاريخ البدء المخطط له (تاريخ تقديري ترغب في أن يبدأ فيه الإنتاج)" @@ -49473,7 +49453,7 @@ msgid "Setting up company" msgstr "تأسيس شركة" #: erpnext/manufacturing/doctype/bom/bom.py:1227 -#: erpnext/manufacturing/doctype/work_order/work_order.py:1497 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1498 msgid "Setting {0} is required" msgstr "الإعداد {0} مطلوب" @@ -49493,6 +49473,10 @@ msgstr "إعدادات وحدة البيع" msgid "Settled" msgstr "تسوية" +#: erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js:33 +msgid "Settled with Credit Note" +msgstr "" + #. Title of an Onboarding Step #. Label of an action in the Onboarding Step 'Setup Company' #: erpnext/setup/onboarding_step/setup_company/setup_company.json @@ -49685,7 +49669,7 @@ msgstr "نوع الشحنة" msgid "Shipment details" msgstr "تفاصيل الشحنة" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:805 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:846 msgid "Shipments" msgstr "شحنات" @@ -49723,7 +49707,7 @@ msgstr "الشحن العنوان الاسم" msgid "Shipping Address Template" msgstr "نموذج عنوان الشحن" -#: erpnext/controllers/accounts_controller.py:576 +#: erpnext/controllers/accounts_controller.py:577 msgid "Shipping Address does not belong to the {0}" msgstr "عنوان الشحن لا ينتمي إلى {0}" @@ -49866,8 +49850,8 @@ msgstr "نبذة على موقع الويب وغيره من المنشورات." msgid "Short-term Investments" msgstr "الاستثمارات قصيرة الأجل" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:175 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:296 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:179 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:301 msgid "Short-term Provisions" msgstr "أحكام قصيرة الأجل" @@ -50199,7 +50183,7 @@ msgstr "متزامن" msgid "Since there are active depreciable assets under this category, the following accounts are required.

    " msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:745 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:504 msgid "Since there is a process loss of {0} units for the finished good {1}, you should reduce the quantity by {0} units for the finished good {1} in the Items Table." msgstr "بما أن هناك خسارة في العملية قدرها {0} وحدة للمنتج النهائي {1}، فيجب عليك تقليل الكمية بمقدار {0} وحدة للمنتج النهائي {1} في جدول العناصر." @@ -50244,7 +50228,7 @@ msgstr "تخطي ملاحظة التسليم" #. Label of the skip_material_transfer (Check) field in DocType 'Work Order #. Operation' -#: erpnext/manufacturing/doctype/work_order/work_order.js:380 +#: erpnext/manufacturing/doctype/work_order/work_order.js:361 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/doctype/workstation/workstation.js:454 msgid "Skip Material Transfer" @@ -50286,8 +50270,8 @@ msgstr "تجانس ثابت" msgid "Soap & Detergent" msgstr "الصابون والمنظفات" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:62 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:107 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:66 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:112 #: erpnext/setup/setup_wizard/data/industry_type.txt:45 msgid "Software" msgstr "برمجة" @@ -50311,7 +50295,7 @@ msgstr "يباع بواسطة" msgid "Solvency Ratios" msgstr "نسب الملاءة المالية" -#: erpnext/controllers/accounts_controller.py:4391 +#: erpnext/controllers/accounts_controller.py:4379 msgid "Some required Company details are missing. You don't have permission to update them. Please contact your System Manager." msgstr "بعض بيانات الشركة المطلوبة مفقودة. ليس لديك صلاحية لتحديثها. يرجى الاتصال بمدير النظام." @@ -50375,7 +50359,7 @@ msgstr "اسم حقل المصدر" msgid "Source Location" msgstr "موقع المصدر" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1032 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1014 msgid "Source Manufacture Entry" msgstr "" @@ -50384,11 +50368,11 @@ msgstr "" msgid "Source Stock Entry (Manufacture)" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:907 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:524 msgid "Source Stock Entry {0} belongs to Work Order {1}, not {2}. Please use a manufacture entry from the same Work Order." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2352 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:84 msgid "Source Stock Entry {0} has no finished goods quantity" msgstr "" @@ -50446,7 +50430,12 @@ msgstr "رابط عنوان مستودع المصدر" msgid "Source Warehouse is mandatory for the Item {0}." msgstr "يُعد مستودع المصدر إلزاميًا للعنصر {0}." -#: erpnext/manufacturing/doctype/work_order/work_order.py:304 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py:38 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:23 +msgid "Source Warehouse is required for item {0}" +msgstr "" + +#: erpnext/manufacturing/doctype/work_order/work_order.py:305 msgid "Source Warehouse {0} must be same as Customer Warehouse {1} in the Subcontracting Inward Order." msgstr "يجب أن يكون مستودع المصدر {0} هو نفسه مستودع العميل {1} في أمر التوريد الداخلي للتعاقد من الباطن." @@ -50454,24 +50443,23 @@ msgstr "يجب أن يكون مستودع المصدر {0} هو نفسه مست msgid "Source and Target Location cannot be same" msgstr "لا يمكن أن يكون المصدر و الموقع الهدف نفسه" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:873 -msgid "Source and target warehouse cannot be same for row {0}" -msgstr "المصدر والمستودع المستهدف لا يمكن أن يكون نفس الصف {0}\\n
    \\nSource and target warehouse cannot be same for row {0}" - #: erpnext/stock/dashboard/item_dashboard.js:295 msgid "Source and target warehouse must be different" msgstr "ويجب أن تكون مصدر ومستودع الهدف مختلفة" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:152 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:254 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:156 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:259 msgid "Source of Funds (Liabilities)" msgstr "(مصدر الأموال (الخصوم" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:840 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:856 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:863 -msgid "Source warehouse is mandatory for row {0}" -msgstr "مستودع المصدر إلزامي للصف {0}\\n
    \\nSource warehouse is mandatory for row {0}" +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:28 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:44 +msgid "Source or Target Warehouse is required for item {0}" +msgstr "" + +#: erpnext/selling/doctype/sales_order/sales_order.py:465 +msgid "Source warehouse required for stock item {0}" +msgstr "" #. Label of the sourced_by_supplier (Check) field in DocType 'BOM Creator Item' #. Label of the sourced_by_supplier (Check) field in DocType 'BOM Explosion @@ -50512,7 +50500,7 @@ msgstr "تجاوز الإنفاق على الحساب {0} ({1}) بين {2} و {3 msgid "Spent" msgstr "" -#: erpnext/assets/doctype/asset/asset.js:690 +#: erpnext/assets/doctype/asset/asset.js:692 #: erpnext/stock/doctype/batch/batch.js:104 #: erpnext/stock/doctype/batch/batch.js:185 #: erpnext/support/doctype/issue/issue.js:114 @@ -50520,7 +50508,7 @@ msgid "Split" msgstr "انشق، مزق" #: erpnext/assets/doctype/asset/asset.js:147 -#: erpnext/assets/doctype/asset/asset.js:674 +#: erpnext/assets/doctype/asset/asset.js:676 msgid "Split Asset" msgstr "تقسيم الأصول" @@ -50544,7 +50532,7 @@ msgstr "انفصل عن" msgid "Split Issue" msgstr "تقسيم القضية" -#: erpnext/assets/doctype/asset/asset.js:680 +#: erpnext/assets/doctype/asset/asset.js:682 msgid "Split Qty" msgstr "تقسيم الكمية" @@ -50628,7 +50616,7 @@ msgstr "شراء القياسية" msgid "Standard Description" msgstr "الوصف القياسي" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:115 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:127 msgid "Standard Rated Expenses" msgstr "المصاريف الخاضعة للضريبة القياسية" @@ -50655,8 +50643,8 @@ msgstr "قالب قياسي" msgid "Standard Terms and Conditions that can be added to Sales and Purchases. Examples: Validity of the offer, Payment Terms, Safety and Usage, etc." msgstr "الشروط والأحكام القياسية التي يمكن إضافتها إلى عمليات البيع والشراء. أمثلة: صلاحية العرض، شروط الدفع، السلامة والاستخدام، إلخ." -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:96 -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:102 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:108 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:114 msgid "Standard rated supplies in {0}" msgstr "اللوازم المصنفة وفقًا للمعايير في {0}" @@ -50691,7 +50679,7 @@ msgstr "لا يمكن أن يكون تاريخ البدء قبل التاريخ msgid "Start Date should be lower than End Date" msgstr "يجب أن يكون تاريخ البدء أقل من تاريخ الانتهاء" -#: erpnext/manufacturing/doctype/job_card/job_card.js:223 +#: erpnext/manufacturing/doctype/job_card/job_card.js:658 #: erpnext/manufacturing/doctype/workstation/workstation.js:124 msgid "Start Job" msgstr "ابدأ العمل" @@ -50820,7 +50808,7 @@ msgstr "رسم توضيحي للحالة" msgid "Status and Reference" msgstr "" -#: erpnext/projects/doctype/project/project.py:716 +#: erpnext/projects/doctype/project/project.py:754 msgid "Status must be Cancelled or Completed" msgstr "يجب إلغاء الحالة أو إكمالها" @@ -50858,8 +50846,8 @@ msgstr "المخازن" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:96 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:158 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:100 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:163 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1362 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:1388 #: erpnext/accounts/report/account_balance/account_balance.js:58 @@ -50959,6 +50947,16 @@ msgstr "تمت إضافة إدخال إغلاق المخزون {0} إلى قائ msgid "Stock Closing Log" msgstr "سجل إغلاق المخزون" +#. Option for the 'Account Type' (Select) field in DocType 'Account' +#. Label of the stock_delivered_but_not_billed (Link) field in DocType +#. 'Company' +#: erpnext/accounts/doctype/account/account.json +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:38 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:65 +#: erpnext/setup/doctype/company/company.json +msgid "Stock Delivered But Not Billed" +msgstr "" + #. Label of the warehouse_and_reference (Section Break) field in DocType 'POS #. Invoice Item' #. Label of the warehouse_and_reference (Section Break) field in DocType 'Sales @@ -50968,10 +50966,6 @@ msgstr "سجل إغلاق المخزون" msgid "Stock Details" msgstr "تفاصيل المخزون" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:997 -msgid "Stock Entries already created for Work Order {0}: {1}" -msgstr "تم إنشاء إدخالات المخزون بالفعل لأمر العمل {0}: {1}" - #. 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 @@ -51035,7 +51029,7 @@ msgstr "تم إنشاء إدخال الأسهم بالفعل مقابل قائم msgid "Stock Entry {0} created" msgstr "الأسهم الدخول {0} خلق" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1527 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1544 msgid "Stock Entry {0} has created" msgstr "تم إنشاء إدخال المخزون {0}" @@ -51043,8 +51037,8 @@ msgstr "تم إنشاء إدخال المخزون {0}" msgid "Stock Entry {0} is not submitted" msgstr "الحركة المخزنية {0} غير مسجلة" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:83 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:142 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:87 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:147 msgid "Stock Expenses" msgstr "مصاريف المخزون" @@ -51122,8 +51116,8 @@ msgstr "مستوى المخزون" msgid "Stock Levels HTML" msgstr "" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:160 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:273 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:164 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:278 msgid "Stock Liabilities" msgstr "خصوم المخزون" @@ -51226,8 +51220,8 @@ msgstr "كمية المخزون مقابل الرقم التسلسلي" #. Option for the 'Account Type' (Select) field in DocType 'Account' #. Label of the stock_received_but_not_billed (Link) field in DocType 'Company' #: erpnext/accounts/doctype/account/account.json -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:161 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:274 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:165 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:279 #: erpnext/accounts/report/account_balance/account_balance.js:59 #: erpnext/setup/doctype/company/company.json msgid "Stock Received But Not Billed" @@ -51276,9 +51270,9 @@ msgstr "إعدادات إعادة نشر المخزون" #: erpnext/manufacturing/doctype/production_plan/production_plan.js:289 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:297 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:303 -#: erpnext/manufacturing/doctype/work_order/work_order.js:945 -#: erpnext/manufacturing/doctype/work_order/work_order.js:954 -#: erpnext/manufacturing/doctype/work_order/work_order.js:961 +#: erpnext/manufacturing/doctype/work_order/work_order.js:927 +#: erpnext/manufacturing/doctype/work_order/work_order.js:936 +#: erpnext/manufacturing/doctype/work_order/work_order.js:943 #: erpnext/manufacturing/doctype/work_order/work_order_dashboard.py:14 #: erpnext/public/js/stock_reservation.js:12 #: erpnext/selling/doctype/sales_order/sales_order.js:109 @@ -51314,10 +51308,10 @@ msgstr "حجز الأسهم" msgid "Stock Reservation Entries Cancelled" msgstr "تم إلغاء إدخالات حجز المخزون" -#: erpnext/controllers/subcontracting_inward_controller.py:1021 -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2259 -#: erpnext/manufacturing/doctype/work_order/work_order.py:2148 -#: erpnext/selling/doctype/sales_order/sales_order.py:874 +#: erpnext/controllers/subcontracting_inward_controller.py:1029 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:2261 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2150 +#: erpnext/selling/doctype/sales_order/sales_order.py:887 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1786 msgid "Stock Reservation Entries Created" msgstr "تم إنشاء قيود حجز المخزون" @@ -51345,7 +51339,7 @@ msgstr "لا يمكن تحديث إدخال حجز المخزون لأنه تم msgid "Stock Reservation Entry created against a Pick List cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one." msgstr "لا يمكن تعديل إدخال حجز المخزون المُنشأ مقابل قائمة الاختيار. إذا كنت ترغب في إجراء تغييرات، فننصحك بإلغاء الإدخال الحالي وإنشاء إدخال جديد." -#: erpnext/stock/doctype/delivery_note/delivery_note.py:567 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:608 msgid "Stock Reservation Warehouse Mismatch" msgstr "عدم تطابق مستودع حجز المخزون" @@ -51385,7 +51379,7 @@ msgstr "الكمية المحجوزة من المخزون (وحدة قياس ا #: erpnext/selling/doctype/selling_settings/selling_settings.py:115 #: erpnext/setup/doctype/company/company.json #: erpnext/setup/workspace/erpnext_settings/erpnext_settings.json -#: erpnext/stock/doctype/item/item.js:420 +#: erpnext/stock/doctype/item/item.js:413 #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:681 #: erpnext/stock/doctype/stock_settings/stock_settings.json #: erpnext/stock/workspace/stock/stock.json @@ -51692,11 +51686,11 @@ msgstr "حجر" msgid "Stop Reason" msgstr "توقف السبب" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1105 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1106 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel" msgstr "لا يمكن إلغاء طلب العمل المتوقف ، قم بإلغاء إيقافه أولاً للإلغاء" -#: erpnext/setup/doctype/company/company.py:383 +#: erpnext/setup/doctype/company/company.py:387 #: erpnext/setup/setup_wizard/operations/defaults_setup.py:33 #: erpnext/setup/setup_wizard/operations/install_fixtures.py:537 #: erpnext/stock/doctype/item/item.py:330 erpnext/tests/utils.py:248 @@ -51757,7 +51751,7 @@ msgstr "مستودع التجميع الفرعي" #. Label of the operation (Link) field in DocType 'Job Card Time Log' #. Name of a DocType -#: erpnext/manufacturing/doctype/job_card/job_card.js:363 +#: erpnext/manufacturing/doctype/job_card/job_card.js:310 #: erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json #: erpnext/manufacturing/doctype/sub_operation/sub_operation.json msgid "Sub Operation" @@ -52019,7 +52013,7 @@ msgstr "بند خدمة طلب التعاقد من الباطن" msgid "Subcontracting Order Supplied Item" msgstr "بند مورد من طلب التعاقد من الباطن" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:965 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:973 msgid "Subcontracting Order {0} created." msgstr "تم إنشاء أمر التعاقد من الباطن {0} ." @@ -52108,7 +52102,7 @@ msgstr "" msgid "Subdivision" msgstr "تقسيم فرعي" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:961 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:969 #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:1122 msgid "Submit Action Failed" msgstr "فشل إرسال الإجراء" @@ -52129,7 +52123,7 @@ msgstr "إرسال الفواتير المُنشأة" msgid "Submit Journal Entries" msgstr "إرسال إدخالات دفتر اليومية" -#: erpnext/manufacturing/doctype/work_order/work_order.js:192 +#: erpnext/manufacturing/doctype/work_order/work_order.js:173 msgid "Submit this Work Order for further processing." msgstr "أرسل طلب العمل هذا لمزيد من المعالجة." @@ -52574,7 +52568,7 @@ msgstr "تفاصيل المورد" #: erpnext/accounts/doctype/tax_rule/tax_rule.json #: erpnext/accounts/report/accounts_payable/accounts_payable.js:119 #: erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js:102 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1314 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1237 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:200 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py:178 #: erpnext/accounts/report/purchase_register/purchase_register.js:27 @@ -52673,7 +52667,7 @@ msgstr "ملخص دفتر الأستاذ" #. Label of the supplier_name (Data) field in DocType 'Purchase Receipt' #. Label of the supplier_name (Data) field in DocType 'Stock Entry' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1229 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1152 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:157 #: erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:196 #: erpnext/accounts/report/purchase_register/purchase_register.py:177 @@ -52761,7 +52755,7 @@ msgstr "جهة الاتصال الرئيسية للمورد" #: erpnext/buying/doctype/purchase_order_item/purchase_order_item.json #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:40 #: erpnext/buying/doctype/supplier_quotation/supplier_quotation.json -#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:235 +#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:240 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:60 #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:256 #: erpnext/buying/workspace/buying/buying.json @@ -52790,7 +52784,7 @@ msgstr "مقارنة عروض أسعار الموردين" msgid "Supplier Quotation Item" msgstr "المورد اقتباس الإغلاق" -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:506 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:510 msgid "Supplier Quotation {0} Created" msgstr "تم إنشاء عرض أسعار المورد {0}" @@ -52879,7 +52873,7 @@ msgstr "المورد نوع" #. Label of the supplier_warehouse (Link) field in DocType 'Purchase Receipt' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/buying/doctype/purchase_order/purchase_order.json -#: erpnext/manufacturing/doctype/job_card/job_card.js:97 +#: erpnext/manufacturing/doctype/job_card/job_card.js:91 #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json msgid "Supplier Warehouse" msgstr "المورد مستودع" @@ -52906,7 +52900,7 @@ msgstr "أرقام الموردين التي يحددها العميل" msgid "Supplier of Goods or Services." msgstr "مورد السلع أو الخدمات." -#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:188 +#: erpnext/buying/doctype/supplier_quotation/supplier_quotation.py:190 msgid "Supplier {0} not found in {1}" msgstr "المورد {0} غير موجود في {1}" @@ -52919,8 +52913,8 @@ msgstr "المورد (ق)" msgid "Suppliers" msgstr "الموردين" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:60 -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:122 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:72 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:134 msgid "Supplies subject to the reverse charge provision" msgstr "التوريدات الخاضعة لآلية الضريبة العكسية" @@ -53011,7 +53005,7 @@ msgstr "بدأت عملية المزامنة" msgid "Synchronize all accounts every hour" msgstr "مزامنة جميع الحسابات كل ساعة" -#: erpnext/accounts/doctype/account/account.py:663 +#: erpnext/accounts/doctype/account/account.py:664 msgid "System In Use" msgstr "النظام قيد الاستخدام" @@ -53041,7 +53035,7 @@ msgstr "" msgid "System will fetch all the entries if limit value is zero." msgstr "سيقوم النظام بجلب كل الإدخالات إذا كانت قيمة الحد صفرا." -#: erpnext/controllers/accounts_controller.py:2229 +#: erpnext/controllers/accounts_controller.py:2230 msgid "System will not check over billing since amount for Item {0} in {1} is zero" msgstr "لن يتحقق النظام من الفواتير الزائدة لأن مبلغ العنصر {0} في {1} يساوي صفرًا" @@ -53062,7 +53056,7 @@ msgstr "ملخص حساب TDS" msgid "TDS Deducted" msgstr "تم خصم ضريبة الدخل المقتطعة" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:287 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:292 msgid "TDS Payable" msgstr "ضريبة الدخل المستحقة" @@ -53213,7 +53207,7 @@ msgstr "عنوان المستودع المستهدف" msgid "Target Warehouse Address Link" msgstr "رابط عنوان مستودع تارجت" -#: erpnext/manufacturing/doctype/work_order/work_order.py:249 +#: erpnext/manufacturing/doctype/work_order/work_order.py:250 msgid "Target Warehouse Reservation Error" msgstr "خطأ في حجز مستودع تارجت" @@ -53221,24 +53215,23 @@ msgstr "خطأ في حجز مستودع تارجت" msgid "Target Warehouse for Finished Good must be same as Finished Good Warehouse {1} in Work Order {2} linked to the Subcontracting Inward Order." msgstr "يجب أن يكون المستودع المستهدف للمنتج النهائي هو نفسه مستودع المنتج النهائي {1} في أمر العمل {2} المرتبط بأمر التوريد الداخلي للمقاول من الباطن." -#: erpnext/manufacturing/doctype/work_order/work_order.py:793 +#: erpnext/manufacturing/doctype/work_order/work_order.py:794 msgid "Target Warehouse is required before Submit" msgstr "يلزم وجود مستودع Target قبل الإرسال" -#: erpnext/controllers/selling_controller.py:885 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_receipt_issue.py:25 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/material_transfer.py:21 +msgid "Target Warehouse is required for item {0}" +msgstr "" + +#: erpnext/controllers/selling_controller.py:886 msgid "Target Warehouse is set for some items but the customer is not an internal customer." msgstr "تم إعداد مستودع Target لبعض المنتجات، لكن العميل ليس عميلاً داخلياً." -#: erpnext/manufacturing/doctype/work_order/work_order.py:320 +#: erpnext/manufacturing/doctype/work_order/work_order.py:321 msgid "Target Warehouse {0} must be same as Delivery Warehouse {1} in the Subcontracting Inward Order Item." msgstr "يجب أن يكون المستودع المستهدف {0} هو نفسه مستودع التسليم {1} في بند أمر التوريد الداخلي للتعاقد من الباطن." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:846 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:852 -#: erpnext/stock/doctype/stock_entry/stock_entry.py:867 -msgid "Target warehouse is mandatory for row {0}" -msgstr "المستودع المستهدف إلزامي للصف {0}\\n
    \\nTarget warehouse is mandatory for row {0}" - #. Label of the targets (Table) field in DocType 'Sales Partner' #. Label of the targets (Table) field in DocType 'Sales Person' #. Label of the targets (Table) field in DocType 'Territory' @@ -53355,8 +53348,8 @@ msgstr "مبلغ الضريبة بعد خصم مبلغ (شركة العملات) msgid "Tax Amount will be rounded on a row(items) level" msgstr "سيتم تقريب مبلغ الضريبة على مستوى الصف (العناصر)." -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:41 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:69 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:45 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:74 #: erpnext/setup/setup_wizard/operations/taxes_setup.py:256 msgid "Tax Assets" msgstr "ضريبية الأصول" @@ -53388,7 +53381,6 @@ msgstr "ضريبية الأصول" msgid "Tax Breakup" msgstr "تفكيك الضرائب" -#. Label of the tax_category (Link) field in DocType 'Address' #. Label of the tax_category (Link) field in DocType 'POS Invoice' #. Label of the tax_category (Link) field in DocType 'POS Profile' #. Label of the tax_category (Link) field in DocType 'Purchase Invoice' @@ -53410,7 +53402,6 @@ msgstr "تفكيك الضرائب" #. Label of the tax_category (Link) field in DocType 'Item Tax' #. Label of the tax_category (Link) field in DocType 'Purchase Receipt' #. Label of a Workspace Sidebar Item -#: erpnext/accounts/custom/address.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/pos_profile/pos_profile.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -53426,6 +53417,7 @@ msgstr "تفكيك الضرائب" #: erpnext/selling/doctype/customer/customer.json #: erpnext/selling/doctype/quotation/quotation.json #: erpnext/selling/doctype/sales_order/sales_order.json +#: erpnext/setup/install.py:154 #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/item_tax/item_tax.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -53437,8 +53429,8 @@ msgstr "الفئة الضريبية" msgid "Tax Category has been changed to \"Total\" because all the Items are non-stock items" msgstr "تم تغيير فئة الضرائب إلى "توتال" لأن جميع العناصر هي عناصر غير مخزون" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:136 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:230 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:140 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:235 msgid "Tax Expense" msgstr "مصروفات الضرائب" @@ -53512,7 +53504,7 @@ msgstr "معدل الضريبة %" msgid "Tax Rates" msgstr "معدلات الضريبة" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:52 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:64 msgid "Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme" msgstr "استرداد الضرائب المقدمة للسياح بموجب برنامج استرداد الضرائب للسياح" @@ -53530,7 +53522,7 @@ msgstr "صف الضرائب" msgid "Tax Rule" msgstr "القاعدة الضريبية" -#: erpnext/accounts/doctype/tax_rule/tax_rule.py:137 +#: erpnext/accounts/doctype/tax_rule/tax_rule.py:138 msgid "Tax Rule Conflicts with {0}" msgstr "تضارب القاعدة الضريبية مع {0}" @@ -53545,7 +53537,7 @@ msgstr "إعدادات الضرائب" msgid "Tax Template" msgstr "" -#: erpnext/accounts/doctype/tax_rule/tax_rule.py:85 +#: erpnext/accounts/doctype/tax_rule/tax_rule.py:86 msgid "Tax Template is mandatory." msgstr "قالب الضرائب إلزامي." @@ -53898,8 +53890,8 @@ msgstr "تكنولوجيا" msgid "Telecommunications" msgstr "الاتصالات السلكية واللاسلكية" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:127 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:213 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:131 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:218 msgid "Telephone Expenses" msgstr "نفقات الهاتف" @@ -53950,13 +53942,13 @@ msgstr "مؤقت في الانتظار" msgid "Temporary" msgstr "مؤقت" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:73 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:129 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:77 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:134 msgid "Temporary Accounts" msgstr "حسابات مؤقتة" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:74 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:130 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:78 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:135 msgid "Temporary Opening" msgstr "افتتاحي مؤقت" @@ -54138,7 +54130,7 @@ msgstr "قالب الشروط والأحكام" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json #: erpnext/accounts/doctype/territory_item/territory_item.json #: erpnext/accounts/report/accounts_receivable/accounts_receivable.js:142 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1298 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1221 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:108 #: erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:184 #: erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.js:68 @@ -54237,7 +54229,7 @@ msgstr "النص المعروض في البيان المالي (على سبيل msgid "The 'From Package No.' field must neither be empty nor it's value less than 1." msgstr "و "من حزمة رقم" يجب ألا يكون الحقل فارغا ولا قيمة أقل من 1." -#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:415 +#: erpnext/buying/doctype/request_for_quotation/request_for_quotation.py:419 msgid "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings." msgstr "تم تعطيل الوصول إلى طلب عرض الأسعار من البوابة. للسماح بالوصول ، قم بتمكينه في إعدادات البوابة." @@ -54290,7 +54282,8 @@ msgstr "قد يكون مصطلح الدفع في الصف {0} مكررا." msgid "The Pick List having Stock Reservation Entries cannot be updated. If you need to make changes, we recommend canceling the existing Stock Reservation Entries before updating the Pick List." msgstr "لا يمكن تحديث قائمة الاختيار التي تحتوي على إدخالات حجز المخزون. إذا كنت ترغب في إجراء تغييرات، فننصحك بإلغاء إدخالات حجز المخزون الحالية قبل تحديث قائمة الاختيار." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2804 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1428 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:119 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty" msgstr "تمت إعادة ضبط كمية الفاقد في العملية وفقًا لبطاقات العمل." @@ -54306,7 +54299,7 @@ msgstr "الرقم التسلسلي في الصف #{0}: {1} غير متوفر ف msgid "The Serial No {0} is reserved against the {1} {2} and cannot be used for any other transaction." msgstr "الرقم التسلسلي {0} محجوز مقابل {1} {2} ولا يمكن استخدامه لأي معاملة أخرى." -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1821 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:934 msgid "The Serial and Batch Bundle {0} is not valid for this transaction. The 'Type of Transaction' should be 'Outward' instead of 'Inward' in Serial and Batch Bundle {0}" msgstr "حزمة البيانات التسلسلية والدفعية {0} غير صالحة لهذه المعاملة. يجب أن يكون \"نوع المعاملة\" \"خارجي\" بدلاً من \"داخلي\" في حزمة البيانات التسلسلية والدفعية {0}" @@ -54342,7 +54335,7 @@ msgstr "" msgid "The bank account is not a company account. Please select a company account" msgstr "" -#: erpnext/controllers/stock_controller.py:1318 +#: erpnext/controllers/stock_controller.py:1319 msgid "The batch {0} is already reserved in {1} {2}. So, cannot proceed with the {3} {4}, which is created against the {5} {6}." msgstr "تم حجز الدفعة {0} بالفعل في {1} {2}. لذا، لا يمكن المتابعة مع {3} {4}، والتي تم إنشاؤها مقابل {5} {6}." @@ -54350,7 +54343,11 @@ msgstr "تم حجز الدفعة {0} بالفعل في {1} {2}. لذا، لا ي msgid "The company {0} is not in South Africa. VAT Audit Report is only available for companies in South Africa." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1320 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:21 +msgid "The company {0} is not in United Arab Emirates. UAE VAT 201 report is only available for companies in United Arab Emirates." +msgstr "" + +#: erpnext/manufacturing/doctype/job_card/job_card.py:1328 msgid "The completed quantity {0} of an operation {1} cannot be greater than the completed quantity {2} of a previous operation {3}." msgstr "لا يمكن أن تكون الكمية المكتملة {0} لعملية {1} أكبر من الكمية المكتملة {2} لعملية سابقة {3}." @@ -54370,7 +54367,7 @@ msgstr "" msgid "The date of the transaction" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1229 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1211 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM." msgstr "سيقوم النظام بجلب قائمة مكونات المنتج الافتراضية لهذا المنتج. يمكنك أيضاً تغيير قائمة مكونات المنتج." @@ -54403,7 +54400,7 @@ msgstr "لا يمكن ترك الحقل من المساهمين فارغا" msgid "The field To Shareholder cannot be blank" msgstr "لا يمكن ترك الحقل للمساهم فارغا" -#: erpnext/stock/doctype/delivery_note/delivery_note.py:417 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:418 msgid "The field {0} in row {1} is not set" msgstr "الحقل {0} في الصف {1} غير مُعيّن" @@ -54444,7 +54441,7 @@ msgstr "فشلت الأصول التالية في تسجيل قيود الإهل msgid "The following batches are expired, please restock them:
    {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:427 +#: erpnext/controllers/accounts_controller.py:428 msgid "The following cancelled repost entries exist for {0}:

    {1}

    Kindly delete these entries before continuing." msgstr "" @@ -54469,7 +54466,7 @@ msgstr "" msgid "The following rows are duplicates:" msgstr "الصفوف التالية مكررة:" -#: erpnext/stock/doctype/material_request/material_request.py:872 +#: erpnext/stock/doctype/material_request/material_request.py:871 msgid "The following {0} were created: {1}" msgstr "تم إنشاء {0} التالية: {1}" @@ -54554,7 +54551,7 @@ msgstr "لا يمكن أن تكون العملية {0} عملية فرعية" msgid "The original invoice should be consolidated before or along with the return invoice." msgstr "ينبغي تجميع الفاتورة الأصلية قبل أو مع فاتورة الإرجاع." -#: erpnext/controllers/accounts_controller.py:205 +#: erpnext/controllers/accounts_controller.py:206 msgid "The outstanding amount {0} in {1} is lesser than {2}. Updating the outstanding to this invoice." msgstr "" @@ -54607,7 +54604,7 @@ msgstr "سيتم تحرير المخزون المحجوز عند تحديث ال msgid "The reserved stock will be released. Are you certain you wish to proceed?" msgstr "سيتم تحرير المخزون المحجوز. هل أنت متأكد من رغبتك في المتابعة؟" -#: erpnext/accounts/doctype/account/account.py:218 +#: erpnext/accounts/doctype/account/account.py:219 msgid "The root account {0} must be a group" msgstr "يجب أن يكون حساب الجذر {0} مجموعة" @@ -54623,7 +54620,7 @@ msgstr "حساب التغيير المحدد {} لا ينتمي إلى الشر msgid "The selected item cannot have Batch" msgstr "العنصر المحدد لا يمكن أن يكون دفعة" -#: erpnext/assets/doctype/asset/asset.js:655 +#: erpnext/assets/doctype/asset/asset.js:657 msgid "The sell quantity is less than the total asset quantity. The remaining quantity will be split into a new asset. This action cannot be undone.

    Do you want to continue?" msgstr "كمية البيع أقل من إجمالي كمية الأصل. سيتم تقسيم الكمية المتبقية إلى أصل جديد. لا يمكن التراجع عن هذا الإجراء.

    هل تريد المتابعة؟" @@ -54730,15 +54727,15 @@ msgstr "تختلف قيمة {0} بين العناصر {1} و {2}" msgid "The value {0} is already assigned to an existing Item {1}." msgstr "تم تعيين القيمة {0} بالفعل لعنصر موجود {1}." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1257 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1239 msgid "The warehouse where you store finished Items before they are shipped." msgstr "المستودع الذي يتم فيه تخزين المنتجات النهائية قبل شحنها." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1250 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1232 msgid "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage." msgstr "المستودع الذي تُخزّن فيه المواد الخام. يمكن تخصيص مستودع مصدر منفصل لكل صنف مطلوب. كما يُمكن اختيار مستودع المجموعة كمستودع مصدر. عند تقديم أمر العمل، تُحجز المواد الخام في هذه المستودعات لاستخدامها في الإنتاج." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1262 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1244 msgid "The warehouse where your Items will be transferred when you begin production. Group Warehouse can also be selected as a Work in Progress warehouse." msgstr "المستودع الذي ستُنقل إليه منتجاتك عند بدء الإنتاج. يمكن أيضاً اختيار مستودع المجموعة كمستودع للمنتجات قيد التصنيع." @@ -54746,11 +54743,11 @@ msgstr "المستودع الذي ستُنقل إليه منتجاتك عند ب msgid "The withdrawal or deposit amounts - only required if there's no amount column." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:893 +#: erpnext/manufacturing/doctype/job_card/job_card.py:896 msgid "The {0} ({1}) must be equal to {2} ({3})" msgstr "يجب أن يكون {0} ({1}) مساويًا لـ {2} ({3})" -#: erpnext/public/js/controllers/transaction.js:3328 +#: erpnext/public/js/controllers/transaction.js:3330 msgid "The {0} contains Unit Price Items." msgstr "يحتوي {0} على عناصر سعر الوحدة." @@ -54758,7 +54755,7 @@ msgstr "يحتوي {0} على عناصر سعر الوحدة." msgid "The {0} prefix '{1}' already exists. Please change the Serial No Series, otherwise you will get a Duplicate Entry error." msgstr "البادئة {0} '{1}' موجودة بالفعل. يُرجى تغيير رقم التسلسل، وإلا ستظهر لك رسالة خطأ \"إدخال مكرر\"." -#: erpnext/stock/doctype/material_request/material_request.py:878 +#: erpnext/stock/doctype/material_request/material_request.py:877 msgid "The {0} {1} created successfully" msgstr "تم إنشاء {0} {1} بنجاح" @@ -54766,7 +54763,7 @@ msgstr "تم إنشاء {0} {1} بنجاح" msgid "The {0} {1} does not match with the {0} {2} in the {3} {4}" msgstr "لا يتطابق {0} {1} مع {0} {2} في {3} {4}" -#: erpnext/manufacturing/doctype/job_card/job_card.py:996 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1002 msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}." msgstr "يتم استخدام {0} {1} لحساب تكلفة التقييم للمنتج النهائي {2}." @@ -54782,7 +54779,7 @@ msgstr "هناك صيانة نشطة أو إصلاحات ضد الأصل. يجب msgid "There are inconsistencies between the rate, no of shares and the amount calculated" msgstr "هناك تناقضات بين المعدل، لا من الأسهم والمبلغ المحسوب" -#: erpnext/accounts/doctype/account/account.py:203 +#: erpnext/accounts/doctype/account/account.py:204 msgid "There are ledger entries against this account. Changing {0} to non-{1} in live system will cause incorrect output in 'Accounts {2}' report" msgstr "توجد قيود دفترية لهذا الحساب. سيؤدي تغيير {0} إلى{1} غير موجود في النظام الفعلي إلى ظهور مخرجات غير صحيحة في تقرير \"الحسابات {2}\"." @@ -54811,7 +54808,7 @@ msgstr "لا توجد مواعيد متاحة في هذا التاريخ" msgid "There are no transactions in the system for the selected bank account and dates that match the filters." msgstr "" -#: erpnext/stock/doctype/item/item.js:1177 +#: erpnext/stock/doctype/item/item.js:1164 msgid "There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit Item Valuation, FIFO and Moving Average." msgstr "هناك خياران لتقييم المخزون: طريقة الوارد أولاً يُصرف أولاً (FIFO) وطريقة المتوسط المتحرك. لفهم هذا الموضوع بالتفصيل، يُرجى زيارة تقييم الأصناف، وطريقة الوارد أولاً يُصرف أولاً، وطريقة المتوسط المتحرك." @@ -54851,7 +54848,7 @@ msgstr "لم يتم العثور على دفعة بالمقابلة مع {0}: {1 msgid "There is one unreconciled transaction before {0}." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:1758 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:871 msgid "There must be atleast 1 Finished Good in this Stock Entry" msgstr "يجب أن يكون هناك منتج نهائي واحد على الأقل في هذا الإدخال المخزوني." @@ -54907,11 +54904,11 @@ msgstr "هذا العنصر هو متغير {0} (قالب)." msgid "This Month's Summary" msgstr "ملخص هذا الشهر" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:974 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:982 msgid "This Purchase Order has been fully subcontracted." msgstr "تم التعاقد من الباطن بالكامل على أمر الشراء هذا." -#: erpnext/selling/doctype/sales_order/sales_order.py:2187 +#: erpnext/selling/doctype/sales_order/sales_order.py:2209 msgid "This Sales Order has been fully subcontracted." msgstr "تم التعاقد من الباطن بالكامل على أمر البيع هذا." @@ -55048,11 +55045,11 @@ msgstr "يُعتبر هذا الأمر خطيراً من وجهة نظر الم msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice" msgstr "يتم إجراء ذلك للتعامل مع محاسبة الحالات التي يتم فيها إنشاء إيصال الشراء بعد فاتورة الشراء" -#: erpnext/manufacturing/doctype/work_order/work_order.js:1243 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1225 msgid "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox." msgstr "هذا الخيار مُفعّل افتراضيًا. إذا كنت ترغب في تخطيط المواد اللازمة لتجميعات فرعية للمنتج الذي تقوم بتصنيعه، فاترك هذا الخيار مُفعّلًا. أما إذا كنت تخطط وتُصنّع التجميعات الفرعية بشكل منفصل، فيمكنك تعطيل هذا الخيار." -#: erpnext/stock/doctype/item/item.js:1165 +#: erpnext/stock/doctype/item/item.js:1152 msgid "This is for raw material Items that'll be used to create finished goods. If the Item is an additional service like 'washing' that'll be used in the BOM, keep this unchecked." msgstr "هذا الخيار مخصص للمواد الخام التي ستُستخدم في تصنيع المنتجات النهائية. إذا كانت المادة خدمة إضافية مثل \"الغسيل\" التي ستُستخدم في قائمة المواد، فاترك هذا الخيار غير مُحدد." @@ -55214,7 +55211,7 @@ msgstr "" msgid "This will restrict user access to other employee records" msgstr "سيؤدي هذا إلى تقييد وصول المستخدم لسجلات الموظفين الأخرى" -#: erpnext/controllers/selling_controller.py:886 +#: erpnext/controllers/selling_controller.py:887 msgid "This {} will be treated as material transfer." msgstr "سيتم التعامل مع هذا {} على أنه نقل مواد." @@ -55325,7 +55322,7 @@ msgstr "الوقت بالدقائق" msgid "Time in mins." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:872 +#: erpnext/manufacturing/doctype/job_card/job_card.py:873 msgid "Time logs are required for {0} {1}" msgstr "سجلات الوقت مطلوبة لـ {0} {1}" @@ -55434,7 +55431,7 @@ msgstr "على فاتورة" msgid "To Currency" msgstr "إلى العملات" -#: erpnext/controllers/accounts_controller.py:626 +#: erpnext/controllers/accounts_controller.py:627 #: erpnext/setup/doctype/holiday_list/holiday_list.py:121 msgid "To Date cannot be before From Date" msgstr "(الى تاريخ) لا يمكن ان يكون قبل (من تاريخ)" @@ -55708,7 +55705,7 @@ msgid "To include sub-assembly costs and secondary items in Finished Goods on a msgstr "" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2249 -#: erpnext/controllers/accounts_controller.py:3255 +#: erpnext/controllers/accounts_controller.py:3249 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included" msgstr "ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف" @@ -55720,7 +55717,7 @@ msgstr "لدمج ، يجب أن يكون نفس الخصائص التالية ل msgid "To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled." msgstr "ولعدم تطبيق قاعدة التسعير في معاملة معينة، يجب تعطيل جميع قواعد التسعير المعمول بها." -#: erpnext/accounts/doctype/account/account.py:554 +#: erpnext/accounts/doctype/account/account.py:555 msgid "To overrule this, enable '{0}' in company {1}" msgstr "لإلغاء هذا ، قم بتمكين "{0}" في الشركة {1}" @@ -56002,12 +55999,12 @@ msgstr "مجموع العمولة" #. Label of the total_completed_qty (Float) field in DocType 'Job Card' #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/job_card/job_card.py:889 +#: erpnext/manufacturing/doctype/job_card/job_card.py:892 #: erpnext/manufacturing/report/job_card_summary/job_card_summary.py:174 msgid "Total Completed Qty" msgstr "إجمالي الكمية المكتملة" -#: erpnext/manufacturing/doctype/job_card/job_card.py:191 +#: erpnext/manufacturing/doctype/job_card/job_card.py:192 msgid "Total Completed Qty is required for Job Card {0}, please start and complete the job card before submission" msgstr "" @@ -56309,7 +56306,7 @@ msgstr "إجمالي المبلغ المستحق" msgid "Total Paid Amount" msgstr "إجمالي المبلغ المدفوع" -#: erpnext/controllers/accounts_controller.py:2801 +#: erpnext/controllers/accounts_controller.py:2802 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total" msgstr "يجب أن يكون إجمالي مبلغ الدفع في جدول الدفع مساويا للمجموع الكبير / المستدير" @@ -56321,7 +56318,7 @@ msgstr "لا يمكن أن يكون إجمالي مبلغ طلب الدفع أك msgid "Total Payments" msgstr "مجموع المدفوعات" -#: erpnext/selling/doctype/sales_order/sales_order.py:724 +#: erpnext/selling/doctype/sales_order/sales_order.py:727 msgid "Total Picked Quantity {0} is more than ordered qty {1}. You can set the Over Picking Allowance in Stock Settings." msgstr "إجمالي الكمية المختارة {0} أكبر من الكمية المطلوبة {1}. يمكنك ضبط سماحية الاختيار الزائد في إعدادات المخزون." @@ -56604,7 +56601,7 @@ msgstr "إجمالي وقت العمل على محطة العمل (بالساع msgid "Total allocated percentage for sales team should be 100" msgstr "مجموع النسبة المئوية المخصصة ل فريق المبيعات يجب أن يكون 100" -#: erpnext/selling/doctype/customer/customer.py:194 +#: erpnext/selling/doctype/customer/customer.py:184 msgid "Total contribution percentage should be equal to 100" msgstr "يجب أن تكون نسبة المساهمة الإجمالية مساوية 100" @@ -56779,7 +56776,7 @@ msgstr "تاريخ المعاملة" msgid "Transaction Dates" msgstr "" -#: erpnext/setup/doctype/company/company.py:1093 +#: erpnext/setup/doctype/company/company.py:1097 msgid "Transaction Deletion Document {0} has been triggered for company {1}" msgstr "" @@ -56803,11 +56800,11 @@ msgstr "عنصر سجل حذف المعاملة" msgid "Transaction Deletion Record To Delete" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1102 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1103 msgid "Transaction Deletion Record {0} is already running. {1}" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1121 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:1122 msgid "Transaction Deletion Record {0} is currently deleting {1}. Cannot save documents until deletion completes." msgstr "" @@ -56912,7 +56909,8 @@ msgstr "المعاملة التي يتم اقتطاع الضريبة منها" msgid "Transaction from which tax is withheld" msgstr "المعاملة التي يتم اقتطاع الضريبة منها" -#: erpnext/manufacturing/doctype/job_card/job_card.py:865 +#: erpnext/manufacturing/doctype/job_card/job_card.py:866 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/base.py:38 msgid "Transaction not allowed against stopped Work Order {0}" msgstr "المعاملة غير مسموح بها في مقابل أمر العمل المتوقف {0}" @@ -57144,8 +57142,8 @@ msgstr "نقل معلومات" msgid "Transporter Name" msgstr "نقل اسم" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:128 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:214 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:132 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:219 msgid "Travel Expenses" msgstr "نفقات السفر" @@ -57424,7 +57422,7 @@ msgstr "إعدادات ضريبة القيمة المضافة في الإمار #: erpnext/stock/report/item_prices/item_prices.py:55 #: erpnext/stock/report/item_wise_consumption/item_wise_consumption.py:60 #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:93 -#: erpnext/stock/report/stock_ageing/stock_ageing.py:186 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:174 #: erpnext/stock/report/stock_analytics/stock_analytics.py:59 #: erpnext/stock/report/stock_projected_qty/stock_projected_qty.py:136 #: erpnext/subcontracting/doctype/subcontracting_inward_order_service_item/subcontracting_inward_order_service_item.json @@ -57485,7 +57483,7 @@ msgstr "" msgid "UOM Conversion Factor" msgstr "عامل تحويل وحدة القياس" -#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1467 +#: erpnext/manufacturing/doctype/production_plan/production_plan.py:1469 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}" msgstr "معامل تحويل UOM ({0} -> {1}) غير موجود للعنصر: {2}" @@ -57498,7 +57496,7 @@ msgstr "معامل تحويل وحدة القياس مطلوب في الصف: {0 msgid "UOM Name" msgstr "اسم وحدة القايس" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:3992 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:1711 msgid "UOM conversion factor required for UOM: {0} in Item: {1}" msgstr "معامل تحويل وحدة القياس المطلوب لوحدة القياس: {0} في العنصر: {1}" @@ -57570,7 +57568,7 @@ msgstr "تعذر العثور على سعر الصرف من {0} إلى {1} لت msgid "Unable to find score starting at {0}. You need to have standing scores covering 0 to 100" msgstr "تعذر العثور على النتيجة بدءا من {0}. يجب أن يكون لديك درجات دائمة تغطي 0 إلى 100" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1063 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1064 msgid "Unable to find the time slot in the next {0} days for the operation {1}. Please increase the 'Capacity Planning For (Days)' in the {2}." msgstr "لم يتم العثور على الفترة الزمنية المناسبة للعملية {1}خلال الأيام {0} القادمة. يرجى زيادة \"تخطيط السعة لـ (أيام)\" في {2}." @@ -57657,7 +57655,7 @@ msgstr "" msgid "Undo {}?" msgstr "" -#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:937 +#: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:938 msgid "Unexpected Naming Series Pattern" msgstr "" @@ -57676,7 +57674,7 @@ msgstr "وحدة" msgid "Unit Of Measure" msgstr "" -#: erpnext/controllers/accounts_controller.py:3925 +#: erpnext/controllers/accounts_controller.py:3931 msgid "Unit Price" msgstr "سعر الوحدة" @@ -57838,7 +57836,7 @@ msgstr "إدخالات غير مُطابقة" msgid "Unreconciled Transactions" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:952 +#: erpnext/manufacturing/doctype/work_order/work_order.js:934 #: erpnext/selling/doctype/sales_order/sales_order.js:122 #: erpnext/stock/doctype/pick_list/pick_list.js:161 #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js:192 @@ -57878,8 +57876,8 @@ msgstr "لم تحل" msgid "Unscheduled" msgstr "غير المجدولة" -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:178 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:305 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:182 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:310 msgid "Unsecured Loans" msgstr "القروض غير المضمونة" @@ -58059,7 +58057,7 @@ msgstr "تحديث العناصر" #. Invoice' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/controllers/accounts_controller.py:198 +#: erpnext/controllers/accounts_controller.py:199 msgid "Update Outstanding for Self" msgstr "تحديث رائع للذات" @@ -58142,7 +58140,7 @@ msgstr "تحديث حقول التكاليف والفواتير لهذا الم msgid "Updating Variants..." msgstr "جارٍ تحديث المتغيرات ..." -#: erpnext/manufacturing/doctype/work_order/work_order.js:1205 +#: erpnext/manufacturing/doctype/work_order/work_order.js:1187 msgid "Updating Work Order status" msgstr "تحديث حالة أمر العمل" @@ -58344,7 +58342,7 @@ msgstr "" msgid "Use Transaction Date Exchange Rate" msgstr "استخدم سعر صرف تاريخ المعاملة" -#: erpnext/projects/doctype/project/project.py:567 +#: erpnext/projects/doctype/project/project.py:605 msgid "Use a name that is different from previous project name" msgstr "استخدم اسمًا مختلفًا عن اسم المشروع السابق" @@ -58386,7 +58384,7 @@ msgstr "" msgid "Used with Financial Report Template" msgstr "يُستخدم مع نموذج التقرير المالي" -#: erpnext/setup/install.py:204 +#: erpnext/setup/install.py:236 msgid "User Forum" msgstr "منتدى المستخدمين" @@ -58472,8 +58470,8 @@ msgstr "سيتم إخطار المستخدمين الذين لديهم هذا ا msgid "Using negative stock disables FIFO/Moving average valuation when inventory is negative." msgstr "يؤدي استخدام المخزون السالب إلى تعطيل تقييم FIFO/المتوسط المتحرك عندما يكون المخزون سالباً." -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:129 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:215 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:133 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:220 msgid "Utility Expenses" msgstr "نفقات المرافق" @@ -58483,7 +58481,7 @@ msgstr "نفقات المرافق" msgid "VAT Accounts" msgstr "حسابات ضريبة القيمة المضافة" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:28 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:40 msgid "VAT Amount (AED)" msgstr "مبلغ ضريبة القيمة المضافة (بالدرهم الإماراتي)" @@ -58493,12 +58491,12 @@ msgid "VAT Audit Report" msgstr "تقرير تدقيق ضريبة القيمة المضافة" #: erpnext/regional/report/uae_vat_201/uae_vat_201.html:47 -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:111 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:123 msgid "VAT on Expenses and All Other Inputs" msgstr "ضريبة القيمة المضافة على المصاريف وجميع المدخلات الأخرى" #: erpnext/regional/report/uae_vat_201/uae_vat_201.html:15 -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:45 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:57 msgid "VAT on Sales and All Other Outputs" msgstr "ضريبة القيمة المضافة على المبيعات وجميع المخرجات الأخرى" @@ -58723,11 +58721,11 @@ msgstr "سعر التقييم" msgid "Valuation Rate (In / Out)" msgstr "معدل التقييم (داخل / خارج)" -#: erpnext/stock/stock_ledger.py:2075 +#: erpnext/stock/stock_ledger.py:2041 msgid "Valuation Rate Missing" msgstr "معدل التقييم مفقود" -#: erpnext/stock/stock_ledger.py:2053 +#: erpnext/stock/stock_ledger.py:2019 msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}." msgstr "معدل التقييم للعنصر {0} ، مطلوب لإجراء إدخالات محاسبية لـ {1} {2}." @@ -58759,7 +58757,7 @@ msgid "Valuation rate for the item as per Sales Invoice (Only for Internal Trans msgstr "معدل تقييم السلعة وفقًا لفاتورة المبيعات (للتحويلات الداخلية فقط)" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2273 -#: erpnext/controllers/accounts_controller.py:3279 +#: erpnext/controllers/accounts_controller.py:3273 msgid "Valuation type charges can not be marked as Inclusive" msgstr "لا يمكن تحديد رسوم نوع التقييم على أنها شاملة" @@ -58771,7 +58769,7 @@ msgstr "لا يمكن وضع علامة على رسوم التقييم على ا msgid "Value (G - D)" msgstr "القيمة (G - D)" -#: erpnext/stock/report/stock_ageing/stock_ageing.py:229 +#: erpnext/stock/report/stock_ageing/stock_ageing.py:217 msgid "Value ({0})" msgstr "القيمة ({0})" @@ -58943,7 +58941,7 @@ msgstr "العناصر المتغيرة" msgid "Variant Of" msgstr "البديل من" -#: erpnext/stock/doctype/item/item.js:857 +#: erpnext/stock/doctype/item/item.js:844 msgid "Variant creation has been queued." msgstr "وقد وضعت قائمة الانتظار في قائمة الانتظار." @@ -59309,7 +59307,7 @@ msgstr "" #: erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json #: erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1253 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1176 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:56 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:221 #: erpnext/accounts/report/general_ledger/general_ledger.js:49 @@ -59383,7 +59381,7 @@ msgstr "نوع القسيمة الفرعي" #: erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json #: erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1251 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1174 #: erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py:212 #: erpnext/accounts/report/general_ledger/general_ledger.py:760 #: erpnext/accounts/report/invalid_ledger_entries/invalid_ledger_entries.py:31 @@ -59591,7 +59589,7 @@ msgid "Warehouse not found against the account {0}" msgstr "لم يتم العثور على المستودع مقابل الحساب {0}" #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:1215 -#: erpnext/stock/doctype/delivery_note/delivery_note.py:444 +#: erpnext/stock/doctype/delivery_note/delivery_note.py:445 msgid "Warehouse required for stock Item {0}" msgstr "مستودع الأسهم المطلوبة لل تفاصيل {0}" @@ -59616,7 +59614,7 @@ msgstr "مستودع {0} لا تنتمي إلى شركة {1}" msgid "Warehouse {0} does not exist" msgstr "المستودع {0} غير موجود" -#: erpnext/manufacturing/doctype/work_order/work_order.py:246 +#: erpnext/manufacturing/doctype/work_order/work_order.py:247 msgid "Warehouse {0} is not allowed for Sales Order {1}, it should be {2}" msgstr "لا يُسمح باستخدام المستودع {0} في أمر البيع {1}، بل يجب أن يكون {2}" @@ -59753,7 +59751,7 @@ msgstr "تحذير: {0} أخر # {1} موجود في مدخل المخزن {2}\\ msgid "Warning: Material Requested Qty is less than Minimum Order Qty" msgstr "تحذير : كمية المواد المطلوبة هي أقل من الحد الأدنى للطلب الكمية" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1482 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1483 msgid "Warning: Quantity exceeds maximum producible quantity based on quantity of raw materials received through the Subcontracting Inward Order {0}." msgstr "تحذير: الكمية تتجاوز الحد الأقصى للكمية القابلة للإنتاج بناءً على كمية المواد الخام المستلمة من خلال أمر التوريد الداخلي للتعاقد من الباطن {0}." @@ -59847,7 +59845,7 @@ msgstr "الطول الموجي بالكيلومترات" msgid "Wavelength In Megametres" msgstr "الطول الموجي بالميغامتر" -#: erpnext/controllers/accounts_controller.py:193 +#: erpnext/controllers/accounts_controller.py:194 msgid "We can see {0} is made against {1}. If you want {1}'s outstanding to be updated, uncheck the '{2}' checkbox." msgstr "" @@ -60046,7 +60044,7 @@ msgstr "عند التحديد، سيتم تطبيق حد المعاملة فقط msgid "When checked, the system will use the posting datetime of the document for naming the document instead of the creation datetime of the document." msgstr "" -#: erpnext/stock/doctype/item/item.js:1184 +#: erpnext/stock/doctype/item/item.js:1171 msgid "When creating an Item, entering a value for this field will automatically create an Item Price at the backend." msgstr "عند إنشاء عنصر، سيؤدي إدخال قيمة لهذا الحقل إلى إنشاء سعر العنصر تلقائيًا في الواجهة الخلفية." @@ -60056,7 +60054,7 @@ msgstr "عند إنشاء عنصر، سيؤدي إدخال قيمة لهذا ا msgid "When enabled, it adds a cutoff date filter to Delivery Notes created in bulk from Sales Orders. This allows you to process orders only with a transaction date up to the specified cutoff date, which is useful for period-end processing and batch fulfillment." msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:297 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:703 msgid "When there are multiple finished goods ({0}) in a Repack stock entry, the basic rate for all finished goods must be set manually. To set rate manually, enable the checkbox 'Set Basic Rate Manually' in the respective finished good row." msgstr "" @@ -60066,11 +60064,11 @@ msgstr "" msgid "When you pay for something upfront (like annual insurance), the cost is held here and recognized gradually over time" msgstr "" -#: erpnext/accounts/doctype/account/account.py:380 +#: erpnext/accounts/doctype/account/account.py:381 msgid "While creating account for Child Company {0}, parent account {1} found as a ledger account." msgstr "أثناء إنشاء حساب الشركة الفرعية {0} ، تم العثور على الحساب الرئيسي {1} كحساب دفتر أستاذ." -#: erpnext/accounts/doctype/account/account.py:370 +#: erpnext/accounts/doctype/account/account.py:371 msgid "While creating account for Child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA" msgstr "أثناء إنشاء حساب Child Company {0} ، لم يتم العثور على الحساب الرئيسي {1}. الرجاء إنشاء الحساب الرئيسي في شهادة توثيق البرامج المقابلة" @@ -60215,7 +60213,7 @@ msgstr "العمل المنجز" #: erpnext/assets/doctype/asset/asset_list.js:12 #: erpnext/manufacturing/doctype/job_card/job_card.json #: erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json -#: erpnext/setup/doctype/company/company.py:384 +#: erpnext/setup/doctype/company/company.py:388 #: erpnext/support/doctype/warranty_claim/warranty_claim.json msgid "Work In Progress" msgstr "التقدم في العمل" @@ -60252,7 +60250,7 @@ msgstr "التقدم في العمل" #: erpnext/selling/doctype/sales_order/sales_order.js:1094 #: erpnext/stock/doctype/material_request/material_request.js:216 #: erpnext/stock/doctype/material_request/material_request.json -#: erpnext/stock/doctype/material_request/material_request.py:879 +#: erpnext/stock/doctype/material_request/material_request.py:878 #: erpnext/stock/doctype/pick_list/pick_list.json #: erpnext/stock/doctype/serial_no/serial_no.json #: erpnext/stock/doctype/stock_entry/stock_entry.json @@ -60286,7 +60284,7 @@ msgstr "المواد المستهلكة في أمر العمل" msgid "Work Order Item" msgstr "بند أمر العمل" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:910 +#: erpnext/stock/doctype/stock_entry/stock_entry.py:527 msgid "Work Order Mismatch" msgstr "" @@ -60327,19 +60325,23 @@ msgstr "ملخص أمر العمل" msgid "Work Order Summary Report" msgstr "" -#: erpnext/stock/doctype/material_request/material_request.py:885 +#: erpnext/stock/doctype/material_request/material_request.py:884 msgid "Work Order cannot be created for following reason:
    {0}" msgstr "لا يمكن إنشاء أمر العمل للسبب التالي:
    {0}" -#: erpnext/manufacturing/doctype/work_order/work_order.py:1426 +#: erpnext/manufacturing/doctype/work_order/work_order.py:1427 msgid "Work Order cannot be raised against a Item Template" msgstr "لا يمكن رفع أمر العمل مقابل قالب العنصر" -#: erpnext/manufacturing/doctype/work_order/work_order.py:2510 -#: erpnext/manufacturing/doctype/work_order/work_order.py:2590 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2508 +#: erpnext/manufacturing/doctype/work_order/work_order.py:2588 msgid "Work Order has been {0}" msgstr "تم عمل الطلب {0}" +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/manufacturing.py:285 +msgid "Work Order is mandatory" +msgstr "" + #: erpnext/selling/doctype/sales_order/sales_order.js:1297 msgid "Work Order not created" msgstr "أمر العمل لم يتم إنشاؤه" @@ -60348,16 +60350,16 @@ msgstr "أمر العمل لم يتم إنشاؤه" msgid "Work Order {0} created" msgstr "تم إنشاء أمر العمل {0}" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:2368 +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/disassemble.py:100 msgid "Work Order {0} has no produced qty" msgstr "" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:947 -msgid "Work Order {0}: Job Card not found for the operation {1}" -msgstr "أمر العمل {0}: لم يتم العثور على بطاقة المهمة للعملية {1}" +#: erpnext/stock/doctype/stock_entry/stock_entry_handler/base.py:35 +msgid "Work Order {0} must be submitted" +msgstr "" #: erpnext/manufacturing/report/job_card_summary/job_card_summary.js:56 -#: erpnext/stock/doctype/material_request/material_request.py:873 +#: erpnext/stock/doctype/material_request/material_request.py:872 msgid "Work Orders" msgstr "طلبات العمل" @@ -60382,7 +60384,7 @@ msgstr "التقدم في العمل" msgid "Work-in-Progress Warehouse" msgstr "مستودع العمل قيد التنفيذ" -#: erpnext/manufacturing/doctype/work_order/work_order.py:791 +#: erpnext/manufacturing/doctype/work_order/work_order.py:792 msgid "Work-in-Progress Warehouse is required before Submit" msgstr "مستودع أعمال جارية مطلوب قبل التسجيل\\n
    \\nWork-in-Progress Warehouse is required before Submit" @@ -60430,7 +60432,7 @@ msgstr "ساعات العمل" #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json #: erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json #: erpnext/manufacturing/doctype/job_card/job_card.json -#: erpnext/manufacturing/doctype/work_order/work_order.js:344 +#: erpnext/manufacturing/doctype/work_order/work_order.js:325 #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json #: erpnext/manufacturing/doctype/workstation/workstation.json #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js:35 @@ -60521,14 +60523,14 @@ msgstr "محطات العمل" #. Label of the write_off (Section Break) field in DocType 'Purchase Invoice' #. Label of the write_off_section (Section Break) field in DocType 'Sales #. Invoice' -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:130 -#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:216 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:134 +#: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:221 #: erpnext/accounts/doctype/journal_entry/journal_entry.json #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/pos_profile/pos_profile.json #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json -#: erpnext/setup/doctype/company/company.py:666 +#: erpnext/setup/doctype/company/company.py:671 msgid "Write Off" msgstr "لا تصلح" @@ -60633,7 +60635,7 @@ msgstr "القيمة المكتوبة" msgid "Wrong Company" msgstr "شركة خاطئة" -#: erpnext/setup/doctype/company/company.js:233 +#: erpnext/setup/doctype/company/company.js:249 msgid "Wrong Password" msgstr "كلمة مرور خاطئة\\n
    \\nWrong Password" @@ -60689,7 +60691,7 @@ msgstr "تاريخ البدء أو تاريخ الانتهاء العام يتد msgid "You are importing data for the code list:" msgstr "أنت بصدد استيراد بيانات لقائمة الرموز:" -#: erpnext/controllers/accounts_controller.py:4029 +#: erpnext/controllers/accounts_controller.py:4035 msgid "You are not allowed to update as per the conditions set in {} Workflow." msgstr "غير مسموح لك بالتحديث وفقًا للشروط المحددة في {} سير العمل." @@ -60701,7 +60703,7 @@ msgstr "غير مصرح لك باضافه إدخالات أو تحديثها ق msgid "You are not authorized to make/edit Stock Transactions for Item {0} under warehouse {1} before this time." msgstr "أنت غير مخول بإجراء/تعديل معاملات المخزون للصنف {0} ضمن المستودع {1} قبل هذا الوقت." -#: erpnext/accounts/doctype/account/account.py:312 +#: erpnext/accounts/doctype/account/account.py:313 msgid "You are not authorized to set Frozen value" msgstr ".أنت غير مخول لتغيير القيم المجمدة" @@ -60770,11 +60772,11 @@ msgstr "يمكنك تعيينه كاسم للآلة أو نوع العملية. msgid "You can set up the rule to split the transaction across multiple accounts." msgstr "" -#: erpnext/controllers/accounts_controller.py:214 +#: erpnext/controllers/accounts_controller.py:215 msgid "You can use {0} to reconcile against {1} later." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1332 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1340 msgid "You can't make any changes to Job Card since Work Order is closed." msgstr "لا يمكنك إجراء أي تغييرات على بطاقة العمل لأن أمر العمل مغلق." @@ -60859,7 +60861,7 @@ msgstr "" msgid "You do not have permission to import bank transactions" msgstr "" -#: erpnext/controllers/accounts_controller.py:4005 +#: erpnext/controllers/accounts_controller.py:4011 msgid "You do not have permissions to {} items in a {}." msgstr "ليس لديك أذونات لـ {} من العناصر في {}." @@ -60871,19 +60873,19 @@ msgstr "ليس لديك ما يكفي من نقاط الولاء لاستردا msgid "You don't have enough points to redeem." msgstr "ليس لديك ما يكفي من النقاط لاستردادها." -#: erpnext/controllers/accounts_controller.py:4466 +#: erpnext/controllers/accounts_controller.py:4454 msgid "You don't have permission to create a Company Address. Please contact your System Manager." msgstr "" -#: erpnext/controllers/accounts_controller.py:4446 +#: erpnext/controllers/accounts_controller.py:4434 msgid "You don't have permission to update Company details. Please contact your System Manager." msgstr "" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:576 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:575 msgid "You don't have permission to update Received Qty DocField for item {0}" msgstr "" -#: erpnext/controllers/accounts_controller.py:4440 +#: erpnext/controllers/accounts_controller.py:4428 msgid "You don't have permission to update this document. Please contact your System Manager." msgstr "" @@ -60895,7 +60897,7 @@ msgstr "كان لديك {} من الأخطاء أثناء إنشاء الفوا msgid "You have already selected items from {0} {1}" msgstr "لقد حددت العناصر من {0} {1}" -#: erpnext/projects/doctype/project/project.py:362 +#: erpnext/projects/doctype/project/project.py:400 msgid "You have been invited to collaborate on the project {0}." msgstr "لقد تمت دعوتك للمشاركة في المشروع {0}." @@ -60935,7 +60937,7 @@ msgstr "يجب عليك تحديد عميل قبل إضافة عنصر." msgid "You need to cancel POS Closing Entry {} to be able to cancel this document." msgstr "يجب عليك إلغاء إدخال إغلاق نقطة البيع {} لتتمكن من إلغاء هذا المستند." -#: erpnext/controllers/accounts_controller.py:3230 +#: erpnext/controllers/accounts_controller.py:3224 msgid "You selected the account group {1} as {2} Account in row {0}. Please select a single account." msgstr "لقد اخترت مجموعة الحسابات {1} كحساب {2} في الصف {0}. يرجى اختيار حساب واحد." @@ -60982,11 +60984,11 @@ msgstr "الرمز البريدي" msgid "Zero Balance" msgstr "رصيد صفري" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:65 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:77 msgid "Zero Rated" msgstr "معدل صفري" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:621 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:195 msgid "Zero quantity" msgstr "الكمية صفر" @@ -61012,7 +61014,7 @@ msgstr "[هام] [ERPNext] إعادة ترتيب الأخطاء تلقائيًا msgid "`Allow Negative rates for Items`" msgstr "السماح بأسعار سلبية للعناصر" -#: erpnext/stock/stock_ledger.py:2067 +#: erpnext/stock/stock_ledger.py:2033 msgid "after" msgstr "بعد" @@ -61202,7 +61204,7 @@ msgstr "تطبيق الدفع غير مثبت. يرجى تثبيته من {} أ msgid "per hour" msgstr "كل ساعة" -#: erpnext/stock/stock_ledger.py:2068 +#: erpnext/stock/stock_ledger.py:2034 msgid "performing either one below:" msgstr "أداء أحد الخيارين التاليين:" @@ -61297,7 +61299,7 @@ msgstr "عنوان" msgid "to" msgstr "إلى" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3176 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:3257 msgid "to unallocate the amount of this Return Invoice before cancelling it." msgstr "لإلغاء تخصيص مبلغ فاتورة الإرجاع هذه قبل إلغائها." @@ -61324,7 +61326,7 @@ msgstr "" msgid "unique e.g. SAVE20 To be used to get discount" msgstr "فريدة مثل SAVE20 لاستخدامها للحصول على الخصم" -#: erpnext/buying/doctype/purchase_order/purchase_order.py:606 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:605 msgid "updated delivered quantity for item {0} to {1}" msgstr "" @@ -61346,7 +61348,7 @@ msgstr "عبر أداة تحديث قائمة المواد" msgid "you must select Capital Work in Progress Account in accounts table" msgstr "يجب عليك تحديد حساب رأس المال قيد التقدم في جدول الحسابات" -#: erpnext/controllers/accounts_controller.py:1286 +#: erpnext/controllers/accounts_controller.py:1287 msgid "{0} '{1}' is disabled" msgstr "{0} '{1}' معطل" @@ -61354,7 +61356,7 @@ msgstr "{0} '{1}' معطل" msgid "{0} '{1}' not in Fiscal Year {2}" msgstr "{0} '{1}' ليس في السنة المالية {2}" -#: erpnext/manufacturing/doctype/work_order/work_order.py:677 +#: erpnext/manufacturing/doctype/work_order/work_order.py:678 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}" msgstr "{0} ({1}) لا يمكن أن يكون أكبر من الكمية المخطط لها ({2}) في أمر العمل {3}" @@ -61362,7 +61364,7 @@ msgstr "{0} ({1}) لا يمكن أن يكون أكبر من الكمية الم msgid "{0} {1} has submitted Assets. Remove Item {2} from table to continue." msgstr "قام كل من {0} و و{1}و بإرسال الأصول. للمتابعة، قم بإزالة العنصر و{2}و من الجدول." -#: erpnext/controllers/accounts_controller.py:2383 +#: erpnext/controllers/accounts_controller.py:2384 msgid "{0} Account not found against Customer {1}." msgstr "{0} لم يتم العثور على حساب مقابل العميل {1}." @@ -61395,11 +61397,11 @@ msgstr "" msgid "{0} Number {1} is already used in {2} {3}" msgstr "{0} الرقم {1} مستخدم بالفعل في {2} {3}" -#: erpnext/manufacturing/doctype/bom/bom.py:1689 +#: erpnext/manufacturing/doctype/bom/bom.py:1703 msgid "{0} Operating Cost for operation {1}" msgstr "{0} تكلفة التشغيل للعملية {1}" -#: erpnext/manufacturing/doctype/work_order/work_order.js:578 +#: erpnext/manufacturing/doctype/work_order/work_order.js:560 msgid "{0} Operations: {1}" msgstr "{0} العمليات: {1}" @@ -61495,7 +61497,7 @@ msgstr "{0} تم انشاؤه" msgid "{0} creation for the following records will be skipped." msgstr "سيتم تخطي إنشاء السجلات التالية {0} ." -#: erpnext/setup/doctype/company/company.py:291 +#: erpnext/setup/doctype/company/company.py:295 msgid "{0} currency must be same as company's default currency. Please select another account." msgstr "" @@ -61511,7 +61513,7 @@ msgstr "{0} لديه حاليا {1} بطاقة أداء بطاقة المورد msgid "{0} does not belong to Company {1}" msgstr "{0} لا تنتمي إلى شركة {1}" -#: erpnext/controllers/accounts_controller.py:353 +#: erpnext/controllers/accounts_controller.py:354 msgid "{0} does not belong to the Company {1}." msgstr "لا ينتمي {0} إلى الشركة {1}." @@ -61545,7 +61547,7 @@ msgstr "{0} تم التقديم بنجاح" msgid "{0} hours" msgstr "{0} ساعات" -#: erpnext/controllers/accounts_controller.py:2741 +#: erpnext/controllers/accounts_controller.py:2742 msgid "{0} in row {1}" msgstr "{0} في الحقل {1}" @@ -61567,7 +61569,7 @@ msgstr "" msgid "{0} is already running for {1}" msgstr "{0} قيد التشغيل بالفعل لـ {1}" -#: erpnext/controllers/accounts_controller.py:175 +#: erpnext/controllers/accounts_controller.py:176 msgid "{0} is blocked so this transaction cannot proceed" msgstr "تم حظر {0} حتى لا تتم متابعة هذه المعاملة" @@ -61588,7 +61590,7 @@ msgstr "{0} إلزامي للحساب {1}" msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}" msgstr "{0} إلزامي. ربما لم يتم إنشاء سجل صرف العملات من {1} إلى {2}" -#: erpnext/controllers/accounts_controller.py:3187 +#: erpnext/controllers/accounts_controller.py:3181 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}." msgstr "{0} إلزامي. ربما لم يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}." @@ -61596,7 +61598,7 @@ msgstr "{0} إلزامي. ربما لم يتم إنشاء سجل سعر صرف msgid "{0} is not a CSV file." msgstr "" -#: erpnext/selling/doctype/customer/customer.py:236 +#: erpnext/selling/doctype/customer/customer.py:226 msgid "{0} is not a company bank account" msgstr "{0} ليس حسابًا مصرفيًا للشركة" @@ -61604,7 +61606,7 @@ msgstr "{0} ليس حسابًا مصرفيًا للشركة" msgid "{0} is not a group node. Please select a group node as parent cost center" msgstr "{0} ليست عقدة مجموعة. يرجى تحديد عقدة المجموعة كمركز تكلفة الأصل" -#: erpnext/stock/doctype/stock_entry/stock_entry.py:673 +#: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py:114 msgid "{0} is not a stock Item" msgstr "{0} ليس من نوع المخزون" @@ -61644,27 +61646,27 @@ msgstr "{0} معلق حتى {1}" msgid "{0} is open. Close the POS or cancel the existing POS Opening Entry to create a new POS Opening Entry." msgstr "{0} مفتوح. أغلق نظام نقاط البيع أو ألغِ إدخال فتح نقطة البيع الحالي لإنشاء إدخال فتح نقطة بيع جديد." -#: erpnext/manufacturing/doctype/work_order/work_order.js:543 +#: erpnext/manufacturing/doctype/work_order/work_order.js:525 msgid "{0} items disassembled" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:507 +#: erpnext/manufacturing/doctype/work_order/work_order.js:489 msgid "{0} items in progress" msgstr "{0} العنصر قيد الأستخدام" -#: erpnext/manufacturing/doctype/work_order/work_order.js:531 +#: erpnext/manufacturing/doctype/work_order/work_order.js:513 msgid "{0} items lost during process." msgstr "{0} عناصر مفقودة أثناء العملية." -#: erpnext/manufacturing/doctype/work_order/work_order.js:488 +#: erpnext/manufacturing/doctype/work_order/work_order.js:470 msgid "{0} items produced" msgstr "{0} عناصر منتجة" -#: erpnext/manufacturing/doctype/work_order/work_order.js:511 +#: erpnext/manufacturing/doctype/work_order/work_order.js:493 msgid "{0} items returned" msgstr "" -#: erpnext/manufacturing/doctype/work_order/work_order.js:514 +#: erpnext/manufacturing/doctype/work_order/work_order.js:496 msgid "{0} items to return" msgstr "" @@ -61672,7 +61674,7 @@ msgstr "" msgid "{0} must be negative in return document" msgstr "{0} يجب أن يكون سالبة في وثيقة الارجاع" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2366 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2447 msgid "{0} not allowed to transact with {1}. Please change the Company or add the Company in the 'Allowed To Transact With'-Section in the Customer record." msgstr "لا يُسمح لـ {0} بالتعامل مع {1}. يُرجى تغيير الشركة أو إضافتها في قسم \"مسموح بالتعامل معه\" في سجل العميل." @@ -61688,7 +61690,7 @@ msgstr "{0} المعلمة غير صالحة" msgid "{0} payment entries can not be filtered by {1}" msgstr "{0} لا يمكن فلترة المدفوعات المدخلة {1}" -#: erpnext/controllers/stock_controller.py:1740 +#: erpnext/controllers/stock_controller.py:1741 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}." msgstr "يتم استلام كمية {0} من الصنف {1} في المستودع {2} بسعة {3}." @@ -61717,16 +61719,16 @@ msgstr "" msgid "{0} units of {1} are required in {2} with the inventory dimension: {3} on {4} {5} for {6} to complete the transaction." msgstr "يلزم {0} وحدة من {1} في {2} مع بُعد المخزون: {3} على {4} {5} لـ {6} لإكمال المعاملة." -#: erpnext/stock/stock_ledger.py:1720 erpnext/stock/stock_ledger.py:2216 -#: erpnext/stock/stock_ledger.py:2230 +#: erpnext/stock/stock_ledger.py:1686 erpnext/stock/stock_ledger.py:2182 +#: erpnext/stock/stock_ledger.py:2196 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction." msgstr "{0} وحدات من {1} لازمة ل {2} في {3} {4} ل {5} لإكمال هذه المعاملة." -#: erpnext/stock/stock_ledger.py:2317 erpnext/stock/stock_ledger.py:2362 +#: erpnext/stock/stock_ledger.py:2283 erpnext/stock/stock_ledger.py:2328 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction." msgstr "{0} وحدة من {1} مطلوبة في {2} على {3} {4} لإكمال هذه المعاملة." -#: erpnext/stock/stock_ledger.py:1714 +#: erpnext/stock/stock_ledger.py:1680 msgid "{0} units of {1} needed in {2} to complete this transaction." msgstr "{0} وحدات من {1} لازمة في {2} لإكمال هذه المعاملة." @@ -61738,7 +61740,7 @@ msgstr "{0} حتى {1}" msgid "{0} valid serial nos for Item {1}" msgstr "{0} أرقام تسلسلية صالحة للبند {1}" -#: erpnext/stock/doctype/item/item.js:862 +#: erpnext/stock/doctype/item/item.js:849 msgid "{0} variants created." msgstr "تم إنشاء المتغيرات {0}." @@ -61754,7 +61756,7 @@ msgstr "سيتم منح الخصم {0} ." msgid "{0} will be set as the {1} in subsequently scanned items" msgstr "سيتم تعيين {0} كـ {1} في العناصر التي يتم مسحها ضوئيًا لاحقًا" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1005 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1011 msgid "{0} {1}" msgstr "{0} {1}" @@ -61792,8 +61794,8 @@ msgstr "تم دفع المبلغ بالكامل بالفعل {0} {1} ." msgid "{0} {1} has already been partly paid. Please use the 'Get Outstanding Invoice' or the 'Get Outstanding Orders' button to get the latest outstanding amounts." msgstr "تم سداد جزء من المبلغ المستحق {0} {1} . يُرجى استخدام زر \"الحصول على الفاتورة المستحقة\" أو زر \"الحصول على الطلبات المستحقة\" للاطلاع على أحدث المبالغ المستحقة." -#: erpnext/buying/doctype/purchase_order/purchase_order.py:414 -#: erpnext/selling/doctype/sales_order/sales_order.py:602 +#: erpnext/buying/doctype/purchase_order/purchase_order.py:413 +#: erpnext/selling/doctype/sales_order/sales_order.py:605 #: erpnext/stock/doctype/material_request/material_request.py:257 msgid "{0} {1} has been modified. Please refresh." msgstr "تم تعديل {0} {1}، يرجى تحديث الصفحة من المتصفح" @@ -61903,7 +61905,7 @@ msgstr "{0} {1}: الحساب {2} غير فعال \\n
    \\n{0} {1}: Account {2} msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" msgstr "{0} {1}: قيد محاسبي ل {2} يمكن ان يتم فقط بالعملة : {3}" -#: erpnext/controllers/stock_controller.py:953 +#: erpnext/controllers/stock_controller.py:954 msgid "{0} {1}: Cost Center is mandatory for Item {2}" msgstr "{0} {1}: مركز التكلفة إلزامي للبند {2}" @@ -61952,8 +61954,8 @@ msgstr "" msgid "{0}'s {1} cannot be after {2}'s Expected End Date." msgstr "" -#: erpnext/manufacturing/doctype/job_card/job_card.py:1304 #: erpnext/manufacturing/doctype/job_card/job_card.py:1312 +#: erpnext/manufacturing/doctype/job_card/job_card.py:1320 msgid "{0}, complete the operation {1} before the operation {2}." msgstr "{0} ، أكمل العملية {1} قبل العملية {2}." @@ -61973,11 +61975,11 @@ msgstr "" msgid "{0}: Virtual DocType (no database table)" msgstr "" -#: erpnext/controllers/accounts_controller.py:543 +#: erpnext/controllers/accounts_controller.py:544 msgid "{0}: {1} does not belong to the Company: {2}" msgstr "{0}: {1} لا ينتمي إلى الشركة: {2}" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1410 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1333 msgid "{0}: {1} does not exist" msgstr "" @@ -61985,7 +61987,7 @@ msgstr "" msgid "{0}: {1} does not exists" msgstr "{0}: {1} غير موجود" -#: erpnext/setup/doctype/company/company.py:278 +#: erpnext/setup/doctype/company/company.py:282 msgid "{0}: {1} is a group account." msgstr "{0}: {1} هو حساب جماعي." @@ -62001,7 +62003,7 @@ msgstr "{count} الأصول التي تم إنشاؤها لـ {item_code}" msgid "{doctype} {name} is cancelled or closed." msgstr "{doctype} {name} تم إلغائه أو مغلق." -#: erpnext/controllers/stock_controller.py:2147 +#: erpnext/controllers/stock_controller.py:2148 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})" msgstr "لا يمكن أن يكون حجم العينة {item_name}({sample_size}) أكبر من الكمية المقبولة ({accepted_quantity})" @@ -62013,7 +62015,7 @@ msgstr "{ref_doctype} {ref_name} هو {status}." msgid "{}" msgstr "{}" -#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2132 +#: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2213 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}" msgstr "لا يمكن إلغاء {} نظرًا لاسترداد نقاط الولاء المكتسبة. قم أولاً بإلغاء {} لا {}" diff --git a/erpnext/locale/bs.po b/erpnext/locale/bs.po index 83324ec5e38..32d95986be5 100644 --- a/erpnext/locale/bs.po +++ b/erpnext/locale/bs.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: hello@frappe.io\n" -"POT-Creation-Date: 2026-05-17 10:04+0000\n" -"PO-Revision-Date: 2026-05-18 20:21\n" +"POT-Creation-Date: 2026-05-24 10:11+0000\n" +"PO-Revision-Date: 2026-05-24 21:22\n" "Last-Translator: hello@frappe.io\n" "Language-Team: Bosnian\n" "MIME-Version: 1.0\n" @@ -273,7 +273,7 @@ msgstr "% materijala isporučenih prema ovoj Listi Odabira" msgid "% of materials delivered against this Sales Order" msgstr "% materijala dostavljenog naspram ovog Prodajnog Naloga" -#: erpnext/controllers/accounts_controller.py:2387 +#: erpnext/controllers/accounts_controller.py:2388 msgid "'Account' in the Accounting section of Customer {0}" msgstr "'Račun' u sekciji Knjigovodstvo Klijenta {0}" @@ -289,7 +289,7 @@ msgstr "'Na Osnovu' i 'Grupiraj Po' ne mogu biti isti" msgid "'Days Since Last Order' must be greater than or equal to zero" msgstr "'Dana od posljednje narudžbe' mora biti veći ili jednako nuli" -#: erpnext/controllers/accounts_controller.py:2392 +#: erpnext/controllers/accounts_controller.py:2393 msgid "'Default {0} Account' in Company {1}" msgstr "'Standard {0} račun' u {1}" @@ -351,8 +351,8 @@ msgstr "Račun '{0}' već koristi {1}. Koristite drugi račun." msgid "'{0}' has been already added." msgstr "'{0}' je već dodan." -#: erpnext/setup/doctype/company/company.py:303 -#: erpnext/setup/doctype/company/company.py:314 +#: erpnext/setup/doctype/company/company.py:307 +#: erpnext/setup/doctype/company/company.py:318 msgid "'{0}' should be in company currency {1}." msgstr "'{0}' bi trebao biti u valuti {1}." @@ -522,8 +522,8 @@ msgstr "1000+" msgid "11-50" msgstr "11-50" -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:95 -#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:101 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:107 +#: erpnext/regional/report/uae_vat_201/uae_vat_201.py:113 msgid "1{0}" msgstr "1{0}" @@ -612,8 +612,8 @@ msgstr "90 - 120 dana" msgid "90 Above" msgstr "Iznad 90" -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1348 -#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1349 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1271 +#: erpnext/accounts/report/accounts_receivable/accounts_receivable.py:1272 msgid "<0" msgstr "<0" @@ -808,7 +808,7 @@ msgstr "