From b7d801d571e7273b5220225b3c5a0c4324452510 Mon Sep 17 00:00:00 2001 From: Corentin Forler <10946971+cogk@users.noreply.github.com> Date: Mon, 3 Feb 2025 11:32:03 +0100 Subject: [PATCH 01/69] fix(stock): Cast filters.to_date before string concatenation --- .../batch_wise_balance_history/batch_wise_balance_history.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py index 416eb88e59f..3d57242b4ff 100644 --- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py @@ -179,7 +179,7 @@ def get_stock_ledger_entries_for_batch_bundle(filters): sle = frappe.qb.DocType("Stock Ledger Entry") batch_package = frappe.qb.DocType("Serial and Batch Entry") - to_date = get_datetime(filters.to_date + " 23:59:59") + to_date = get_datetime(str(filters.to_date) + " 23:59:59") query = ( frappe.qb.from_(sle) From f8ab02192037171e4f8de7d79edfd9978238ac09 Mon Sep 17 00:00:00 2001 From: Sugesh393 Date: Wed, 5 Feb 2025 18:40:21 +0530 Subject: [PATCH 02/69] fix: change voucher_type and voucher_no field type to data --- .../tax_withheld_vouchers/tax_withheld_vouchers.json | 12 +++++------- .../tax_withheld_vouchers/tax_withheld_vouchers.py | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json index a8a79ce3c24..667da42bb8a 100644 --- a/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json +++ b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json @@ -13,17 +13,15 @@ "fields": [ { "fieldname": "voucher_type", - "fieldtype": "Link", + "fieldtype": "Data", "in_list_view": 1, - "label": "Voucher Type", - "options": "DocType" + "label": "Voucher Type" }, { "fieldname": "voucher_name", - "fieldtype": "Dynamic Link", + "fieldtype": "Data", "in_list_view": 1, - "label": "Voucher Name", - "options": "voucher_type" + "label": "Voucher Name" }, { "fieldname": "taxable_amount", @@ -36,7 +34,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-03-27 13:10:52.307012", + "modified": "2025-02-05 16:39:14.863698", "modified_by": "Administrator", "module": "Accounts", "name": "Tax Withheld Vouchers", diff --git a/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.py b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.py index bc2003e2bea..dbb69a2e769 100644 --- a/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.py +++ b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.py @@ -18,8 +18,8 @@ class TaxWithheldVouchers(Document): parentfield: DF.Data parenttype: DF.Data taxable_amount: DF.Currency - voucher_name: DF.DynamicLink | None - voucher_type: DF.Link | None + voucher_name: DF.Data | None + voucher_type: DF.Data | None # end: auto-generated types pass From 6275b44a0bdc016d6ed492475cf474c0e94e7a89 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Thu, 13 Feb 2025 14:56:11 +0530 Subject: [PATCH 03/69] fix: auto allocation for negative amount outstanding for Customers in Payment Entry --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 5f56743167d..735a80f9645 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -1952,7 +1952,7 @@ class PaymentEntry(AccountsController): allocated_positive_outstanding = paid_amount + allocated_negative_outstanding - elif self.party_type in ("Supplier", "Employee"): + elif self.party_type in ("Supplier", "Customer"): if paid_amount > total_negative_outstanding: if total_negative_outstanding == 0: frappe.msgprint( From 876082ea2ffba15a631ed9ff484a38bbbe79dc14 Mon Sep 17 00:00:00 2001 From: venkat102 Date: Thu, 13 Feb 2025 23:05:34 +0530 Subject: [PATCH 04/69] fix(project settings): add checkbox to auto fetch timesheet in sales invoice --- .../doctype/projects_settings/projects_settings.json | 12 ++++++++++-- .../doctype/projects_settings/projects_settings.py | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/erpnext/projects/doctype/projects_settings/projects_settings.json b/erpnext/projects/doctype/projects_settings/projects_settings.json index 3284eaee61f..2c8abde4e90 100644 --- a/erpnext/projects/doctype/projects_settings/projects_settings.json +++ b/erpnext/projects/doctype/projects_settings/projects_settings.json @@ -8,7 +8,8 @@ "timesheet_sb", "ignore_workstation_time_overlap", "ignore_user_time_overlap", - "ignore_employee_time_overlap" + "ignore_employee_time_overlap", + "fetch_timesheet_in_sales_invoice" ], "fields": [ { @@ -33,11 +34,18 @@ "fieldname": "ignore_employee_time_overlap", "fieldtype": "Check", "label": "Ignore Employee Time Overlap" + }, + { + "default": "0", + "description": "Enabling the check box will fetch timesheet on select of a Project in Sales Invoice", + "fieldname": "fetch_timesheet_in_sales_invoice", + "fieldtype": "Check", + "label": "Fetch Timesheet in Sales Invoice" } ], "issingle": 1, "links": [], - "modified": "2024-03-27 13:10:21.984404", + "modified": "2025-02-13 23:01:27.321902", "modified_by": "Administrator", "module": "Projects", "name": "Projects Settings", diff --git a/erpnext/projects/doctype/projects_settings/projects_settings.py b/erpnext/projects/doctype/projects_settings/projects_settings.py index 9d940184d98..4b1530fee8e 100644 --- a/erpnext/projects/doctype/projects_settings/projects_settings.py +++ b/erpnext/projects/doctype/projects_settings/projects_settings.py @@ -14,6 +14,7 @@ class ProjectsSettings(Document): if TYPE_CHECKING: from frappe.types import DF + fetch_timesheet_in_sales_invoice: DF.Check ignore_employee_time_overlap: DF.Check ignore_user_time_overlap: DF.Check ignore_workstation_time_overlap: DF.Check From 914ad357fd4172e4f34c0b61ace65f04a1430ffb Mon Sep 17 00:00:00 2001 From: venkat102 Date: Thu, 13 Feb 2025 23:07:45 +0530 Subject: [PATCH 05/69] fix(sales invoice): check fetch_timesheet_in_sales_invoice enabled before fetching the timesheet --- .../doctype/sales_invoice/sales_invoice.js | 8 ++++++-- .../doctype/sales_invoice/sales_invoice.py | 15 ++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index ace2d3ef6a6..e5976dde7e8 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -895,8 +895,12 @@ frappe.ui.form.on("Sales Invoice", { project: function (frm) { if (frm.doc.project) { - frm.events.add_timesheet_data(frm, { - project: frm.doc.project, + frappe.db.get_value("Projects Settings", {}, "fetch_timesheet_in_sales_invoice", (r) => { + if (r.fetch_timesheet_in_sales_invoice) { + frm.events.add_timesheet_data(frm, { + project: frm.doc.project, + }); + } }); } }, diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 076c7221b8d..bda53967543 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -1096,16 +1096,17 @@ class SalesInvoice(SellingController): timesheet.billing_amount = ts_doc.total_billable_amount def update_timesheet_billing_for_project(self): - if self.timesheets: + if ( + not self.timesheets + and self.project + and frappe.db.get_single_value("Projects Settings", "fetch_timesheet_in_sales_invoice") + ): + self.add_timesheet_data() + else: self.calculate_billing_amount_for_timesheet() - @frappe.whitelist(methods=["PUT"]) + @frappe.whitelist() def add_timesheet_data(self): - if not self.timesheets and self.project: - self._add_timesheet_data() - self.save() - - def _add_timesheet_data(self): self.set("timesheets", []) if self.project: for data in get_projectwise_timesheet_data(self.project): From 43b13b91be8649addd9339de1b2257dd530e1f2f Mon Sep 17 00:00:00 2001 From: venkat102 Date: Thu, 13 Feb 2025 23:24:05 +0530 Subject: [PATCH 06/69] fix: check value as int --- erpnext/accounts/doctype/sales_invoice/sales_invoice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index e5976dde7e8..310ad992f6e 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -896,7 +896,7 @@ frappe.ui.form.on("Sales Invoice", { project: function (frm) { if (frm.doc.project) { frappe.db.get_value("Projects Settings", {}, "fetch_timesheet_in_sales_invoice", (r) => { - if (r.fetch_timesheet_in_sales_invoice) { + if (cint(r.fetch_timesheet_in_sales_invoice)) { frm.events.add_timesheet_data(frm, { project: frm.doc.project, }); From 03d515208a3eb3e1447d223aa42233a6cac42368 Mon Sep 17 00:00:00 2001 From: 0xD0M1M0 <76812428+0xD0M1M0@users.noreply.github.com> Date: Sat, 15 Feb 2025 21:23:05 +0100 Subject: [PATCH 07/69] fix: discount accounting --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 5f56743167d..656bb3da75d 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -3456,7 +3456,7 @@ def add_income_discount_loss(pe, doc, total_discount_percent) -> float: { "account": frappe.get_cached_value("Company", pe.company, "default_discount_account"), "cost_center": pe.cost_center or frappe.get_cached_value("Company", pe.company, "cost_center"), - "amount": flt(base_loss_on_income, precision), + "amount": flt(base_loss_on_income, precision) * -1, }, ) @@ -3490,7 +3490,7 @@ def add_tax_discount_loss(pe, doc, total_discount_percentage) -> float: "account": account, "cost_center": pe.cost_center or frappe.get_cached_value("Company", pe.company, "cost_center"), - "amount": flt(loss, precision), + "amount": flt(loss, precision) * -1, }, ) From 947a4fb0919997208e74ae662394257bbb10f912 Mon Sep 17 00:00:00 2001 From: 0xD0M1M0 <76812428+0xD0M1M0@users.noreply.github.com> Date: Sat, 15 Feb 2025 22:36:34 +0100 Subject: [PATCH 08/69] fix: only negative for "Pay" --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 656bb3da75d..da2741ed507 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -3450,13 +3450,14 @@ def add_income_discount_loss(pe, doc, total_discount_percent) -> float: """Add loss on income discount in base currency.""" precision = doc.precision("total") base_loss_on_income = doc.get("base_total") * (total_discount_percent / 100) + positive_negative = -1 if pe.payment_type == "Pay" else 1 pe.append( "deductions", { "account": frappe.get_cached_value("Company", pe.company, "default_discount_account"), "cost_center": pe.cost_center or frappe.get_cached_value("Company", pe.company, "cost_center"), - "amount": flt(base_loss_on_income, precision) * -1, + "amount": flt(base_loss_on_income, precision) * positive_negative, }, ) @@ -3468,6 +3469,7 @@ def add_tax_discount_loss(pe, doc, total_discount_percentage) -> float: tax_discount_loss = {} base_total_tax_loss = 0 precision = doc.precision("tax_amount_after_discount_amount", "taxes") + positive_negative = -1 if pe.payment_type == "Pay" else 1 # The same account head could be used more than once for tax in doc.get("taxes", []): @@ -3490,7 +3492,7 @@ def add_tax_discount_loss(pe, doc, total_discount_percentage) -> float: "account": account, "cost_center": pe.cost_center or frappe.get_cached_value("Company", pe.company, "cost_center"), - "amount": flt(loss, precision) * -1, + "amount": flt(loss, precision) * positive_negative, }, ) From 5880f1d5c6b542328c288fdb2ad27bf251c0a6fe Mon Sep 17 00:00:00 2001 From: venkat102 Date: Mon, 17 Feb 2025 14:49:32 +0530 Subject: [PATCH 09/69] fix: enable fetch_timesheet_in_sales_invoice in test --- erpnext/projects/doctype/timesheet/test_timesheet.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/projects/doctype/timesheet/test_timesheet.py b/erpnext/projects/doctype/timesheet/test_timesheet.py index cf95bd63680..311fe3da140 100644 --- a/erpnext/projects/doctype/timesheet/test_timesheet.py +++ b/erpnext/projects/doctype/timesheet/test_timesheet.py @@ -53,6 +53,7 @@ class TestTimesheet(IntegrationTestCase): self.assertEqual(item.qty, 2.00) self.assertEqual(item.rate, 50.00) + @IntegrationTestCase.change_settings("Projects Settings", {"fetch_timesheet_in_sales_invoice": 1}) def test_timesheet_billing_based_on_project(self): emp = make_employee("test_employee_6@salary.com") project = frappe.get_value("Project", {"project_name": "_Test Project"}) @@ -62,7 +63,7 @@ class TestTimesheet(IntegrationTestCase): ) sales_invoice = create_sales_invoice(do_not_save=True) sales_invoice.project = project - sales_invoice._add_timesheet_data() + sales_invoice.add_timesheet_data() sales_invoice.submit() ts = frappe.get_doc("Timesheet", timesheet.name) From 0fd0695bbbaec834bd120b4fdc93bc7142f60532 Mon Sep 17 00:00:00 2001 From: Ninad1306 Date: Tue, 18 Feb 2025 12:52:33 +0530 Subject: [PATCH 10/69] fix: set taxes before calculating taxes and totals --- erpnext/controllers/accounts_controller.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 93489231cf0..df8c33a0fb8 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -197,6 +197,14 @@ class AccountsController(TransactionBase): self.set_incoming_rate() self.init_internal_values() + # Need to set taxes based on taxes_and_charges template + # before calculating taxes and totals + if self.meta.get_field("taxes_and_charges"): + self.validate_enabled_taxes_and_charges() + self.validate_tax_account_company() + + self.set_taxes_and_charges() + if self.meta.get_field("currency"): self.calculate_taxes_and_totals() @@ -207,10 +215,6 @@ class AccountsController(TransactionBase): self.validate_all_documents_schedule() - if self.meta.get_field("taxes_and_charges"): - self.validate_enabled_taxes_and_charges() - self.validate_tax_account_company() - self.validate_party() self.validate_currency() self.validate_party_account_currency() @@ -255,8 +259,6 @@ class AccountsController(TransactionBase): self.validate_deferred_income_expense_account() self.set_inter_company_account() - self.set_taxes_and_charges() - if self.doctype == "Purchase Invoice": self.calculate_paid_amount() # apply tax withholding only if checked and applicable From 196ef7ac4e496785ac7fb5dbff2e13c9317071bc Mon Sep 17 00:00:00 2001 From: Ninad1306 Date: Tue, 18 Feb 2025 14:03:35 +0530 Subject: [PATCH 11/69] test: validate fetching of taxes based on taxes and charges template --- .../tests/test_accounts_controller.py | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/erpnext/controllers/tests/test_accounts_controller.py b/erpnext/controllers/tests/test_accounts_controller.py index 8c8191f2070..92e312c3df7 100644 --- a/erpnext/controllers/tests/test_accounts_controller.py +++ b/erpnext/controllers/tests/test_accounts_controller.py @@ -935,6 +935,35 @@ class TestAccountsController(IntegrationTestCase): self.assertEqual(exc_je_for_si, []) self.assertEqual(exc_je_for_pe, []) + @IntegrationTestCase.change_settings("Accounts Settings", {"add_taxes_from_item_tax_template": 1}) + def test_18_fetch_taxes_based_on_taxes_and_charges_template(self): + # Create a Sales Taxes and Charges Template + if not frappe.db.exists("Sales Taxes and Charges Template", "_Test Tax - _TC"): + doc = frappe.new_doc("Sales Taxes and Charges Template") + doc.company = self.company + doc.title = "_Test Tax" + doc.append( + "taxes", + { + "charge_type": "On Net Total", + "account_head": "Sales Expenses - _TC", + "description": "Test taxes", + "rate": 9, + }, + ) + doc.insert() + + # Create a Sales Invoice + sinv = frappe.new_doc("Sales Invoice") + sinv.customer = self.customer + sinv.company = self.company + sinv.currency = "INR" + sinv.taxes_and_charges = "_Test Tax - _TC" + sinv.append("items", {"item_code": "_Test Item", "qty": 1, "rate": 50}) + sinv.insert() + + self.assertEqual(sinv.total_taxes_and_charges, 4.5) + def test_20_journal_against_sales_invoice(self): # Invoice in Foreign Currency si = self.create_sales_invoice(qty=1, conversion_rate=80, rate=1) From 448a5db20f2959fd6ce809a8894d32c8345a76fc Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Wed, 19 Feb 2025 12:23:10 +0530 Subject: [PATCH 12/69] fix(send_message): escape HTML in the text Signed-off-by: Akhil Narang --- erpnext/templates/utils.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/templates/utils.py b/erpnext/templates/utils.py index 57750a56f6f..15af9f0f014 100644 --- a/erpnext/templates/utils.py +++ b/erpnext/templates/utils.py @@ -3,6 +3,7 @@ import frappe +from frappe.utils import escape_html @frappe.whitelist(allow_guest=True) @@ -11,6 +12,8 @@ def send_message(sender, message, subject="Website Query"): website_send_message(sender, message, subject) + message = escape_html(message) + lead = customer = None customer = frappe.db.sql( """select distinct dl.link_name from `tabDynamic Link` dl From a08bc6b913b932231abfd72ebf3acf82cf32288c Mon Sep 17 00:00:00 2001 From: Sanket322 Date: Wed, 19 Feb 2025 14:02:11 +0530 Subject: [PATCH 13/69] fix: use get_list to check permissions --- erpnext/selling/page/point_of_sale/point_of_sale.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.py b/erpnext/selling/page/point_of_sale/point_of_sale.py index b86a87983d5..7f758f4c8db 100644 --- a/erpnext/selling/page/point_of_sale/point_of_sale.py +++ b/erpnext/selling/page/point_of_sale/point_of_sale.py @@ -320,13 +320,13 @@ def get_past_order_list(search_term, status, limit=20): invoice_list = [] if search_term and status: - invoices_by_customer = frappe.db.get_all( + invoices_by_customer = frappe.db.get_list( "POS Invoice", filters={"customer": ["like", f"%{search_term}%"], "status": status}, fields=fields, page_length=limit, ) - invoices_by_name = frappe.db.get_all( + invoices_by_name = frappe.db.get_list( "POS Invoice", filters={"name": ["like", f"%{search_term}%"], "status": status}, fields=fields, @@ -335,7 +335,7 @@ def get_past_order_list(search_term, status, limit=20): invoice_list = invoices_by_customer + invoices_by_name elif status: - invoice_list = frappe.db.get_all( + invoice_list = frappe.db.get_list( "POS Invoice", filters={"status": status}, fields=fields, page_length=limit ) From 7f8d08c8eb50bc56ed3f051fbaf8eb0e33a91d27 Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Wed, 19 Feb 2025 16:02:01 +0530 Subject: [PATCH 14/69] fix: reset location only if there is value in row item location field --- erpnext/assets/doctype/asset/asset.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js index 9ed3c275697..e425908ca66 100644 --- a/erpnext/assets/doctype/asset/asset.js +++ b/erpnext/assets/doctype/asset/asset.js @@ -652,6 +652,9 @@ frappe.ui.form.on("Asset", { frm.set_value("purchase_amount", data.gross_purchase_amount); frm.set_value("asset_quantity", data.asset_quantity); frm.set_value("cost_center", data.cost_center); + if (data.asset_location) { + frm.set_value("location", data.asset_location); + } if (doctype === "Purchase Receipt") { frm.set_value("purchase_receipt_item", data.purchase_receipt_item); From df83e427a35886b5aa4b1207c0c2bdfcf18693b2 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 19 Feb 2025 16:02:39 +0530 Subject: [PATCH 15/69] fix: incorrect stock value difference for adjustment entry --- erpnext/stock/stock_ledger.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index 5fc317358ba..3a332ceaf16 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -884,6 +884,10 @@ class update_entries_after: if not sle.is_adjustment_entry: sle.stock_value_difference = stock_value_difference + elif sle.is_adjustment_entry and not self.args.get("sle_id"): + sle.stock_value_difference = get_stock_value_difference( + sle.item_code, sle.warehouse, sle.posting_date, sle.posting_time, sle.voucher_no + ) sle.doctype = "Stock Ledger Entry" frappe.get_doc(sle).db_update() From 78dedc0773490b65f7563f6b08f2922535537957 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Wed, 19 Feb 2025 18:50:18 +0530 Subject: [PATCH 16/69] fix: sync translations from crowdin (#45997) --- erpnext/locale/bs.po | 34 +++++++++++++++++----------------- erpnext/locale/fa.po | 36 ++++++++++++++++++------------------ erpnext/locale/sv.po | 4 ++-- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/erpnext/locale/bs.po b/erpnext/locale/bs.po index bbf8ea9a061..732f49346ca 100644 --- a/erpnext/locale/bs.po +++ b/erpnext/locale/bs.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: info@erpnext.com\n" "POT-Creation-Date: 2025-02-16 09:34+0000\n" -"PO-Revision-Date: 2025-02-18 00:18\n" +"PO-Revision-Date: 2025-02-19 00:43\n" "Last-Translator: info@erpnext.com\n" "Language-Team: Bosnian\n" "MIME-Version: 1.0\n" @@ -6199,7 +6199,7 @@ msgstr "Prilozi" #. 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "Attendance & Leaves" -msgstr "Prisustvo i odsustvo" +msgstr "Prisustvo & Odsustvo" #. Label of the attendance_device_id (Data) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json @@ -6928,7 +6928,7 @@ msgstr "Pretraživač Spiska Materijala" #. Name of a report #: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.json msgid "BOM Stock Calculated" -msgstr "Izračunata Zaliha Spiska Materijala" +msgstr "Obračunate Zalihe Spiska Materijala" #. Name of a report #. Label of a Link in the Manufacturing Workspace @@ -11621,7 +11621,7 @@ msgstr "Konsolidirana Kreditna Faktura" #: erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.json #: erpnext/accounts/workspace/financial_reports/financial_reports.json msgid "Consolidated Financial Statement" -msgstr "Konsolidovani Kinansijski Izveštaj" +msgstr "Konsolidovani Finansijski Izveštaj" #. Label of the consolidated_invoice (Link) field in DocType 'POS Invoice' #. Label of the consolidated_invoice (Link) field in DocType 'POS Invoice Merge @@ -15699,7 +15699,7 @@ msgstr "Izbriši" #. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json msgid "Delete Accounting and Stock Ledger Entries on deletion of Transaction" -msgstr "Izbrišite unose Knjigovodstva i Registra Yaliha pri brisanju Transakcije" +msgstr "Izbriši unose Knjigovodstva i Registra Zaliha pri brisanju Transakcije" #. Label of the delete_bin_data (Check) field in DocType 'Transaction Deletion #. Record' @@ -19369,7 +19369,7 @@ msgstr "Izađi iz Cijelog Ekrana" #. Label of the held_on (Date) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "Exit Interview Held On" -msgstr "Otpusni intervju održan" +msgstr "Otkazni Intervju Održan" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:154 #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:187 @@ -20166,7 +20166,7 @@ msgstr "Finansijski Pokazatelji" #. Name of a Workspace #: erpnext/accounts/workspace/financial_reports/financial_reports.json msgid "Financial Reports" -msgstr "Finansijski Izvještaji" +msgstr "Izvještaji" #: erpnext/setup/setup_wizard/data/industry_type.txt:24 msgid "Financial Services" @@ -24332,7 +24332,7 @@ msgstr "Individualni Knjigovodstveni Unos nemože se otkazati." #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:340 msgid "Individual Stock Ledger Entry cannot be cancelled." -msgstr "Pojedinačni Unos u Registar Yaliha nemože se otkazati." +msgstr "Pojedinačni Unos u Registar Zaliha nemože se otkazati." #. Label of the industry (Link) field in DocType 'Lead' #. Label of the industry (Link) field in DocType 'Opportunity' @@ -27945,7 +27945,7 @@ msgstr "Saznajte više o
When creating Manufacture Entry, raw-material items are backflushed based on BOM of production item. If you want raw-material items to be backflushed based on Material Transfer entry made against that Work Order instead, then you can set it under this field." @@ -55667,13 +55667,13 @@ msgstr "حمل کننده" #. 'Subcontracting Receipt' #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Transporter Details" -msgstr "جزئیات حمل و نقل" +msgstr "جزئیات حمل کننده" #. Label of the transporter_info (Section Break) field in DocType 'Delivery #. Note' #: erpnext/stock/doctype/delivery_note/delivery_note.json msgid "Transporter Info" -msgstr "اطلاعات حمل و نقل" +msgstr "اطلاعات حمل کننده" #. Label of the transporter_name (Data) field in DocType 'Delivery Note' #. Label of the transporter_name (Data) field in DocType 'Purchase Receipt' @@ -55683,7 +55683,7 @@ msgstr "اطلاعات حمل و نقل" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Transporter Name" -msgstr "نام حمل و نقل" +msgstr "نام حمل کننده" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:70 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:94 @@ -59270,7 +59270,7 @@ msgstr "از آنجایی که دستور کار بسته شده است، نمی #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:160 msgid "You can't process the serial number {0} as it has already been used in the SABB {1}. {2} if you want to inward same serial number multiple times then enabled 'Allow existing Serial No to be Manufactured/Received again' in the {3}" -msgstr "" +msgstr "شما نمی‌توانید شماره سریال {0} را پردازش کنید زیرا قبلاً در SABB {1} استفاده شده است. {2} اگر می‌خواهید همان شماره سریال را چندین بار دریافت کنید، گزینه 'اجازه دریافت/تولید مجدد شماره سریال موجود' را در {3} فعال کنید" #: erpnext/accounts/doctype/loyalty_program/loyalty_program.py:182 msgid "You can't redeem Loyalty Points having more value than the Rounded Total." @@ -59362,7 +59362,7 @@ msgstr "برای حفظ سطوح سفارش مجدد، باید سفارش مج #: erpnext/templates/pages/projects.html:134 msgid "You haven't created a {0} yet" -msgstr "شما هنوز یک {0} ایجاد نکرده اید" +msgstr "شما هنوز یک {0} ایجاد نکرده‌اید" #: erpnext/selling/page/point_of_sale/pos_controller.js:252 msgid "You must add atleast one item to save it as draft." diff --git a/erpnext/locale/sv.po b/erpnext/locale/sv.po index 520fbd5ee14..217828e0725 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: info@erpnext.com\n" "POT-Creation-Date: 2025-02-16 09:34+0000\n" -"PO-Revision-Date: 2025-02-18 00:18\n" +"PO-Revision-Date: 2025-02-19 00:43\n" "Last-Translator: info@erpnext.com\n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -11818,7 +11818,7 @@ msgstr "Kontakt Beskrivning" #: erpnext/selling/page/point_of_sale/pos_item_cart.js:857 msgid "Contact Details" -msgstr "Kontakt Uppgifter" +msgstr "Kontakt Detaljer" #. Label of the contact_email (Data) field in DocType 'Dunning' #. Label of the contact_email (Data) field in DocType 'POS Invoice' From cd4ba69262d7f99b54d5744b3b649bf345430175 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 20 Feb 2025 09:05:17 +0530 Subject: [PATCH 17/69] fix: inventory dimension for maintence visit --- .../doctype/inventory_dimension/inventory_dimension.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py index fe3006de971..0f202b44065 100644 --- a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py +++ b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py @@ -236,7 +236,12 @@ class InventoryDimension(Document): custom_fields[dt] = dimension_field filter_custom_fields = {} - ignore_doctypes = ["Serial and Batch Bundle", "Serial and Batch Entry", "Pick List Item"] + ignore_doctypes = [ + "Serial and Batch Bundle", + "Serial and Batch Entry", + "Pick List Item", + "Maintenance Visit Purpose", + ] if custom_fields: for doctype, fields in custom_fields.items(): From 746adfd057cb77cbc601da96dcd069b3bc50027a Mon Sep 17 00:00:00 2001 From: Sanket322 Date: Thu, 20 Feb 2025 11:33:53 +0530 Subject: [PATCH 18/69] refactor: add new line ragardless of postal code --- erpnext/regional/address_template/templates/united_states.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/regional/address_template/templates/united_states.html b/erpnext/regional/address_template/templates/united_states.html index 77fce46b9d7..f00f99c1299 100644 --- a/erpnext/regional/address_template/templates/united_states.html +++ b/erpnext/regional/address_template/templates/united_states.html @@ -1,4 +1,4 @@ {{ address_line1 }}
{% if address_line2 %}{{ address_line2 }}
{% endif -%} -{{ city }}, {% if state %}{{ state }}{% endif -%}{% if pincode %} {{ pincode }}
{% endif -%} +{{ city }}, {% if state %}{{ state }}{% endif -%}{% if pincode %} {{ pincode }}{% endif -%}
{% if country != "United States" %}{{ country }}{% endif -%} From 5e66231ca4e8dc93659f229843fd632181408ca9 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 20 Feb 2025 15:03:19 +0530 Subject: [PATCH 19/69] perf: replace if function in query --- erpnext/projects/doctype/project/project.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index 5706edcda63..417c73ec685 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -325,10 +325,10 @@ class Project(Document): # nosemgrep total_billed_amount = frappe.db.sql( """select sum(base_net_amount) - from `tabSales Invoice Item` si_item, `tabSales Invoice` si - where si_item.parent = si.name - and if(si_item.project, si_item.project, si.project) = %s - and si.docstatus=1""", + from `tabSales Invoice Item` si_item + join `tabSales Invoice` si on si_item.parent = si.name + where (si_item.project = %s or (si_item.project is null and si.project = %s)) + and si.docstatus = 1""", self.name, ) From 2f1e253e19109cd12d25a3e7d643344663bcf340 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Thu, 20 Feb 2025 15:28:13 +0530 Subject: [PATCH 20/69] fix: syntax error --- erpnext/projects/doctype/project/project.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index 417c73ec685..f9eace85147 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -327,9 +327,9 @@ class Project(Document): """select sum(base_net_amount) from `tabSales Invoice Item` si_item join `tabSales Invoice` si on si_item.parent = si.name - where (si_item.project = %s or (si_item.project is null and si.project = %s)) + where (si_item.project = %(name)s or (si_item.project is null and si.project = %(name)s)) and si.docstatus = 1""", - self.name, + {"name": self.name}, ) self.total_billed_amount = total_billed_amount and total_billed_amount[0][0] or 0 From a91fe5cbb312b8c18a970569d1ea7303b2d69be7 Mon Sep 17 00:00:00 2001 From: 0xD0M1M0 <76812428+0xD0M1M0@users.noreply.github.com> Date: Thu, 20 Feb 2025 17:12:21 +0100 Subject: [PATCH 21/69] feat: add testcase for discount_payment_entry --- .../payment_entry/test_payment_entry.py | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py index 4d48f10fcde..bb8cc15f1d4 100644 --- a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py @@ -291,6 +291,48 @@ class TestPaymentEntry(IntegrationTestCase): self.assertEqual(si.payment_schedule[0].paid_amount, 200.0) self.assertEqual(si.payment_schedule[1].paid_amount, 36.0) + def test_payment_entry_against_payment_terms_with_discount_on_pi(self): + pi = make_purchase_invoice(do_not_save=1) + create_payment_terms_template_with_discount() + pi.payment_terms_template = "Test Discount Template" + + frappe.db.set_value("Company", pi.company, "default_discount_account", "Write Off - _TC") + + pi.append( + "taxes", + { + "charge_type": "On Net Total", + "account_head": "_Test Account Service Tax - _TC", + "cost_center": "_Test Cost Center - _TC", + "description": "Service Tax", + "rate": 18, + }, + ) + pi.save() + pi.submit() + + frappe.db.set_single_value("Accounts Settings", "book_tax_discount_loss", 1) + pe_with_tax_loss = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Cash - _TC") + + self.assertEqual(pe_with_tax_loss.references[0].payment_term, "30 Credit Days with 10% Discount") + self.assertEqual(pe_with_tax_loss.payment_type, "Pay") + self.assertEqual(pe_with_tax_loss.references[0].allocated_amount, 295.0) + self.assertEqual(pe_with_tax_loss.paid_amount, 265.5) + self.assertEqual(pe_with_tax_loss.difference_amount, 0) + self.assertEqual(pe_with_tax_loss.deductions[0].amount, -25.0) # Loss on Income + self.assertEqual(pe_with_tax_loss.deductions[1].amount, -4.5) # Loss on Tax + self.assertEqual(pe_with_tax_loss.deductions[1].account, "_Test Account Service Tax - _TC") + + frappe.db.set_single_value("Accounts Settings", "book_tax_discount_loss", 0) + pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Cash - _TC") + + self.assertEqual(pe.references[0].payment_term, "30 Credit Days with 10% Discount") + self.assertEqual(pe.payment_type, "Pay") + self.assertEqual(pe.references[0].allocated_amount, 295.0) + self.assertEqual(pe.paid_amount, 265.5) + self.assertEqual(pe.deductions[0].amount, -29.5) + self.assertEqual(pe.difference_amount, 0) + def test_payment_entry_against_payment_terms_with_discount(self): si = create_sales_invoice(do_not_save=1, qty=1, rate=200) create_payment_terms_template_with_discount() From f7594e2ff99a1fbc4b320b7aa4372ea7389068cc Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Fri, 21 Feb 2025 11:02:38 +0530 Subject: [PATCH 22/69] fix: revamp logic (split parent and child) --- erpnext/projects/doctype/project/project.py | 28 +++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index f9eace85147..959b34f77a3 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -322,17 +322,31 @@ class Project(Document): self.total_sales_amount = total_sales_amount and total_sales_amount[0][0] or 0 def update_billed_amount(self): - # nosemgrep + self.total_billed_amount = self.get_billed_amount_from_parent() + self.get_billed_amount_from_child() + + def get_billed_amount_from_parent(self): total_billed_amount = frappe.db.sql( """select sum(base_net_amount) - from `tabSales Invoice Item` si_item - join `tabSales Invoice` si on si_item.parent = si.name - where (si_item.project = %(name)s or (si_item.project is null and si.project = %(name)s)) - and si.docstatus = 1""", - {"name": self.name}, + from `tabSales Invoice` si join `tabSales Invoice Item` si_item on si_item.parent = si.name + where si_item.project is null + and si.project is not null + and si.project = %s + and si.docstatus = 1""", + self.name, ) - self.total_billed_amount = total_billed_amount and total_billed_amount[0][0] or 0 + return total_billed_amount and total_billed_amount[0][0] or 0 + + def get_billed_amount_from_child(self): + total_billed_amount = frappe.db.sql( + """select sum(base_net_amount) + from `tabSales Invoice Item` + where project = %s + and docstatus = 1""", + self.name, + ) + + return total_billed_amount and total_billed_amount[0][0] or 0 def after_rename(self, old_name, new_name, merge=False): if old_name == self.copied_from: From 8e6959dfadec9cddce6e5d4d433b92c86074e0df Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Fri, 21 Feb 2025 17:50:51 +0530 Subject: [PATCH 23/69] fix: pos opening entry dialog not saving on change data (#46066) --- erpnext/selling/page/point_of_sale/pos_controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js index 644e4faa156..f8daabe3066 100644 --- a/erpnext/selling/page/point_of_sale/pos_controller.js +++ b/erpnext/selling/page/point_of_sale/pos_controller.js @@ -40,7 +40,7 @@ erpnext.PointOfSale.Controller = class { in_list_view: 1, label: __("Opening Amount"), options: "company:company_currency", - change: function () { + onchange: function () { dialog.fields_dict.balance_details.df.data.some((d) => { if (d.idx == this.doc.idx) { d.opening_amount = this.value; From da09c278c8869fa671bdcd1c4844d169b0bb085a Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Fri, 21 Feb 2025 19:08:12 +0530 Subject: [PATCH 24/69] fix: use valuation method from settings in stock ageing report --- .../stock/report/stock_ageing/stock_ageing.py | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py index cc597e14196..0edce832aec 100644 --- a/erpnext/stock/report/stock_ageing/stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/stock_ageing.py @@ -51,6 +51,10 @@ def format_report_data(filters: Filters, item_details: dict, to_date: str) -> li 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 + ) + row = [details.name, details.item_name, details.description, details.item_group, details.brand] if filters.get("show_warehouse_wise_stock"): @@ -72,6 +76,15 @@ 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): + if item_valuation_method == "Moving Average" or ( + not item_valuation_method + and frappe.db.get_single_value("Stock Settings", "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: @@ -267,7 +280,7 @@ class FIFOSlots: self.__update_balances(d, key) - # Note that stock_ledger_entries is an iterator, you can not reuse it like a list + # 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"): @@ -396,6 +409,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]["details"].valuation_rate = row.valuation_rate def __aggregate_details_by_item(self, wh_wise_data: dict) -> dict: "Aggregate Item-Wh wise data into single Item entry." @@ -437,8 +451,10 @@ class FIFOSlots: item.description, item.stock_uom, item.has_serial_no, + item.valuation_method, sle.actual_qty, sle.stock_value_difference, + sle.valuation_rate, sle.posting_date, sle.voucher_type, sle.voucher_no, @@ -506,7 +522,14 @@ class FIFOSlots: item_table = frappe.qb.DocType("Item") item = frappe.qb.from_("Item").select( - "name", "item_name", "description", "stock_uom", "brand", "item_group", "has_serial_no" + "name", + "item_name", + "description", + "stock_uom", + "brand", + "item_group", + "has_serial_no", + "valuation_method", ) if self.filters.get("item_code"): From 1ec182430dc61cd45ab3076fb5733a3a0c98d568 Mon Sep 17 00:00:00 2001 From: Ravibharathi <131471282+ravibharathi656@users.noreply.github.com> Date: Fri, 21 Feb 2025 19:45:21 +0530 Subject: [PATCH 25/69] feat: add total weight in shipment (#46049) Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com> --- erpnext/stock/doctype/shipment/shipment.json | 9 ++++++++- erpnext/stock/doctype/shipment/shipment.py | 8 ++++++++ erpnext/stock/doctype/shipment/test_shipment.py | 11 +++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/shipment/shipment.json b/erpnext/stock/doctype/shipment/shipment.json index e3df2148d4f..9d7882f7094 100644 --- a/erpnext/stock/doctype/shipment/shipment.json +++ b/erpnext/stock/doctype/shipment/shipment.json @@ -34,6 +34,7 @@ "shipment_parcel", "parcel_template", "add_template", + "total_weight", "column_break_28", "shipment_delivery_note", "shipment_details_section", @@ -429,11 +430,17 @@ "label": "Pickup Contact Person", "mandatory_depends_on": "eval:doc.pickup_from_type === 'Company'", "options": "User" + }, + { + "fieldname": "total_weight", + "fieldtype": "Float", + "label": "Total Weight (kg)", + "read_only": 1 } ], "is_submittable": 1, "links": [], - "modified": "2024-03-27 13:10:41.030764", + "modified": "2025-02-20 16:55:20.076418", "modified_by": "Administrator", "module": "Stock", "name": "Shipment", diff --git a/erpnext/stock/doctype/shipment/shipment.py b/erpnext/stock/doctype/shipment/shipment.py index 346e70e6060..cf9d165fdd3 100644 --- a/erpnext/stock/doctype/shipment/shipment.py +++ b/erpnext/stock/doctype/shipment/shipment.py @@ -65,6 +65,7 @@ class Shipment(Document): shipment_parcel: DF.Table[ShipmentParcel] shipment_type: DF.Literal["Goods", "Documents"] status: DF.Literal["Draft", "Submitted", "Booked", "Cancelled", "Completed"] + total_weight: DF.Float tracking_status: DF.Literal["", "In Progress", "Delivered", "Returned", "Lost"] tracking_status_info: DF.Data | None tracking_url: DF.SmallText | None @@ -75,6 +76,7 @@ class Shipment(Document): self.validate_weight() self.validate_pickup_time() self.set_value_of_goods() + self.set_total_weight() if self.docstatus == 0: self.status = "Draft" @@ -93,6 +95,12 @@ class Shipment(Document): if flt(parcel.weight) <= 0: frappe.throw(_("Parcel weight cannot be 0")) + def set_total_weight(self): + self.total_weight = self.get_total_weight() + + def get_total_weight(self): + return sum(flt(parcel.weight) * parcel.count for parcel in self.shipment_parcel if parcel.count > 0) + def validate_pickup_time(self): if self.pickup_from and self.pickup_to and get_time(self.pickup_to) < get_time(self.pickup_from): frappe.throw(_("Pickup To time should be greater than Pickup From time")) diff --git a/erpnext/stock/doctype/shipment/test_shipment.py b/erpnext/stock/doctype/shipment/test_shipment.py index 197f6f8342d..57ac126c222 100644 --- a/erpnext/stock/doctype/shipment/test_shipment.py +++ b/erpnext/stock/doctype/shipment/test_shipment.py @@ -29,6 +29,17 @@ class TestShipment(IntegrationTestCase): self.assertEqual(len(second_shipment.shipment_delivery_note), 1) self.assertEqual(second_shipment.shipment_delivery_note[0].delivery_note, delivery_note.name) + def test_get_total_weight(self): + shipment = frappe.new_doc("Shipment") + shipment.extend( + "shipment_parcel", + [ + {"length": 5, "width": 5, "height": 5, "weight": 5, "count": 5}, + {"length": 5, "width": 5, "height": 5, "weight": 10, "count": 1}, + ], + ) + self.assertEqual(shipment.get_total_weight(), 35) + def create_test_delivery_note(): company = get_shipment_company() From 987a95d2b5e20773059845f283ca102aa6491ab2 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Sun, 23 Feb 2025 15:08:54 +0530 Subject: [PATCH 26/69] fix: sync translations from crowdin (#46036) * fix: Persian translations * fix: Bosnian translations * fix: Turkish translations * fix: Persian translations * fix: Bosnian translations --- erpnext/locale/bs.po | 442 +++++++++++++++++++++---------------------- erpnext/locale/fa.po | 256 ++++++++++++------------- erpnext/locale/tr.po | 8 +- 3 files changed, 353 insertions(+), 353 deletions(-) diff --git a/erpnext/locale/bs.po b/erpnext/locale/bs.po index 732f49346ca..9506c86b4b2 100644 --- a/erpnext/locale/bs.po +++ b/erpnext/locale/bs.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: info@erpnext.com\n" "POT-Creation-Date: 2025-02-16 09:34+0000\n" -"PO-Revision-Date: 2025-02-19 00:43\n" +"PO-Revision-Date: 2025-02-23 02:28\n" "Last-Translator: info@erpnext.com\n" "Language-Team: Bosnian\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "Iznos" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:114 msgid " BOM" -msgstr "Lista Materijala" +msgstr " Sastavnica" #. Label of the istable (Check) field in DocType 'Inventory Dimension' #: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json @@ -1197,7 +1197,7 @@ msgstr "Prema CEFACT/ICG/2010/IC013 ili CEFACT/ICG/2010/IC010" #: erpnext/stock/doctype/stock_entry/stock_entry.py:765 msgid "According to the BOM {0}, the Item '{1}' is missing in the stock entry." -msgstr "Prema Spisku Materijala {0}, artikal '{1}' nedostaje u unosu zaliha." +msgstr "Prema Sastavnici {0}, artikal '{1}' nedostaje u unosu zaliha." #. Name of a DocType #. Label of the account (Link) field in DocType 'Account Closing Balance' @@ -3829,7 +3829,7 @@ msgstr "Sve Aktivnosti HTML" #: erpnext/manufacturing/doctype/bom/bom.py:303 msgid "All BOMs" -msgstr "Svi Spiskovi Materijala" +msgstr "Sve Sastavnice" #. Option for the 'Send To' (Select) field in DocType 'SMS Center' #: erpnext/selling/doctype/sms_center/sms_center.json @@ -3996,7 +3996,7 @@ msgstr "Svi komentari i e-pošta kopirat će se iz jednog dokumenta u drugi novo #: erpnext/manufacturing/doctype/work_order/work_order.js:1072 msgid "All the required items (raw materials) will be fetched from BOM and populated in this table. Here you can also change the Source Warehouse for any item. And during the production, you can track transferred raw materials from this table." -msgstr "Svi obavezni Artikli (sirovine) bit će preuzeti iz Liste Materijala i popunjene u ovoj tabeli. Ovdje također možete promijeniti izvorno skladište za bilo koji artikal. A tokom proizvodnje možete pratiti prenesene sirovine iz ove tabele." +msgstr "Svi obavezni Artikli (sirovine) bit će preuzeti iz Sastavnice i popunjene u ovoj tabeli. Ovdje također možete promijeniti izvorno skladište za bilo koji artikal. A tokom proizvodnje možete pratiti prenesene sirovine iz ove tabele." #: erpnext/stock/doctype/delivery_note/delivery_note.py:821 msgid "All these items have already been Invoiced/Returned" @@ -4230,7 +4230,7 @@ msgstr "Dozvoli negativnu zalihu" #. 'Selling Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Allow Negative rates for Items" -msgstr "Dozvolite negativne cjene za Artikle" +msgstr "Dozvolite negativne cijene za Artikle" #. Label of the allow_or_restrict (Select) field in DocType 'Accounting #. Dimension Filter' @@ -5233,13 +5233,13 @@ msgstr "Primijeni popust na" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.py:189 #: erpnext/accounts/doctype/pricing_rule/pricing_rule.py:198 msgid "Apply Discount on Discounted Rate" -msgstr "Primijenite popust na sniženu cjenu" +msgstr "Primijenite popust na sniženu cijenu" #. Label of the apply_discount_on_rate (Check) field in DocType 'Promotional #. Scheme Price Discount' #: erpnext/accounts/doctype/promotional_scheme_price_discount/promotional_scheme_price_discount.json msgid "Apply Discount on Rate" -msgstr "Primijenite popust na cjenu" +msgstr "Primijeni Popust na Cijenu" #. Label of the apply_multiple_pricing_rules (Check) field in DocType 'Pricing #. Rule' @@ -5733,7 +5733,7 @@ msgstr "Održavanje Imovine" #: erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json #: erpnext/assets/workspace/assets/assets.json msgid "Asset Maintenance Log" -msgstr "Dnevnik Održavanja Imovine" +msgstr "Zapisnik Održavanja Imovine" #. Name of a DocType #: erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json @@ -6676,7 +6676,7 @@ msgstr "Prosječni Popust" #: erpnext/accounts/report/share_balance/share_balance.py:60 msgid "Average Rate" -msgstr "Prosječna Cjena" +msgstr "Prosječna Cijena" #. Label of the avg_response_time (Duration) field in DocType 'Issue' #: erpnext/support/doctype/issue/issue.json @@ -6695,23 +6695,23 @@ msgstr "Prosječna Dnevna Isporuka" #. Label of the avg_rate (Float) field in DocType 'Serial and Batch Bundle' #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json msgid "Avg Rate" -msgstr "Prosječna Cjena" +msgstr "Prosječna Cijena" #: erpnext/stock/report/stock_ledger/stock_ledger.py:287 msgid "Avg Rate (Balance Stock)" -msgstr "Prosječna Cjena (Stanje Zaliha)" +msgstr "Prosječna Cijena (Stanje Zaliha)" #: erpnext/stock/report/item_variant_details/item_variant_details.py:96 msgid "Avg. Buying Price List Rate" -msgstr "Prosječna Kupovna Cjena Cjenovnika" +msgstr "Prosječna Kupovna Cijena Cijenovnika" #: erpnext/stock/report/item_variant_details/item_variant_details.py:102 msgid "Avg. Selling Price List Rate" -msgstr "Prosječna Prodajna Cjena Cjenovnika" +msgstr "Prosječna Prodajna Cijena Cijenovnika" #: erpnext/accounts/report/gross_profit/gross_profit.py:316 msgid "Avg. Selling Rate" -msgstr "Prosječna Prodajna Cjena" +msgstr "Prosječna Prodajna Cijena" #. Option for the 'Blood Group' (Select) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json @@ -6772,30 +6772,30 @@ msgstr "Skladišna Količina" #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json msgid "BOM" -msgstr "Lista Materijala" +msgstr "Sastavnica" #: erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:21 msgid "BOM 1" -msgstr "Lista Materijala 1" +msgstr "Sastavnica 1" #: erpnext/manufacturing/doctype/bom/bom.py:1501 msgid "BOM 1 {0} and BOM 2 {1} should not be same" -msgstr "Lista Materijala 1 {0} i Lista Materijala 2 {1} ne bi trebali biti isti" +msgstr "Sastavnica 1 {0} i Sastavnica 2 {1} ne bi trebali biti isti" #: erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:38 msgid "BOM 2" -msgstr "Lista Materijala 2" +msgstr "Sastavnica 2" #. Label of a Link in the Manufacturing Workspace #: erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:4 #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json msgid "BOM Comparison Tool" -msgstr "Alat za poređenje Spiskova Materijala" +msgstr "Alat Poređenja Sastavnica" #. Label of the bom_created (Check) field in DocType 'BOM Creator Item' #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json msgid "BOM Created" -msgstr "Lista Materijala Kreirana" +msgstr "Sastavnica Kreirana" #. Label of the bom_creator (Link) field in DocType 'BOM' #. Name of a DocType @@ -6804,14 +6804,14 @@ msgstr "Lista Materijala Kreirana" #: erpnext/manufacturing/doctype/bom_creator/bom_creator.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json msgid "BOM Creator" -msgstr "Tvorac Spiska Materijala" +msgstr "Konstruktor Sastavnice" #. Label of the bom_creator_item (Data) field in DocType 'BOM' #. Name of a DocType #: erpnext/manufacturing/doctype/bom/bom.json #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json msgid "BOM Creator Item" -msgstr "Artikal Lista Materijala Konstruktora" +msgstr "Artikal Sastavnice Konstruktora" #. Label of the bom_detail_no (Data) field in DocType 'Purchase Order Item #. Supplied' @@ -6826,32 +6826,32 @@ msgstr "Artikal Lista Materijala Konstruktora" #: erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json #: erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json msgid "BOM Detail No" -msgstr "Lista Materijala Detalj Broj" +msgstr "Broj Detalja Sastavnice" #. Name of a report #: erpnext/manufacturing/report/bom_explorer/bom_explorer.json msgid "BOM Explorer" -msgstr "Istraživač Spiska Materijala" +msgstr "Istraživač Sastavnice" #. Name of a DocType #: erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json msgid "BOM Explosion Item" -msgstr "Lista Materijala Rastavljenih Artikala" +msgstr "Nestavljeni Artikli Sastavnice" #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.js:20 #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py:101 msgid "BOM ID" -msgstr "ID Liste Materijala" +msgstr "Sastavnica" #. 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 "Info Liste Materijala" +msgstr "Informacija Sastavnice" #. Name of a DocType #: erpnext/manufacturing/doctype/bom_item/bom_item.json msgid "BOM Item" -msgstr "Artikal Spiska Materijala" +msgstr "Artikal Sastavnice" #: erpnext/manufacturing/report/bom_explorer/bom_explorer.py:60 #: erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py:175 @@ -6879,44 +6879,44 @@ msgstr "Nivo Spiska Materijala" #: erpnext/stock/doctype/stock_entry/stock_entry.json #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "BOM No" -msgstr "Broj Liste Materijala" +msgstr "Broj Sastavnice" #. Label of the bom_no (Link) field in DocType 'Work Order Operation' #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "BOM No (For Semi-Finished Goods)" -msgstr "Broj Spiska Materijala ( za poluproizvod)" +msgstr "Broj Sastavnice ( za poluproizvod)" #. Description of the 'BOM No' (Link) field in DocType 'Stock Entry Detail' #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "BOM No. for a Finished Good Item" -msgstr "Broj Spiska Materijala (za gotov proizvod)" +msgstr "Broj Sastavnice (za gotov proizvod)" #. Name of a DocType #. Label of the operations (Table) field in DocType 'Routing' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json #: erpnext/manufacturing/doctype/routing/routing.json msgid "BOM Operation" -msgstr "Operacija Liste Materijala " +msgstr "Operacija Sastavnice" #. Name of a report #. Label of a Link in the Manufacturing Workspace #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json msgid "BOM Operations Time" -msgstr "Operativno Vrijeme Liste Materijala " +msgstr "Operativno Vrijeme Sastavnice" #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:27 msgid "BOM Qty" -msgstr "Količina Spiska Materijala" +msgstr "Količina Sastavnice" #: erpnext/stock/report/item_prices/item_prices.py:60 msgid "BOM Rate" -msgstr "Cijena Liste Materijala" +msgstr "Cijena Sastavnice" #. Name of a DocType #: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json msgid "BOM Scrap Item" -msgstr "Otpadni Artikal Spiska Materijala" +msgstr "Otpadni Artikal Sastavnice" #. Label of a Link in the Manufacturing Workspace #. Name of a report @@ -6928,7 +6928,7 @@ msgstr "Pretraživač Spiska Materijala" #. Name of a report #: erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.json msgid "BOM Stock Calculated" -msgstr "Obračunate Zalihe Spiska Materijala" +msgstr "Obračunate Zalihe Sastavnice" #. Name of a report #. Label of a Link in the Manufacturing Workspace @@ -6937,69 +6937,69 @@ msgstr "Obračunate Zalihe Spiska Materijala" #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json msgid "BOM Stock Report" -msgstr "Izvještaj Zaliha Spiska Materijala" +msgstr "Izvještaj Zaliha Sastavnice" #. Label of the tab_2_tab (Tab Break) field in DocType 'BOM Creator' #: erpnext/manufacturing/doctype/bom_creator/bom_creator.json msgid "BOM Tree" -msgstr "Stablo Liste Materijala" +msgstr "Stablo Sastavnice" #: erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py:28 msgid "BOM UoM" -msgstr "Jedinica Liste Materijala " +msgstr "Jedinica Sastavnice" #. Name of a DocType #: erpnext/manufacturing/doctype/bom_update_batch/bom_update_batch.json msgid "BOM Update Batch" -msgstr "Lista Materijala Ažurira Šaržu" +msgstr "Sastavnica Ažurira Šaržu" #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js:84 msgid "BOM Update Initiated" -msgstr "Pokrenuto Ažuriranje Spiska Materijala" +msgstr "Pokrenuto Ažuriranje Sastavnice" #. Name of a DocType #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json msgid "BOM Update Log" -msgstr "Zapisnik Ažuriranja Liste Materijala" +msgstr "Zapisnik Ažuriranja Sastavnice" #. Name of a DocType #. Label of a Link in the Manufacturing Workspace #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json msgid "BOM Update Tool" -msgstr "Alat za ažuriranje Spiska Materijala" +msgstr "Alat za ažuriranje Sastavnice" #. Description of a DocType #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json msgid "BOM Update Tool Log with job status maintained" -msgstr "Zapisnik Alata Ažuriranja Liste Materijala sa očuvanim statusom posla" +msgstr "Zapisnik Alata Ažuriranja Sastavnice sa očuvanim statusom posla" #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:99 msgid "BOM Updation already in progress. Please wait until {0} is complete." -msgstr "Ažuriranje Spiska Matarijala je već u toku. Molimo pričekajte dok {0} ne završi." +msgstr "Ažuriranje Sastavnica je već u toku. Pričekaj dok {0} ne završi." #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js:81 msgid "BOM Updation is queued and may take a few minutes. Check {0} for progress." -msgstr "Ažuriranje Liste Materijala je na čekanju i može potrajati nekoliko minuta. Provjeri {0} za napredak." +msgstr "Ažuriranje Sastavnice je na čekanju i može potrajati nekoliko minuta. Provjeri {0} za napredak." #. Name of a report #: erpnext/manufacturing/report/bom_variance_report/bom_variance_report.json msgid "BOM Variance Report" -msgstr "Izvještaj Odstupanju Liste Materijala" +msgstr "Izvještaj Odstupanju Sastavnice" #. Name of a DocType #: erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json msgid "BOM Website Item" -msgstr "Artikal Web Stranice Liste Materijala " +msgstr "Artikal Web Stranice Sastavnice" #. Name of a DocType #: erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json msgid "BOM Website Operation" -msgstr "Operacija Web Stranice Liste Materijala " +msgstr "Operacija Web Stranice Sastavnice" #: erpnext/stock/doctype/stock_entry/stock_entry.js:1193 msgid "BOM and Manufacturing Quantity are required" -msgstr "Lista Materijala i Količina za Proizvodnju su obavezni" +msgstr "Sastavnica i Količina za Proizvodnju su obavezni" #. Label of the bom_and_work_order_tab (Tab Break) field in DocType #. 'Manufacturing Settings' @@ -7010,19 +7010,19 @@ msgstr "Lista Materijala i Proizvodnja" #: erpnext/stock/doctype/material_request/material_request.js:349 #: erpnext/stock/doctype/stock_entry/stock_entry.js:682 msgid "BOM does not contain any stock item" -msgstr "Lista Materijala ne sadrži nijedan artikal zaliha" +msgstr "Sastavnica ne sadrži nijedan artikal zaliha" #: erpnext/manufacturing/doctype/bom_update_log/bom_updation_utils.py:85 msgid "BOM recursion: {0} cannot be child of {1}" -msgstr "Lista Materijala rekurzija: {0} ne može biti podređena {1}" +msgstr "Rekurzija Sastavnice: {0} ne može biti podređena {1}" #: erpnext/manufacturing/doctype/bom/bom.py:667 msgid "BOM recursion: {1} cannot be parent or child of {0}" -msgstr "Lista Materijala rekurzija: {1} ne može biti nadređena ili podređena {0}" +msgstr "Rekurzija Sastavnice: {1} ne može biti nadređena ili podređena {0}" #: erpnext/manufacturing/doctype/bom/bom.py:1314 msgid "BOM {0} does not belong to Item {1}" -msgstr "Lista Materijala {0} ne pripada artiklu {1}" +msgstr "Sastavnica {0} ne pripada Artiklu {1}" #: erpnext/manufacturing/doctype/bom/bom.py:1296 msgid "BOM {0} must be active" @@ -7030,28 +7030,28 @@ msgstr "Lista Materijala {0} mora biti aktivana" #: erpnext/manufacturing/doctype/bom/bom.py:1299 msgid "BOM {0} must be submitted" -msgstr "Lista Materijala {0} se mora poodnijeti" +msgstr "Sastavnica {0} se mora podnijeti" #: erpnext/manufacturing/doctype/bom/bom.py:716 msgid "BOM {0} not found for the item {1}" -msgstr "Lista Materijala {0} nije pronađena za artikal {1}" +msgstr "Sastavnica {0} nije pronađena za artikal {1}" #. Label of the boms_updated (Long Text) field in DocType 'BOM Update Batch' #: erpnext/manufacturing/doctype/bom_update_batch/bom_update_batch.json msgid "BOMs Updated" -msgstr "Spiskovi Materijala Ažurirani" +msgstr "Sastavnice Ažurirane" #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:267 msgid "BOMs created successfully" -msgstr "Spiskovi Materijala su uspješno kreirani" +msgstr "Sastavnice su uspješno kreirane" #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:277 msgid "BOMs creation failed" -msgstr "Kreiranje Spiskova Materijala nije uspjelo" +msgstr "Kreiranje Sastavnica nije uspjelo" #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:224 msgid "BOMs creation has been enqueued, kindly check the status after some time" -msgstr "Kreiranje Spiskova Materijala je u redu, molimo provjerite status nakon nekog vremena" +msgstr "Kreiranje Sastavnica je u redu, provjeri status nakon nekog vremena" #: erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py:337 msgid "Backdated Stock Entry" @@ -7551,12 +7551,12 @@ msgstr "Osnovni Trošak po Jedinici" #. Label of the base_hour_rate (Currency) field in DocType 'BOM Operation' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json msgid "Base Hour Rate(Company Currency)" -msgstr "Osnovna Cjena po Satu (Valuta Kompanije)" +msgstr "Osnovna Cijena po Satu (Valuta Kompanije)" #. Label of the base_rate (Currency) field in DocType 'BOM Creator Item' #: erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json msgid "Base Rate" -msgstr "Osnovna Cjena" +msgstr "Osnovna Cijena" #. Label of the base_tax_withholding_net_total (Currency) field in DocType #. 'Purchase Invoice' @@ -7640,7 +7640,7 @@ msgstr "Na osnovu Uslova Plaćanja" #. 'Subscription Plan' #: erpnext/accounts/doctype/subscription_plan/subscription_plan.json msgid "Based On Price List" -msgstr "Na osnovu Cjenovnika" +msgstr "Na osnovu Cijenovnika" #. Label of the based_on_value (Dynamic Link) field in DocType 'Party Specific #. Item' @@ -7650,11 +7650,11 @@ msgstr "Na osnovu Vrijednosti" #: erpnext/setup/doctype/holiday_list/holiday_list.js:60 msgid "Based on your HR Policy, select your leave allocation period's end date" -msgstr "Na osnovu vaše politike ljudskih resursa, odaberite datum završetka perioda raspodjele odmora" +msgstr "Na osnovu vaših pravila ljudskih resursa, odaberi datum završetka perioda raspodjele odmora" #: erpnext/setup/doctype/holiday_list/holiday_list.js:55 msgid "Based on your HR Policy, select your leave allocation period's start date" -msgstr "Na osnovu vaše politike ljudskih resursa, odaberite datum početka perioda raspodjele odmora" +msgstr "Na osnovu vaših pravila ljudskih resursa, odaberite datum početka perioda raspodjele odmora" #. Label of the basic_amount (Currency) field in DocType 'Stock Entry Detail' #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json @@ -7673,12 +7673,12 @@ msgstr "Osnovni Iznos (Valuta Kompanije)" #: erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json msgid "Basic Rate (Company Currency)" -msgstr "Osnovna Cjena(Valuta Kompanije)" +msgstr "Osnovna Cijena(Valuta Kompanije)" #. Label of the basic_rate (Currency) field in DocType 'Stock Entry Detail' #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "Basic Rate (as per Stock UOM)" -msgstr "Osnovna Cjena (prema Jedinici Zaliha)" +msgstr "Osnovna Cijena (prema Jedinici Zaliha)" #. Name of a DocType #. Label of a Link in the Stock Workspace @@ -8119,7 +8119,7 @@ msgstr "Faktura Interval u Planu pretplate mora biti Mjesec koji prati kalendars #: erpnext/projects/doctype/activity_cost/activity_cost.json #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.json msgid "Billing Rate" -msgstr "Faktura Cjena" +msgstr "Faktura Cijena" #. Label of the billing_state (Data) field in DocType 'Tax Rule' #: erpnext/accounts/doctype/tax_rule/tax_rule.json @@ -8238,7 +8238,7 @@ msgstr "Ugovorni Nalog Artikal" #: erpnext/selling/doctype/quotation_item/quotation_item.json #: erpnext/selling/doctype/sales_order_item/sales_order_item.json msgid "Blanket Order Rate" -msgstr "Ugovorni Nalog Cjena" +msgstr "Ugovorni Nalog Cijena" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:105 #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:251 @@ -8295,7 +8295,7 @@ msgstr "Pomoć za Sadržaj i Završni Tekst" #. Item' #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json msgid "Bom No" -msgstr "Broj Spiska Matrijala" +msgstr "Broj Sastavnice" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:284 msgid "Book Advance Payments as Liability option is chosen. Paid From account changed from {0} to {1}." @@ -8514,7 +8514,7 @@ msgstr "Brokerske usluge" #: erpnext/manufacturing/doctype/bom/bom.js:143 msgid "Browse BOM" -msgstr "Pregledaj Listu Materijala" +msgstr "Pretraži Sastavnicu" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json @@ -8725,11 +8725,11 @@ msgstr "Kupovinski Iznos" #: erpnext/stock/report/item_price_stock/item_price_stock.py:40 msgid "Buying Price List" -msgstr "Kupovni Cjenovnik" +msgstr "Kupovni Cijenovnik" #: erpnext/stock/report/item_price_stock/item_price_stock.py:46 msgid "Buying Rate" -msgstr "Kupovna Cjena" +msgstr "Kupovna Cijena" #. Name of a DocType #. Label of a Link in the Buying Workspace @@ -8956,7 +8956,7 @@ msgstr "Sažetak Poziva" #: erpnext/public/js/call_popup/call_popup.js:186 msgid "Call Summary Saved" -msgstr "Sažetak poziva je sačuvan" +msgstr "Sažetak Poziva Spremljen" #. Label of the call_type (Data) field in DocType 'Telephony Call Type' #: erpnext/telephony/doctype/telephony_call_type/telephony_call_type.json @@ -9312,7 +9312,7 @@ msgstr "Nije moguće otkazati jer postoji podnešeni Unos Zaliha {0}" #: erpnext/stock/stock_ledger.py:200 msgid "Cannot cancel the transaction. Reposting of item valuation on submission is not completed yet." -msgstr "Nije moguće otkazati transakciju. Ponovno knjićenje procjene vrijednosti artikla prilikom podnošenja još nije završeno." +msgstr "Nije moguće otkazati transakciju. Ponovno knjiženje procjene vrijednosti artikla prilikom podnošenja još nije završeno." #: erpnext/controllers/buying_controller.py:880 msgid "Cannot cancel this document as it is linked with submitted asset {0}. Please cancel it to continue." @@ -9328,7 +9328,7 @@ msgstr "Nije moguće promijeniti atribute nakon transakcije zaliha. Napravi novi #: erpnext/accounts/doctype/fiscal_year/fiscal_year.py:49 msgid "Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved." -msgstr "Ne može se promijeniti datum početka i datum završetka fiskalne godine kada se fiskalna godina sačuva." +msgstr "Ne može se promijeniti datum početka i datum završetka fiskalne godine kada se fiskalna godina spremi." #: erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py:73 msgid "Cannot change Reference Document Type." @@ -9381,7 +9381,7 @@ msgstr "Nije moguće kreirati knjigovodstvene unose za onemogućene račune: {0} #: erpnext/manufacturing/doctype/bom/bom.py:1026 msgid "Cannot deactivate or cancel BOM as it is linked with other BOMs" -msgstr "Lista Materijala nemože se deaktivirati ili otkazati jer je povezana sa drugim Listama Materijala" +msgstr "Sastavnica se nemože deaktivirati ili otkazati jer je povezana sa drugim Sastavnicama" #: erpnext/crm/doctype/opportunity/opportunity.py:277 msgid "Cannot declare as lost, because Quotation has been made." @@ -10196,7 +10196,7 @@ msgstr "Brisanje Demo Podataka..." #: erpnext/manufacturing/doctype/production_plan/production_plan.js:606 msgid "Click on 'Get Finished Goods for Manufacture' to fetch the items from the above Sales Orders. Items only for which a BOM is present will be fetched." -msgstr "Kliknite na 'Preuzmite Gotov Artikal za Proizvodnju' da preuzmete artikle iz gornjih Prodajnih Naloga. Preuzet će se samo artikli za koje postoji Lista Materijala." +msgstr "Kliknite na 'Preuzmite Gotov Artikal za Proizvodnju' da preuzmete artikle iz gornjih Prodajnih Naloga. Preuzet će se samo artikli za koje postoji Sastavnica." #: erpnext/setup/doctype/holiday_list/holiday_list.js:70 msgid "Click on Add to Holidays. This will populate the holidays table with all the dates that fall on the selected weekly off. Repeat the process for populating the dates for all your weekly holidays" @@ -11501,7 +11501,7 @@ msgstr "Konfiguriši akciju za zaustavljanje transakcije ili samo upozorite ako #: erpnext/buying/doctype/buying_settings/buying_settings.js:20 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 Cjenovnik prilikom kreiranja nove transakcije Kupovine. Cijene artikala se preuzimaju iz ovog Cjenovnika." +msgstr "Konfiguriši standard Cijenovnik prilikom kreiranja nove transakcije Kupovine. Cijene artikala se preuzimaju iz ovog Cijenovnika." #. Label of the final_confirmation_date (Date) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json @@ -12589,7 +12589,7 @@ msgstr "Detalji Troškova" #: erpnext/projects/doctype/activity_cost/activity_cost.json #: erpnext/projects/doctype/timesheet_detail/timesheet_detail.json msgid "Costing Rate" -msgstr "Cjena" +msgstr "Cijena" #. Label of the project_details (Section Break) field in DocType 'Project' #: erpnext/projects/doctype/project/project.json @@ -12668,7 +12668,7 @@ msgstr "Brojanje" #: erpnext/stock/doctype/manufacturer/manufacturer.json #: erpnext/stock/doctype/price_list_country/price_list_country.json msgid "Country" -msgstr "Država" +msgstr "Zemlja" #: erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py:419 msgid "Country Code in File does not match with country code set up in the system" @@ -12949,7 +12949,7 @@ msgstr "Kreiraj Stranku koja nedostaje" #: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:163 msgid "Create Multi-level BOM" -msgstr "Kreiraj višeslojnu Listu Materijala" +msgstr "Kreiraj višeslojnu Sastavnicu" #: erpnext/public/js/call_popup/call_popup.js:122 msgid "Create New Contact" @@ -13665,7 +13665,7 @@ msgstr "Devizni Kurs mora biti primjenjiv za Kupovinu ili Prodaju." #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json msgid "Currency and Price List" -msgstr "Valuta i Cjenovnik" +msgstr "Valuta i Cijenovnik" #: erpnext/accounts/doctype/account/account.py:309 msgid "Currency can not be changed after making entries using some other currency" @@ -13683,11 +13683,11 @@ msgstr "Valuta Računa za Zatvaranje mora biti {0}" #: erpnext/manufacturing/doctype/bom/bom.py:611 msgid "Currency of the price list {0} must be {1} or {2}" -msgstr "Valuta cjenovnika {0} mora biti {1} ili {2}" +msgstr "Valuta cijenovnika {0} mora biti {1} ili {2}" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.py:297 msgid "Currency should be same as Price List Currency: {0}" -msgstr "Valuta bi trebala biti ista kao Valuta Cjenovnika: {0}" +msgstr "Valuta bi trebala biti ista kao Valuta Cijenovnika: {0}" #. Label of the current_address (Small Text) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json @@ -13729,11 +13729,11 @@ msgstr "Trenutna Imovina" #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json msgid "Current BOM" -msgstr "Trenutna Lista Materijala" +msgstr "Trenutna Sastavnica" #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:77 msgid "Current BOM and New BOM can not be same" -msgstr "Trenutna Lista Matrijala i Nova Lista Matrijala ne mogu biti isti" +msgstr "Trenutna i Nova Sastavnica ne mogu biti iste" #. Label of the current_exchange_rate (Float) field in DocType 'Exchange Rate #. Revaluation Account' @@ -15130,23 +15130,23 @@ msgstr "Standard Račun za Predujam Plaćanje" #. Label of the default_bom (Link) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Default BOM" -msgstr "Standard Lista Matrijala" +msgstr "Standard Sastavnica" #: erpnext/stock/doctype/item/item.py:416 msgid "Default BOM ({0}) must be active for this item or its template" -msgstr "Standard Lista Materijala ({0}) mora biti aktivna za ovaj artikal ili njegov šablon" +msgstr "Standard Sastavnica ({0}) mora biti aktivna za ovaj artikal ili njegov šablon" #: erpnext/manufacturing/doctype/work_order/work_order.py:1657 msgid "Default BOM for {0} not found" -msgstr "Standard Lista Materijala {0} nije pronađena" +msgstr "Standard Sastavnica {0} nije pronađena" #: erpnext/controllers/accounts_controller.py:3565 msgid "Default BOM not found for FG Item {0}" -msgstr "Standard Lista Materijala nije pronađena za Artikal Gotovog Proizvoda {0}" +msgstr "Standard Sastavnica nije pronađena za Artikal Gotovog Proizvoda {0}" #: erpnext/manufacturing/doctype/work_order/work_order.py:1654 msgid "Default BOM not found for Item {0} and Project {1}" -msgstr "Standard Lista Materijala nije pronađena za Artikal {0} i Projekat {1}" +msgstr "Standard Sastavnica nije pronađena za Artikal {0} i Projekat {1}" #. Label of the default_bank_account (Link) field in DocType 'Company' #: erpnext/setup/doctype/company/company.json @@ -15156,7 +15156,7 @@ msgstr "Standard Bankovni Račun" #. Label of the billing_rate (Currency) field in DocType 'Activity Type' #: erpnext/projects/doctype/activity_type/activity_type.json msgid "Default Billing Rate" -msgstr "Standard Faktura Cjena" +msgstr "Standard Faktura Cijena" #. Label of the buying_cost_center (Link) field in DocType 'Item Default' #: erpnext/stock/doctype/item_default/item_default.json @@ -15169,7 +15169,7 @@ msgstr "Standard Kupovni Centar Troškova" #: erpnext/buying/doctype/buying_settings/buying_settings.json #: erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json msgid "Default Buying Price List" -msgstr "Standard Kupovni Cjenovnik" +msgstr "Standard Kupovni Cijenovnik" #. Label of the default_buying_terms (Link) field in DocType 'Company' #: erpnext/setup/doctype/company/company.json @@ -15369,7 +15369,7 @@ msgstr "Standard Šablon Uslova Plaćanja" #: erpnext/setup/doctype/customer_group/customer_group.json #: erpnext/stock/doctype/item_default/item_default.json msgid "Default Price List" -msgstr "Standard Cjenovnik" +msgstr "Standard Cijenovnik" #. Label of the default_priority (Link) field in DocType 'Service Level #. Agreement' @@ -16821,7 +16821,7 @@ msgstr "Onemogući U Riječima" #. Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Disable Last Purchase Rate" -msgstr "Onemogući posljednju Kupovnu Cjenu" +msgstr "Onemogući posljednju Kupovnu Cijenu" #. 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 "Popust (%)" #: erpnext/selling/doctype/sales_order_item/sales_order_item.json #: erpnext/stock/doctype/delivery_note_item/delivery_note_item.json msgid "Discount (%) on Price List Rate with Margin" -msgstr "Popust (%) na cjenu Cjenovnika sa Maržom" +msgstr "Popust (%) na cjenu Cijenovnika sa Maržom" #. Label of the additional_discount_account (Link) field in DocType 'Sales #. Invoice' @@ -17168,7 +17168,7 @@ msgstr "Popust na" #: erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json msgid "Discount on Price List Rate (%)" -msgstr "Popust na Cjenu Cjenovnika (%)" +msgstr "Popust na Cijenu Cijenovnika (%)" #. Label of the discounted_amount (Currency) field in DocType 'Overdue Payment' #. Label of the discounted_amount (Currency) field in DocType 'Payment @@ -17458,7 +17458,7 @@ msgstr "Želiš li podnijeti Materijalni Zahtjev" #. Record Details' #: erpnext/accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json msgid "DocField" -msgstr "DocField" +msgstr "Dokument Polje" #. Label of the doctype_name (Link) field in DocType 'Transaction Deletion #. Record Details' @@ -18088,7 +18088,7 @@ msgstr "Uredi" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:499 msgid "Edit BOM" -msgstr "Uredi Listu Materijala" +msgstr "Uredi Sastavnicu" #: erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.html:37 msgid "Edit Capacity" @@ -18100,7 +18100,7 @@ msgstr "Uredi Korpu" #: erpnext/public/js/utils/serial_no_batch_selector.js:31 msgid "Edit Full Form" -msgstr "Uredi Puni Obrazac" +msgstr "Uredi Punu Formu" #: erpnext/controllers/item_variant.py:155 msgid "Edit Not Allowed" @@ -18153,7 +18153,7 @@ msgstr "Obrazovanje" #. 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "Educational Qualification" -msgstr "Obrazovna Kvalifikacija" +msgstr "Obrazovnje & Kvalifikacija" #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py:147 msgid "Either 'Selling' or 'Buying' must be selected" @@ -19931,7 +19931,7 @@ msgstr "Preuzmi Vrijednost od" #: erpnext/stock/doctype/material_request/material_request.js:335 #: erpnext/stock/doctype/stock_entry/stock_entry.js:653 msgid "Fetch exploded BOM (including sub-assemblies)" -msgstr "Pruzmi Rastavljenu Listu Materijala (uključujući podsklopove)" +msgstr "Pruzmi Neastavljenu Sastavnicu (uključujući podsklopove)" #. Description of the 'Get Items from Open Material Requests' (Button) field in #. DocType 'Purchase Order' @@ -20076,7 +20076,7 @@ msgstr "Nedostaju Filteri" #. Label of the bom_no (Link) field in DocType 'Job Card' #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "Final BOM" -msgstr "Finalna Lista Materijala" +msgstr "Finalna Sastavnica" #. Label of the details_tab (Tab Break) field in DocType 'BOM Creator' #. Label of the production_item (Link) field in DocType 'Job Card' @@ -20214,7 +20214,7 @@ msgstr "Gotov Proizvod" #. Label of the finished_good_bom (Link) field in DocType 'Subcontracting BOM' #: erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.json msgid "Finished Good BOM" -msgstr "Lista Materijala Gotovog Proizvoda" +msgstr "Sastavnica Gotovog Proizvoda" #. Label of the fg_item (Link) field in DocType 'Subcontracting Order Service #. Item' @@ -20268,7 +20268,7 @@ msgstr "Jedinica Gotovog Proizvoda" #: erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:51 msgid "Finished Good {0} does not have a default BOM." -msgstr "Gotov Proizvod {0} nema standard Listu Materijala." +msgstr "Gotov Proizvod {0} nema standard Sastavnicu." #: erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:46 msgid "Finished Good {0} is disabled." @@ -20454,7 +20454,7 @@ msgstr "Fiskalna Godina {0} je obavezna" #. Rule' #: erpnext/accounts/doctype/shipping_rule/shipping_rule.json msgid "Fixed" -msgstr "Fiksna Cjena" +msgstr "Fiksna Cijena" #. Option for the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json @@ -20502,7 +20502,7 @@ msgstr "Broj Fiksnog Depozita" #. 'Subscription Plan' #: erpnext/accounts/doctype/subscription_plan/subscription_plan.json msgid "Fixed Rate" -msgstr "Fiksna Cjena" +msgstr "Fiksna Cijena" #. Label of the fixed_time (Check) field in DocType 'BOM Operation' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json @@ -20641,7 +20641,7 @@ msgstr "Za Operaciju" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_price_discount/promotional_scheme_price_discount.json msgid "For Price List" -msgstr "Za Cjenovnik" +msgstr "Za Cijenovnik" #. Description of the 'Planned Quantity' (Float) field in DocType 'Sales Order #. Item' @@ -20748,7 +20748,7 @@ msgstr "Za praktičnost Klienta, ovi kodovi se mogu koristiti u formatima za isp #: erpnext/stock/doctype/stock_entry/stock_entry.py:756 msgid "For the item {0}, the quantity should be {1} according to the BOM {2}." -msgstr "Za artikal {0}, količina bi trebala biti {1} prema Spisku Materijala {2}." +msgstr "Za artikal {0}, količina bi trebala biti {1} prema Sastavnici {2}." #: erpnext/controllers/stock_controller.py:302 msgid "For the {0}, no stock is available for the return in the warehouse {1}." @@ -20913,7 +20913,7 @@ msgstr "Od" #. Label of the from_bom (Check) field in DocType 'Stock Entry' #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "From BOM" -msgstr "Iz Spiska Materijala" +msgstr "Iz Sastavnice" #. Label of the from_company (Data) field in DocType 'Warranty Claim' #: erpnext/support/doctype/warranty_claim/warranty_claim.json @@ -21810,7 +21810,7 @@ msgstr "Preuzmi Artikle iz Kupovnog Računa" #: erpnext/stock/doctype/stock_entry/stock_entry.js:656 #: erpnext/stock/doctype/stock_entry/stock_entry.js:669 msgid "Get Items from BOM" -msgstr "Preuzmi Artikle is Spiska Materijala" +msgstr "Preuzmi Artikle iz Sastavnice" #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:375 msgid "Get Items from Material Requests against this Supplier" @@ -23129,7 +23129,7 @@ msgstr "Ako je omogućeno, sistem će kreirati materijalne zahtjeve čak i ako z #. DocType 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "If enabled, the system will use the moving average valuation method to calculate the valuation rate for the batched items and will not consider the individual batch-wise incoming rate." -msgstr "Ako je omogućeno, sistem će koristiti metodu vrednovanja pokretnog prosjeka za izračunavanje stope vrednovanja za šaržne artikle i neće uzeti u obzir pojedinačnu dolaznu cjenu u paketu." +msgstr "Ako je omogućeno, sistem će koristiti metodu vrednovanja pokretnog prosjeka za izračunavanje stope vrednovanja za šaržne artikle i neće uzeti u obzir pojedinačnu dolaznu cijenu u paketu." #. Description of the 'Validate Applied Rule' (Check) field in DocType 'Pricing #. Rule' @@ -23171,7 +23171,7 @@ msgstr "Podugovoren s Proizvođačem" #: erpnext/manufacturing/doctype/work_order/work_order.js:1067 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected." -msgstr "Ako Lista Materijala rezultira otpadnim materijalom, potrebno je odabrati Skladište Otpada." +msgstr "Ako Sastavnica rezultira otpadnim materijalom, potrebno je odabrati Skladište Otpada." #. Description of the 'Frozen' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json @@ -23184,7 +23184,7 @@ msgstr "Ako se transakcije artikla vrši kao artikal nulte stope vrijednosti u o #: erpnext/manufacturing/doctype/work_order/work_order.js:1086 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed." -msgstr "Ako odabrana Lista Materijala ima Operacije spomenute u njoj, sistem će preuzeti sve operacije iz Liste Materijala, te vrijednosti se mogu promijeniti." +msgstr "Ako odabrana Sastavnica ima Operacije spomenute u njoj, sistem će preuzeti sve operacije iz nje, i te vrijednosti se mogu promijeniti." #. Description of the 'Catch All' (Link) field in DocType 'Communication #. Medium' @@ -23218,7 +23218,7 @@ msgstr "Ako je ovo označeno, naredne nove fakture će se kreirati na datume po #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json msgid "If this is unchecked Journal Entries will be saved in a Draft state and will have to be submitted manually" -msgstr "Ako ovo nije označeno, Nalozi Knjiženja će biti sačuvani u stanju Nacrta i morat će se podnijeti ručno" +msgstr "Ako ovo nije označeno, Nalozi Knjiženja će biti spremljeni u stanju Nacrta i morat će se podnijeti ručno" #. Description of the 'Book Deferred Entries Via Journal Entry' (Check) field #. in DocType 'Accounts Settings' @@ -23249,7 +23249,7 @@ msgstr "Ako je označeno, više materijala se može koristiti za jedan Radni Nal #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:36 msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials." -msgstr "Ako je označeno, trošak Liste Materijala će se automatski ažurirati na osnovu Stope Vrednovanja / Cijene Cjenovnika / posljednje kupovne cijene sirovina." +msgstr "Ako je označeno, trošak Sastavnice će se automatski ažurirati na osnovu Stope Vrednovanja / Cijene Cijenovnika / posljednje kupovne cijene sirovina." #: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14 msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0." @@ -23393,7 +23393,7 @@ msgstr "Zanemari Pravilo Cijena" #: erpnext/selling/page/point_of_sale/pos_payment.js:192 msgid "Ignore Pricing Rule is enabled. Cannot apply coupon code." -msgstr "Zanemari Cjenovnik je omogućen. Nije moguće primijeniti na kupone." +msgstr "Zanemari da je Pravilnik Cijena omogućen. Nije moguće primijeniti kod kupona." #. Label of the ignore_cr_dr_notes (Check) field in DocType 'Process Statement #. Of Accounts' @@ -23555,7 +23555,7 @@ msgstr "Partner Implementacije" #: erpnext/edi/doctype/code_list/code_list_import.js:43 #: erpnext/edi/doctype/code_list/code_list_import.js:111 msgid "Import" -msgstr "Import" +msgstr "Uvoz" #. Description of a DocType #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.json @@ -23596,7 +23596,7 @@ msgstr "Importiraj Fakture" #. Statement Import' #: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json msgid "Import Log" -msgstr "Import Zapisnik" +msgstr "Zapisnik Uvoza" #. Label of the import_log_preview (HTML) field in DocType 'Bank Statement #. Import' @@ -23824,13 +23824,13 @@ msgstr "U Riječima (Valuta Kompanije)" #. Description of the 'In Words' (Data) field in DocType 'Delivery Note' #: erpnext/stock/doctype/delivery_note/delivery_note.json msgid "In Words (Export) will be visible once you save the Delivery Note." -msgstr "U Riječima (Eksport) će biti vidljivo nakon što sačuvate Dostavnicu." +msgstr "U Riječima (Eksport) će biti vidljivo nakon što spremite Dostavnicu." #. Description of the 'In Words (Company Currency)' (Data) field in DocType #. 'Delivery Note' #: erpnext/stock/doctype/delivery_note/delivery_note.json msgid "In Words will be visible once you save the Delivery Note." -msgstr "U Riječima će biti vidljivo nakon što sačuvate Dostavnicu." +msgstr "U Riječima će biti vidljivo nakon što spremite Dostavnicu." #. Description of the 'In Words (Company Currency)' (Data) field in DocType #. 'POS Invoice' @@ -23839,13 +23839,13 @@ msgstr "U Riječima će biti vidljivo nakon što sačuvate Dostavnicu." #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json msgid "In Words will be visible once you save the Sales Invoice." -msgstr "Riječimaće biti vidljivo nakon što sačuvate Prodajnu Fakturu." +msgstr "Riječimaće biti vidljivo nakon što spremite Prodajnu Fakturu." #. Description of the 'In Words (Company Currency)' (Data) field in DocType #. 'Sales Order' #: erpnext/selling/doctype/sales_order/sales_order.json msgid "In Words will be visible once you save the Sales Order." -msgstr "Rijwčima će biti vidljivo nakon što sačuvate Prodajni Nalog." +msgstr "Riječima će biti vidljivo nakon što spremite Prodajni Nalog." #. Description of the 'Completed Time' (Data) field in DocType 'Job Card #. Operation' @@ -23875,7 +23875,7 @@ msgstr "U slučaju višeslojnog programa, klijenti će biti automatski raspoređ #: erpnext/stock/doctype/item/item.js:980 msgid "In this section, you can define Company-wide transaction-related defaults for this Item. Eg. Default Warehouse, Default Price List, Supplier, etc." -msgstr "U ovooj sekciji možete definirati zadane postavke transakcije koje se odnose na cijelu kompaniju za ovaj artikal. Npr. Standard Skladište, Standard Cjenovnik, Dobavljač itd." +msgstr "U ovoj sekciji možete definirati zadane postavke transakcije koje se odnose na cijelu kompaniju za ovaj artikal. Npr. Standard Skladište, Standard Cijenovnik, Dobavljač itd." #. Option for the 'Status' (Select) field in DocType 'Contract' #. Option for the 'Status' (Select) field in DocType 'Employee' @@ -24158,7 +24158,7 @@ msgstr "Postavke Dolaznog Poziva" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:193 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:96 msgid "Incoming Rate" -msgstr "Kupovna Cjena" +msgstr "Kupovna Cijena" #. Label of the incoming_rate (Currency) field in DocType 'Sales Invoice Item' #: erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -24211,7 +24211,7 @@ msgstr "Netaöan referentni dokument (Artikal Kupovnog Naloga)" #. Name of a report #: erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.json msgid "Incorrect Serial No Valuation" -msgstr "Neispravna Procjena Serijskog Broja" +msgstr "Netačno Vrijednovanje Serijskog Broja" #: erpnext/controllers/subcontracting_controller.py:865 msgid "Incorrect Serial Number Consumed" @@ -25644,7 +25644,7 @@ msgstr "Pretplata" #: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json #: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json msgid "Is this Tax included in Basic Rate?" -msgstr "PDV uključen u osnovnu cjenu?" +msgstr "PDV uključen u Osnovnu Cijenu?" #. Option for the 'Transfer Type' (Select) field in DocType 'Share Transfer' #. Option for the 'Status' (Select) field in DocType 'Asset' @@ -26605,11 +26605,11 @@ msgstr "Cijena Artikla na Zalihama" #: erpnext/stock/get_item_details.py:1036 msgid "Item Price added for {0} in Price List {1}" -msgstr "Cijena Artikla je dodana za {0} u Cjenovniku {1}" +msgstr "Cijena Artikla je dodana za {0} u Cijenovnik {1}" #: 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." -msgstr "Cijena Artikla se pojavljuje više puta na osnovu Cjenovnika, Dobavljača/Klijenta, Valute, Artikla, Šarže, Jedinice, Količine i Datuma." +msgstr "Cijena Artikla se pojavljuje više puta na osnovu Cijenovnika, Dobavljača/Klijenta, Valute, Artikla, Šarže, Jedinice, Količine i Datuma." #: erpnext/stock/get_item_details.py:1018 msgid "Item Price updated for {0} in Price List {1}" @@ -28123,7 +28123,7 @@ msgstr "Nivo" #. Item' #: erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json msgid "Level (BOM)" -msgstr "Nivo (Lista Materijala)" +msgstr "Nivo (Sastavnica)" #. Label of the lft (Int) field in DocType 'Account' #. Label of the lft (Int) field in DocType 'Company' @@ -30817,7 +30817,7 @@ msgstr "Valuta" #: erpnext/manufacturing/doctype/bom_creator/bom_creator.js:41 msgid "Multi-level BOM Creator" -msgstr "Kreator Višeslojnog Spiska Materijala " +msgstr "Konstruktor Višeslojne Sastavnice" #: erpnext/selling/doctype/customer/customer.py:380 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually." @@ -31338,7 +31338,7 @@ msgstr "Nova Imovina (Ove Godine)" #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json msgid "New BOM" -msgstr "Nova Lista Materijala" +msgstr "Nova Sastavnica" #. Label of the new_balance_in_account_currency (Currency) field in DocType #. 'Exchange Rate Revaluation Account' @@ -31710,7 +31710,7 @@ msgstr "Nema knjigovodstvenih unosa za sljedeća skladišta" #: erpnext/selling/doctype/sales_order/sales_order.py:698 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured" -msgstr "Nije pronađena aktivna Lista Materijla za artikal {0}. Ne može se osigurati isporuka Serijskim Brojem" +msgstr "Nije pronađena aktivna Sastavnica za artikal {0}. Ne može se osigurati isporuka na osnovu serijskog broja" #: erpnext/stock/doctype/item_variant_settings/item_variant_settings.js:46 msgid "No additional fields available" @@ -32675,11 +32675,11 @@ msgstr "Otvorene HTML Aktivnosti" #: erpnext/manufacturing/doctype/bom/bom_item_preview.html:21 msgid "Open BOM {0}" -msgstr "Otvori Listu Materijala {0}" +msgstr "Otvori Sastavnicu {0}" #: erpnext/public/js/templates/call_link.html:11 msgid "Open Call Log" -msgstr "Otvori Zapise Poziva" +msgstr "Otvori Zapis Poziva" #: erpnext/public/js/call_popup/call_popup.js:116 msgid "Open Contact" @@ -32941,11 +32941,11 @@ msgstr "Operativni Trošak (Valuta Kompanije)" #. 'BOM' #: erpnext/manufacturing/doctype/bom/bom.json msgid "Operating Cost Per BOM Quantity" -msgstr "Operativni trošak po količini Liste Materijala" +msgstr "Operativni trošak po količini Sastavnice" #: erpnext/manufacturing/doctype/bom/bom.py:1418 msgid "Operating Cost as per Work Order / BOM" -msgstr "Operativni Trošak prema Radnom Nalogu / Listi Materijala" +msgstr "Operativni Trošak prema Radnom Nalogu / Sastavnici" #. Label of the base_operating_cost (Currency) field in DocType 'BOM Operation' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json @@ -33882,7 +33882,7 @@ msgstr "Artikal Kasa Fakture" #. Name of a DocType #: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json msgid "POS Invoice Merge Log" -msgstr "Zapisnik Spajanja Kasa Faktura" +msgstr "Zapisnik Spajanja Fakturi Kasa" #. Name of a DocType #: erpnext/accounts/doctype/pos_invoice_reference/pos_invoice_reference.json @@ -35320,7 +35320,7 @@ msgstr "Tip Zahtjeva Plaćanja" #. Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json msgid "Payment Request created from Sales Order or Purchase Order will be in Draft status. When disabled document will be in unsaved state." -msgstr "Platni Zahtjev je kreiran iz Prodajnog ili Kupovnog Naloga bit će u statusu Nacrta. Kada je onemogućen, dokument će biti u nesačuvanom stanju." +msgstr "Platni Nalog je kreiran iz Prodajnog ili Kupovnog Naloga bit će u statusu Nacrta. Kada je onemogućen, dokument će biti u nespremljnom stanju." #: erpnext/accounts/doctype/payment_request/payment_request.py:631 msgid "Payment Request for {0}" @@ -36718,7 +36718,7 @@ msgstr "Navedi broj obaveznih posjeta" #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:70 msgid "Please mention the Current and New BOM for replacement." -msgstr "Navedi Trenutnu i Novu Listu Materijala za zamjenu." +msgstr "Navedi Trenutnu i Novu Sastavnicu za zamjenu." #: erpnext/selling/doctype/installation_note/installation_note.py:120 msgid "Please pull items from Delivery Note" @@ -36735,11 +36735,11 @@ msgstr "Osvježi ili poništi Plaid vezu od Banke {}." #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:12 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:28 msgid "Please save before proceeding." -msgstr "Sačuvaj prije nego što nastaviš." +msgstr "Spremi prije nego što nastaviš." #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js:49 msgid "Please save first" -msgstr "Sačuvaj" +msgstr "Spremi" #: erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:79 msgid "Please select Template Type to download template" @@ -36756,7 +36756,7 @@ msgstr "Odaberi Listu Materijala uz artikal {0}" #: erpnext/manufacturing/doctype/production_plan/production_plan.py:171 msgid "Please select BOM for Item in Row {0}" -msgstr "Odaberi Listu Materijala za artikal u redu {0}" +msgstr "Odaberi Sastavnicu za artikal u redu {0}" #: erpnext/controllers/buying_controller.py:434 msgid "Please select BOM in BOM field for Item {0}" @@ -36862,7 +36862,7 @@ msgstr "Odaberi Račun Nerealizirane Dobiti/Gubitka ili postavi Standard Račun #: erpnext/manufacturing/doctype/bom/bom.py:1320 msgid "Please select a BOM" -msgstr "Odaberi Listu Materijala" +msgstr "Odaberi Sastavnicu" #: erpnext/accounts/party.py:391 msgid "Please select a Company" @@ -37265,7 +37265,7 @@ msgstr "Postavi {0} za adresu {1}" #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:209 msgid "Please set {0} in BOM Creator {1}" -msgstr "Postavi {0} u Kreatoru Liste Materijala {1}" +msgstr "Postavi {0} u Konstruktoru Sastavnice {1}" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:1192 msgid "Please set {0} in Company {1} to account for Exchange Gain / Loss" @@ -37346,12 +37346,12 @@ msgstr "Kasa Profil" #. Label of the policy_no (Data) field in DocType 'Vehicle' #: erpnext/setup/doctype/vehicle/vehicle.json msgid "Policy No" -msgstr "Broj Police" +msgstr "Broj Police Osiguranja" #. Label of the policy_number (Data) field in DocType 'Asset' #: erpnext/assets/doctype/asset/asset.json msgid "Policy number" -msgstr "Broj Police" +msgstr "Broj Police Osigurnja" #. Name of a UOM #: erpnext/setup/setup_wizard/data/uom_data.json @@ -37845,7 +37845,7 @@ msgstr "Tabele Popusta Cijena" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/stock/workspace/stock/stock.json msgid "Price List" -msgstr "Cjenovnik" +msgstr "Cijenovnik" #. Name of a DocType #: erpnext/stock/doctype/price_list_country/price_list_country.json @@ -37880,13 +37880,13 @@ msgstr "Valuta Cijenovnika" #: erpnext/stock/get_item_details.py:1204 msgid "Price List Currency not selected" -msgstr "Valuta Cjenovnika nije odabrana" +msgstr "Valuta Cijenovnika nije odabrana" #. Label of the price_list_defaults_section (Section Break) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Price List Defaults" -msgstr "Standard Cjenovnika" +msgstr "Standard Cijenovnika" #. Label of the plc_conversion_rate (Float) field in DocType 'POS Invoice' #. Label of the plc_conversion_rate (Float) field in DocType 'Purchase Invoice' @@ -37912,12 +37912,12 @@ msgstr "Standard Cjenovnika" #: erpnext/stock/doctype/delivery_note/delivery_note.json #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json msgid "Price List Exchange Rate" -msgstr "Devizni Kurs Cjenovnika" +msgstr "Devizni Kurs Cijenovnika" #. Label of the price_list_name (Data) field in DocType 'Price List' #: erpnext/stock/doctype/price_list/price_list.json msgid "Price List Name" -msgstr "Naziv Cjenovnika" +msgstr "Naziv Cijenovnika" #. Label of the price_list_rate (Currency) field in DocType 'POS Invoice Item' #. Label of the price_list_rate (Currency) field in DocType 'Purchase Invoice @@ -38296,7 +38296,7 @@ msgstr "Ispiši Obrasce IRS 1099" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Print Language" -msgstr "Jezik Ispisivanja" +msgstr "Jezik Ispisa" #. Label of the preferences (Section Break) field in DocType 'Process Statement #. Of Accounts' @@ -38612,7 +38612,7 @@ msgstr "Obrada u Jednoj Transakciji" #. 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" -msgstr "Obrađeni Spiskovi Materijala" +msgstr "Obrađene Sastavnice" #. Label of the processes (Table) field in DocType 'Quality Procedure' #: erpnext/quality_management/doctype/quality_procedure/quality_procedure.json @@ -39306,7 +39306,7 @@ msgstr "Promotivna Šema Id" #: erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json #: erpnext/accounts/doctype/promotional_scheme_price_discount/promotional_scheme_price_discount.json msgid "Promotional Scheme Price Discount" -msgstr "Popust u Cjeni Promotivne Šeme" +msgstr "Popust u Cijeni Promotivne Šeme" #. Label of the product_discount_slabs (Table) field in DocType 'Promotional #. Scheme' @@ -40192,7 +40192,7 @@ msgstr "Količina Nakon Transakcije" #. Plan Item' #: erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json msgid "Qty As Per BOM" -msgstr "Količina prema Spisku Materijala" +msgstr "Količina prema Sastavnici" #. Label of the actual_qty (Float) field in DocType 'Stock Closing Balance' #. Label of the actual_qty (Float) field in DocType 'Stock Ledger Entry' @@ -40771,7 +40771,7 @@ msgstr "Količina i Opis" #: erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json #: erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json msgid "Quantity and Rate" -msgstr "Količina i Cjena" +msgstr "Količina i Cijena" #. Label of the quantity_and_warehouse (Section Break) field in DocType #. 'Material Request Item' @@ -40929,7 +40929,7 @@ msgstr "Veličina Reda čekanja treba biti između 5 i 100" #: erpnext/stock/doctype/stock_closing_entry/stock_closing_entry.json #: erpnext/telephony/doctype/call_log/call_log.json msgid "Queued" -msgstr "U redu" +msgstr "U Redu" #: erpnext/accounts/doctype/journal_entry/journal_entry.js:58 msgid "Quick Entry" @@ -41190,7 +41190,7 @@ msgstr "Raspon" #: erpnext/templates/form_grid/item_grid.html:8 #: erpnext/templates/pages/order.html:100 erpnext/templates/pages/rfq.html:43 msgid "Rate" -msgstr "Cjena" +msgstr "Cijena" #. Label of the rate_amount_section (Section Break) field in DocType 'BOM Item' #: erpnext/manufacturing/doctype/bom_item/bom_item.json @@ -41319,7 +41319,7 @@ msgstr "Stopa po kojoj se Valuta Klijenta pretvara u osnovnu valutu klijenta" #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/stock/doctype/delivery_note/delivery_note.json msgid "Rate at which Price list currency is converted to company's base currency" -msgstr "Stopa po kojoj se Valuta Cjenovnika pretvara u osnovnu valutu kompanije" +msgstr "Stopa po kojoj se Valuta Cijenovnika pretvara u osnovnu valutu kompanije" #. Description of the 'Price List Exchange Rate' (Float) field in DocType 'POS #. Invoice' @@ -41394,7 +41394,7 @@ msgstr "Cijena Jedinice Zaliha" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/pricing_rule_detail/pricing_rule_detail.json msgid "Rate or Discount" -msgstr "Cjena ili Popust" +msgstr "Cijena ili Popust" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.py:183 msgid "Rate or Discount is required for the price discount." @@ -42855,14 +42855,14 @@ msgstr "Zamijeni" #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json msgid "Replace BOM" -msgstr "Zamijeni Listu Materijala" +msgstr "Zamijeni Sastavnicu" #. Description of a DocType #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json msgid "Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate \"BOM Explosion Item\" table as per new BOM.\n" "It also updates latest price in all the BOMs." -msgstr "Zamijeni određenu Listu Materijalau svim ostalim Listama Materijala gdje se koristi. Zamijenit će staru vezu Liste Materijala, ažurirati troškove i regenerirati tabelu \"Artikal Rastavljene Liste Materijala\" prema novoj Listi Materijala.\n" -"Također ažurira najnoviju cijenu u svim Listama Materijala." +msgstr "Zamijeni određenu Sastavnicu u svim ostalim Sastavnicama gdje se koristi. Zamijenit će staru vezu Sastavnice, ažurirati troškove i regenerirati tabelu \"Artikal Nestavljene Sastavnice\" prema novoj Sastavnici.\n" +"Također ažurira najnoviju cijenu u svim Sastavnicama." #. Option for the 'Status' (Select) field in DocType 'Lead' #. Option for the 'Status' (Select) field in DocType 'Opportunity' @@ -44316,7 +44316,7 @@ msgstr "Red #{0}: Imovina {1} se ne može podnijetii, već je {2}" #: erpnext/buying/doctype/purchase_order/purchase_order.py:350 msgid "Row #{0}: BOM is not specified for subcontracting item {0}" -msgstr "Red #{0}: Lista Materijala nije navedena za podizvođački artikal {0}" +msgstr "Red #{0}: Sastavnica nije navedena za podizvođački artikal {0}" #: erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py:313 msgid "Row #{0}: Batch No {1} is already selected." @@ -44396,7 +44396,7 @@ msgstr "Red #{0}: Datumi se preklapaju sa drugim redom" #: erpnext/buying/doctype/purchase_order/purchase_order.py:374 msgid "Row #{0}: Default BOM not found for FG Item {1}" -msgstr "Red #{0}: Standard Lista Materijala nije pronađena za gotov proizvod artikla {1}" +msgstr "Red #{0}: Standard Sastavnica nije pronađena za gotov proizvod artikla {1}" #: erpnext/accounts/doctype/payment_entry/payment_entry.py:332 msgid "Row #{0}: Duplicate entry in References {1} {2}" @@ -44856,7 +44856,7 @@ msgstr "Red {0}: Unos kredita ne može se povezati sa {1}" #: erpnext/manufacturing/doctype/bom/bom.py:466 msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}" -msgstr "Red {0}: Valuta Liste Materijala #{1} bi trebala biti jednaka odabranoj valuti {2}" +msgstr "Red {0}: Valuta Sastavnice #{1} bi trebala biti jednaka odabranoj valuti {2}" #: erpnext/accounts/doctype/journal_entry/journal_entry.py:711 msgid "Row {0}: Debit entry can not be linked with a {1}" @@ -44987,15 +44987,15 @@ msgstr "Red {0}: Navedi važeću referencu Artikla Dostavnice ili Pakiranog Arti #: erpnext/controllers/subcontracting_controller.py:145 msgid "Row {0}: Please select a BOM for Item {1}." -msgstr "Red {0}: Odaberi Listu materijala za artikal {1}." +msgstr "Red {0}: Odaberi Sastavnicu za artikal {1}." #: erpnext/controllers/subcontracting_controller.py:133 msgid "Row {0}: Please select an active BOM for Item {1}." -msgstr "Red {0}: Odaberi Aktivnu Listu Materijala za artikal {1}." +msgstr "Red {0}: Odaberi Aktivnu Sastavnicu za artikal {1}." #: erpnext/controllers/subcontracting_controller.py:139 msgid "Row {0}: Please select an valid BOM for Item {1}." -msgstr "Red {0}: Odaberi važeću Listu materijala za artikal{1}." +msgstr "Red {0}: Odaberi važeću Sastavnicu za artikal{1}." #: erpnext/regional/italy/utils.py:311 msgid "Row {0}: Please set at Tax Exemption Reason in Sales Taxes and Charges" @@ -45920,7 +45920,7 @@ msgstr "Prodaja po Fazama" #: erpnext/stock/report/item_prices/item_prices.py:58 msgid "Sales Price List" -msgstr "Prodajni Cjenovnik" +msgstr "Prodajni Cijenovnik" #. Name of a report #. Label of a Link in the Receivables Workspace @@ -46196,11 +46196,11 @@ msgstr "Subota" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:311 #: erpnext/public/js/call_popup/call_popup.js:169 msgid "Save" -msgstr "Sačuvaj" +msgstr "Spremi" #: erpnext/selling/page/point_of_sale/pos_controller.js:199 msgid "Save as Draft" -msgstr "Sačuvaj kao Nacrt" +msgstr "Spremi kao Nacrt" #: erpnext/templates/includes/order/order_taxes.html:34 #: erpnext/templates/includes/order/order_taxes.html:85 @@ -46329,28 +46329,28 @@ msgstr "Zapisi Planiranog Vremena" #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:233 #: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:623 msgid "Scheduler Inactive" -msgstr "Planer neaktivan" +msgstr "Raspoređivač Neaktivan" #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py:185 msgid "Scheduler is Inactive. Can't trigger job now." -msgstr "Planer je neaktivan. Sada nije moguće pokrenuti posao." +msgstr "Raspoređivač je neaktivan. Sada nije moguće pokrenuti posao." #: erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py:237 msgid "Scheduler is Inactive. Can't trigger jobs now." -msgstr "Planer je neaktivan. Sada nije moguće pokrenuti poslove." +msgstr "Raspoređivač je neaktivan. Sada nije moguće pokrenuti poslove." #: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:623 msgid "Scheduler is inactive. Cannot enqueue job." -msgstr "Planer je neaktivan. Nije moguće staviti posao u red čekanja." +msgstr "Raspoređivač je neaktivan. Nije moguće staviti posao u red čekanja." #: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py:84 #: erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:233 msgid "Scheduler is inactive. Cannot import data." -msgstr "Planer je neaktivan. Nije moguće uvesti podatke." +msgstr "Raspoređivač je neaktivan. Nije moguće uvesti podatke." #: erpnext/accounts/doctype/ledger_merge/ledger_merge.py:39 msgid "Scheduler is inactive. Cannot merge accounts." -msgstr "Planer je neaktivan. Nije moguće spojiti račune." +msgstr "Raspoređivač je neaktivan. Nije moguće spojiti račune." #. Label of the schedules (Table) field in DocType 'Maintenance Schedule' #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json @@ -46588,15 +46588,15 @@ msgstr "Odaberite Vrijednosti Atributa" #: erpnext/selling/doctype/sales_order/sales_order.js:849 msgid "Select BOM" -msgstr "Odaberi Listu Materijala" +msgstr "Odaberi Sastavnicu" #: erpnext/selling/doctype/sales_order/sales_order.js:836 msgid "Select BOM and Qty for Production" -msgstr "Odaberi Listu Materijala i Količinu za Proizvodnju" +msgstr "Odaberi Sastavnicu i Količinu za Proizvodnju" #: erpnext/selling/doctype/sales_order/sales_order.js:981 msgid "Select BOM, Qty and For Warehouse" -msgstr "Odaberi Listu Materijala, Količinu i Za Skladište" +msgstr "Odaberi Sastavnicu, Količinu Za Skladište" #: erpnext/public/js/utils/sales_common.js:386 #: erpnext/selling/page/point_of_sale/pos_item_details.js:221 @@ -46899,7 +46899,7 @@ msgstr "Odabrani Početni Unos Kase bi trebao biti otvoren." #: erpnext/accounts/doctype/sales_invoice/sales_invoice.py:2204 msgid "Selected Price List should have buying and selling fields checked." -msgstr "Odabrani Cjenovnik treba da ima označena polja za Kupovinu i Prodaju." +msgstr "Odabrani Cijenovnik treba da ima označena polja za Kupovinu i Prodaju." #: erpnext/stock/report/incorrect_serial_and_batch_bundle/incorrect_serial_and_batch_bundle.py:107 msgid "Selected Serial and Batch Bundle entries have been removed." @@ -46964,12 +46964,12 @@ msgstr "Prodajni Iznos" #: erpnext/stock/report/item_price_stock/item_price_stock.py:48 msgid "Selling Price List" -msgstr "Prodajni Cjenovnik" +msgstr "Prodajni Cijenovnik" #: erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py:36 #: erpnext/stock/report/item_price_stock/item_price_stock.py:54 msgid "Selling Rate" -msgstr "Prodajna Cjena" +msgstr "Prodajna Cijena" #. Name of a DocType #. Label of a Link in the Selling Workspace @@ -46999,7 +46999,7 @@ msgstr "Polugotov / Gotov Proizvod" #. Label of the semi_fg_bom (Link) field in DocType 'Job Card' #: erpnext/manufacturing/doctype/job_card/job_card.json msgid "Semi Finished Goods BOM" -msgstr "Lista Materijala Polugotovog Proizvoda" +msgstr "Sastavnica Polugotovog Proizvoda" #: erpnext/selling/page/point_of_sale/pos_past_order_summary.js:58 msgid "Send" @@ -47092,7 +47092,7 @@ msgstr "Šalje se" #: erpnext/templates/includes/footer/footer_extension.html:20 msgid "Sending..." -msgstr "Slanje..." +msgstr "Slanje u toku..." #. Label of the sent (Check) field in DocType 'Project Update' #: erpnext/projects/doctype/project_update/project_update.json @@ -47826,7 +47826,7 @@ msgstr "Postavi Predujam i Dodijeli (FIFO)" #. Detail' #: erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json msgid "Set Basic Rate Manually" -msgstr "Postavi osnovnu cjenu ručno" +msgstr "Postavi osnovnu cijenu ručno" #: erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:180 msgid "Set Default Supplier" @@ -47876,7 +47876,7 @@ msgstr "Postavi Operativni Trošak / Otpadne Artikle iz podsklopova" #. Operation' #: erpnext/manufacturing/doctype/bom_operation/bom_operation.json msgid "Set Operating Cost Based On BOM Quantity" -msgstr "Postavi Operativni Trošak na osnovu količine Liste Materijala" +msgstr "Postavi Operativni Trošak na osnovu količine Sastavnice" #: erpnext/manufacturing/doctype/bom_creator/bom_creator.py:88 msgid "Set Parent Row No in Items Table" @@ -48008,7 +48008,7 @@ msgstr "Postavi količinu artikla gubitka u procesa:" #. DocType 'BOM' #: erpnext/manufacturing/doctype/bom/bom.json msgid "Set rate of sub-assembly item based on BOM" -msgstr "Postavi cjenu artikla podsklopa na osnovu Spiska Materijala" +msgstr "Postavi cijenu artikla podsklopa na osnovu Sastavnice" #. Description of the 'Sales Person Targets' (Section Break) field in DocType #. 'Sales Person' @@ -49416,7 +49416,7 @@ msgstr "Početni položaj od gornje ivice" #: erpnext/public/js/utils/contact_address_quick_entry.js:84 #: erpnext/stock/doctype/warehouse/warehouse.json msgid "State" -msgstr "Država" +msgstr "Zemlja" #. Label of the status (Select) field in DocType 'Bank Statement Import' #. Label of the status (Select) field in DocType 'Bank Transaction' @@ -50540,7 +50540,7 @@ msgstr "Podprocedura" #: erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py:127 msgid "Sub-assembly BOM Count" -msgstr "Količina Liste Materijala Podsklopa" +msgstr "Količina Sastavnice Podsklopa" #: erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py:34 msgid "Sub-contracting" @@ -50558,7 +50558,7 @@ msgstr "Podizvođač" #. 'Purchase Receipt Item' #: erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json msgid "Subcontract BOM" -msgstr "Lista Materijala Podizvođača" +msgstr "Sastavnica Podizvođača" #: erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.js:36 #: erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.py:128 @@ -50630,7 +50630,7 @@ msgstr "Podizvođač" #: erpnext/manufacturing/workspace/manufacturing/manufacturing.json #: erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.json msgid "Subcontracting BOM" -msgstr "Lista Materijala Podizvođača" +msgstr "Sastavnica Podizvođača" #. Label of a Link in the Manufacturing Workspace #. Label of the subcontracting_order (Link) field in DocType 'Stock Entry' @@ -53086,7 +53086,7 @@ msgstr "Pristup zahtjevu za ponudu sa portala je onemogućen. Da biste omogućil #. Description of the 'Current BOM' (Link) field in DocType 'BOM Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json msgid "The BOM which will be replaced" -msgstr "Lista Materijala koja će biti zamijenjena" +msgstr "Sastavnica koja će biti zamijenjena" #: erpnext/stock/serial_batch_bundle.py:1259 msgid "The Batch {0} has negative quantity {1} in warehouse {2}. Please correct the quantity." @@ -53150,7 +53150,7 @@ msgstr "Serijski i Šaržni Paket {0} ne važi za ovu transakciju. 'Tip transakc #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:17 msgid "The Stock Entry of type 'Manufacture' is known as backflush. Raw materials being consumed to manufacture finished goods is known as backflushing.

When creating Manufacture Entry, raw-material items are backflushed based on BOM of production item. If you want raw-material items to be backflushed based on Material Transfer entry made against that Work Order instead, then you can set it under this field." -msgstr "Unos Zaliha tipa 'Proizvodnja' poznat je kao povrat. Sirovine koje se troše za proizvodnju gotovih proizvoda poznato je kao povrat.

Prilikom kreiranja unosa proizvodnje, artikli sirovina se vraćaju nazad na osnovu Liste Materijala proizvodne jedinice. Ako želite da se artikli sirovog materijala vraćaju natrag na osnovu unosa prijenosa materijala napravljenog prema tom radnom nalogu umjesto toga, možete ga postaviti ispod ovog polja." +msgstr "Unos Zaliha tipa 'Proizvodnja' poznat je kao povrat. Sirovine koje se troše za proizvodnju gotovih proizvoda poznato je kao povrat.

Prilikom kreiranja unosa proizvodnje, artikli sirovina se vraćaju nazad na osnovu Sastavnice proizvodne jedinice. Ako želite da se artikli sirovog materijala vraćaju natrag na osnovu unosa prijenosa materijala napravljenog prema tom radnom nalogu umjesto toga, možete ga postaviti ispod ovog polja." #: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "The Work Order is mandatory for Disassembly Order" @@ -53176,7 +53176,7 @@ msgstr "Valuta Fakture {} ({}) se razlikuje od valute ove Opomene ({})." #: erpnext/manufacturing/doctype/work_order/work_order.js:1027 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM." -msgstr "Sistem će preuzeti standard Listu materijal za Artikal. Također možete promijeniti Listu Materijala." +msgstr "Sistem će preuzeti standard Sastavnicu za Artikal. Također možete promijeniti Sastavnicu." #: erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.py:69 msgid "The difference between from time and To Time must be a multiple of Appointment" @@ -53268,7 +53268,7 @@ msgstr "Neto težina ovog paketa. (izračunava se automatski kao zbir neto teži #. Description of the 'New BOM' (Link) field in DocType 'BOM Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json msgid "The new BOM after replacement" -msgstr "Nova Lista Materijala nakon zamjene" +msgstr "Nova Sastavnica nakon zamjene" #: erpnext/accounts/doctype/share_transfer/share_transfer.py:196 msgid "The number of shares and the share numbers are inconsistent" @@ -53332,7 +53332,7 @@ msgstr "Kontna Klasa {0} mora biti grupa" #: erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py:84 msgid "The selected BOMs are not for the same item" -msgstr "Odabrane ListeMaterijala nisu za istu artikal" +msgstr "Odabrane Sastavnice nisu za istu artikal" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.py:432 msgid "The selected change account {} doesn't belongs to Company {}." @@ -53504,7 +53504,7 @@ msgstr "Već postoji važeći certifikat o nižem odbitku {0} za dobavljača {1} #: erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.py:77 msgid "There is already an active Subcontracting BOM {0} for the Finished Good {1}." -msgstr "Već postoji aktivna Podizvođačka Lista materijala {0} za gotov proizvod {1}." +msgstr "Već postoji aktivna Podizvođačka Sastavnica {0} za gotov proizvod {1}." #: erpnext/stock/doctype/batch/batch.py:408 msgid "There is no batch found against the {0}: {1}" @@ -53605,7 +53605,7 @@ msgstr "Ovaj filter će se primijeniti na Nalog Knjiženja." #: erpnext/manufacturing/doctype/bom/bom.js:219 msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}" -msgstr "Ovo je Šablon Liste Materijala i koristit će se za izradu Radnog Naloga za {0} artikal {1}" +msgstr "Ovo je Šablon Sastavnica i koristit će se za izradu Radnog Naloga za {0} artikal {1}" #. Description of the 'Target Warehouse' (Link) field in DocType 'Work Order' #: erpnext/manufacturing/doctype/work_order/work_order.json @@ -53686,7 +53686,7 @@ msgstr "Ovo je standard omogućeno. Ako želite da planirate materijale za podsk #: erpnext/stock/doctype/item/item.js:954 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 "Ovo se odnosi na artikle sirovina koje će se koristiti za izradu gotovog proizvoda. Ako je stavka dodatna usluga kao što je 'pranje' koja će se koristiti u Spisku Materijala, ne označite ovo." +msgstr "Ovo se odnosi na artikle sirovina koje će se koristiti za izradu gotovog proizvoda. Ako je artikal dodatna usluga kao što je 'povrat' koja će se koristiti u Sastavnici, ne označite ovo." #: erpnext/selling/doctype/party_specific_item/party_specific_item.py:35 msgid "This item filter has already been applied for the {0}" @@ -54487,7 +54487,7 @@ msgstr "Uključivanje artikala bez zaliha u planiranje zahtjeva materijala. tj. #. (Check) field in DocType 'Manufacturing Settings' #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json msgid "To include sub-assembly costs and scrap items in Finished Goods on a work order without using a job card, when the 'Use Multi-Level BOM' option is enabled." -msgstr "Za uključivanje troškova podmontaže i otpadnih artikala u gotov proizvod na radnom nalogu bez upotrebe radne kartice, kada je omogućena opcija 'Koristi višeslojnu Listu Materijala'." +msgstr "Za uključivanje troškova podmontaže i otpadnih artikala u gotov proizvod na radnom nalogu bez upotrebe radne kartice, kada je omogućena opcija 'Koristi Višeslojnu Sastavnicu'." #: erpnext/accounts/doctype/payment_entry/payment_entry.py:2269 #: erpnext/controllers/accounts_controller.py:2899 @@ -56540,13 +56540,13 @@ msgstr "Ažurirajte referencu Automatskog Ponavljanja" #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:35 #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json msgid "Update BOM Cost Automatically" -msgstr "Automatski ažuriraj trošak Liste Materijala" +msgstr "Automatski ažuriraj trošak Sastavnice" #. Description of the 'Update BOM Cost Automatically' (Check) field in DocType #. 'Manufacturing Settings' #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json msgid "Update BOM cost automatically via scheduler, based on the latest Valuation Rate/Price List Rate/Last Purchase Rate of raw materials" -msgstr "Automatski ažurirajte trošak sastavniceputem planera, na osnovu najnovije stope vrednovanja/stope cjenovnika/posljednje stope kupovine sirovina" +msgstr "Automatski ažurirajte trošak Sastavnica putem raspoređivača, na osnovu najnovije stope vrednovanja/stope cijenovnika/posljednje cijene kupovine sirovina" #. Label of the update_billed_amount_in_delivery_note (Check) field in DocType #. 'POS Invoice' @@ -56678,7 +56678,7 @@ msgstr "Ažuriraj Učestalost Projekta" #. Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json msgid "Update latest price in all BOMs" -msgstr "Ažurirajte najnoviju cijenu u svim Listama Materijala" +msgstr "Ažurirajte najnoviju cijenu u svim Sastavnicama" #: erpnext/assets/doctype/asset/asset.py:349 msgid "Update stock must be enabled for the purchase invoice {0}" @@ -56798,7 +56798,7 @@ msgstr "Koristi Ponovno Knjiženje na osnovu Artikla" #: erpnext/manufacturing/doctype/work_order/work_order.json #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Use Multi-Level BOM" -msgstr "Koristi višeslojnu Listu Materijala" +msgstr "Koristi Višeslojnu Sastavnicu" #. Label of the use_serial_batch_fields (Check) field in DocType 'Stock #. Settings' @@ -57128,36 +57128,36 @@ msgstr "Važi do datuma ne može biti prije datuma transakcije" #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json #: erpnext/accounts/doctype/promotional_scheme_price_discount/promotional_scheme_price_discount.json msgid "Validate Applied Rule" -msgstr "Validiraj Primijenjeno Pravilo" +msgstr "Potvrdi Primijenjeno Pravilo" #. Label of the validate_components_quantities_per_bom (Check) field in DocType #. 'Manufacturing Settings' #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json msgid "Validate Components and Quantities Per BOM" -msgstr "Validiraj Komponente i Količine po Spisku Materijala" +msgstr "Potvrdi Komponente i Količine po Listi Materijala" #. Label of the validate_negative_stock (Check) field in DocType 'Inventory #. Dimension' #: erpnext/stock/doctype/inventory_dimension/inventory_dimension.json msgid "Validate Negative Stock" -msgstr "Validiraj Negativnu Zalihu" +msgstr "Potvrdi Negativne Zalihe" #. Label of the validate_pricing_rule_section (Section Break) field in DocType #. 'Pricing Rule' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json msgid "Validate Pricing Rule" -msgstr "Validiraj Pravilo Cijena" +msgstr "Potvrdi Pravilo Cijena" #. Label of the validate_selling_price (Check) field in DocType 'Selling #. Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "Validate Selling Price for Item Against Purchase Rate or Valuation Rate" -msgstr "Validiraj Prodajnu Cijenu Artikla u odnosu na Kupovnu Cijenu ili Stopu Vrijednovanja" +msgstr "Potvrdi Prodajnu Cijenu Artikla u odnosu na Kupovnu Cijenu ili Stopu Vrijednovanja" #. Label of the validate_stock_on_save (Check) field in DocType 'POS Profile' #: erpnext/accounts/doctype/pos_profile/pos_profile.json msgid "Validate Stock on Save" -msgstr "Validiraj Zalihe na Sačuvaj" +msgstr "Potvrdi Zalihe na Spremi" #. Label of the section_break_4 (Section Break) field in DocType 'Tax Rule' #: erpnext/accounts/doctype/tax_rule/tax_rule.json @@ -57453,7 +57453,7 @@ msgstr "Atributi Varijante" #: erpnext/manufacturing/doctype/bom/bom.js:176 msgid "Variant BOM" -msgstr "Varijanta Spiska Materijala" +msgstr "Varijanta Sastavnice" #. Label of the variant_based_on (Select) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json @@ -57628,7 +57628,7 @@ msgstr "Pogled" #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.js:25 msgid "View BOM Update Log" -msgstr "Pogledaj Zapisnik ažuriranja Liste Materijala" +msgstr "Pogledaj Zapisnik Ažuriranja Sastavnice" #: erpnext/public/js/setup_wizard.js:40 msgid "View Chart of Accounts" @@ -59381,7 +59381,7 @@ msgstr "Ne možete iskoristiti bodove lojalnosti koji imaju veću vrijednost od #: erpnext/manufacturing/doctype/bom/bom.js:647 msgid "You cannot change the rate if BOM is mentioned against any Item." -msgstr "Ne možete promijeniti cijenu ako je Lista Materijala navedena uz bilo koji artikal." +msgstr "Ne možete promijeniti cijenu ako je Sastavnica navedena uz bilo koji artikal." #: erpnext/accounts/doctype/accounting_period/accounting_period.py:128 msgid "You cannot create a {0} within the closed Accounting Period {1}" @@ -59469,7 +59469,7 @@ msgstr "Još niste kreirali {0}" #: erpnext/selling/page/point_of_sale/pos_controller.js:252 msgid "You must add atleast one item to save it as draft." -msgstr "Morate dodati barem jedan artikal da sačuvate kao nacrt." +msgstr "Morate dodati barem jedan artikal da spremite kao nacrt." #: erpnext/selling/page/point_of_sale/pos_controller.js:665 msgid "You must select a customer before adding an item." @@ -59878,7 +59878,7 @@ msgstr "odstupanje" #: erpnext/manufacturing/doctype/bom_update_log/bom_updation_utils.py:41 msgid "via BOM Update Tool" -msgstr "putem alata za ažuriranje Liste Materijala" +msgstr "putem Alata Ažuriranje Sastavnice" #: erpnext/accounts/doctype/budget/budget.py:276 msgid "will be" diff --git a/erpnext/locale/fa.po b/erpnext/locale/fa.po index b91e6540e0f..7c1e4bf9f2b 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: info@erpnext.com\n" "POT-Creation-Date: 2025-02-16 09:34+0000\n" -"PO-Revision-Date: 2025-02-19 00:43\n" +"PO-Revision-Date: 2025-02-23 02:28\n" "Last-Translator: info@erpnext.com\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -384,7 +384,7 @@ msgstr "(شامل)" #. Taxes and Charges Template' #: erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json msgid "* Will be calculated in the transaction." -msgstr "* در تراکنش محاسبه می شود." +msgstr "* در تراکنش محاسبه می‌شود." #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:95 #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:347 @@ -871,7 +871,7 @@ msgstr "لیست قیمت مجموعه ای از قیمت های آیتم‌ها #. Description of a DocType #: erpnext/stock/doctype/item/item.json msgid "A Product or a Service that is bought, sold or kept in stock." -msgstr "محصول یا خدماتی که خریداری، فروخته یا در انبار نگهداری می شود." +msgstr "محصول یا خدماتی که خریداری، فروخته یا در انبار نگهداری می‌شود." #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py:547 msgid "A Reconciliation Job {0} is running for the same filters. Cannot reconcile now" @@ -879,7 +879,7 @@ msgstr "یک کار تطبیق {0} برای همین فیلترها در حال #: erpnext/setup/doctype/company/company.py:936 msgid "A Transaction Deletion Document: {0} is triggered for {0}" -msgstr "یک سند حذف تراکنش: {0} برای {0} فعال می شود" +msgstr "یک سند حذف تراکنش: {0} برای {0} فعال می‌شود" #. Description of a DocType #: erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json @@ -899,7 +899,7 @@ msgstr "یک راننده باید برای ارسال تنظیم شود." #. Description of a DocType #: erpnext/stock/doctype/warehouse/warehouse.json msgid "A logical Warehouse against which stock entries are made." -msgstr "یک انبار منطقی که در مقابل آن ثبت موجودی انجام می شود." +msgstr "یک انبار منطقی که در مقابل آن ثبت موجودی انجام می‌شود." #: erpnext/templates/emails/confirm_appointment.html:2 msgid "A new appointment has been created for you with {0}" @@ -3398,7 +3398,7 @@ msgstr "پیش پرداخت در مقابل {0} {1} نمی تواند بیشتر #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json msgid "Advance payments allocated against orders will only be fetched" -msgstr "پیش پرداخت های تخصیص یافته در برابر سفارش ها فقط واکشی می شود" +msgstr "پیش پرداخت های تخصیص یافته در برابر سفارش ها فقط واکشی می‌شود" #. Label of the section_break_13 (Tab Break) field in DocType 'Pricing Rule' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json @@ -3910,7 +3910,7 @@ msgstr "تمام نظرات و ایمیل ها از یک سند به سند جد #: erpnext/manufacturing/doctype/work_order/work_order.js:1072 msgid "All the required items (raw materials) will be fetched from BOM and populated in this table. Here you can also change the Source Warehouse for any item. And during the production, you can track transferred raw materials from this table." -msgstr "تمام آیتم‌های مورد نیاز (مواد اولیه) از BOM واکشی شده و در این جدول پر می شود. در اینجا شما همچنین می توانید انبار منبع را برای هر آیتم تغییر دهید. و در حین تولید می توانید مواد اولیه انتقال یافته را از این جدول ردیابی کنید." +msgstr "تمام آیتم‌های مورد نیاز (مواد اولیه) از BOM واکشی شده و در این جدول پر می‌شود. در اینجا شما همچنین می توانید انبار منبع را برای هر آیتم تغییر دهید. و در حین تولید می توانید مواد اولیه انتقال یافته را از این جدول ردیابی کنید." #: erpnext/stock/doctype/delivery_note/delivery_note.py:821 msgid "All these items have already been Invoiced/Returned" @@ -5099,7 +5099,7 @@ msgstr "کد تخفیف اعمال شده" #. Inspection Reading' #: erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json msgid "Applied on each reading." -msgstr "در هر خواندن اعمال می شود." +msgstr "در هر خواندن اعمال می‌شود." #: erpnext/stock/doctype/putaway_rule/putaway_rule.py:183 msgid "Applied putaway rules." @@ -5108,7 +5108,7 @@ msgstr "اعمال قوانین حذف" #. Label of the applies_to (Table) field in DocType 'Common Code' #: erpnext/edi/doctype/common_code/common_code.json msgid "Applies To" -msgstr "اعمال می شود به" +msgstr "اعمال می‌شود به" #. Label of the apply_discount_on (Select) field in DocType 'POS Invoice' #. Label of the apply_discount_on (Select) field in DocType 'Purchase Invoice' @@ -5580,7 +5580,7 @@ msgstr "جدول استهلاک دارایی ها" #: erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py:75 msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation" -msgstr "برنامه استهلاک دارایی برای دارایی {0} و دفتر مالی {1} از استهلاک مبتنی بر شیفت استفاده نمی کند" +msgstr "برنامه استهلاک دارایی برای دارایی {0} و دفتر مالی {1} از استهلاک مبتنی بر شیفت استفاده نمی‌کند" #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:1065 #: erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:1111 @@ -8269,7 +8269,7 @@ msgstr "دارایی ثابت رزرو شده" #: erpnext/stock/doctype/warehouse/warehouse.py:142 msgid "Booking stock value across multiple accounts will make it harder to track stock and account value." -msgstr "رزرو ارزش موجودی در چندین حساب، ردیابی موجودی و ارزش حساب را دشوارتر می کند." +msgstr "رزرو ارزش موجودی در چندین حساب، ردیابی موجودی و ارزش حساب را دشوارتر می‌کند." #: erpnext/accounts/general_ledger.py:741 msgid "Books have been closed till the period ending on {0}" @@ -9214,7 +9214,7 @@ msgstr "نمی‌توان TDS را در یک ثبت در مقابل چندین #: erpnext/stock/doctype/item/item.py:305 msgid "Cannot be a fixed asset item as Stock Ledger is created." -msgstr "نمی تواند یک مورد دارایی ثابت باشد زیرا دفتر کل موجودی ایجاد می شود." +msgstr "نمی تواند یک مورد دارایی ثابت باشد زیرا دفتر کل موجودی ایجاد می‌شود." #: erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py:206 msgid "Cannot cancel as processing of cancelled documents is pending." @@ -9312,7 +9312,7 @@ msgstr "" #: erpnext/stock/doctype/serial_no/serial_no.py:117 msgid "Cannot delete Serial No {0}, as it is used in stock transactions" -msgstr "نمی توان شماره سریال {0} را حذف کرد، زیرا در معاملات موجودی استفاده می شود" +msgstr "نمی توان شماره سریال {0} را حذف کرد، زیرا در معاملات موجودی استفاده می‌شود" #: erpnext/stock/doctype/stock_settings/stock_settings.py:113 msgid "Cannot disable batch wise valuation for FIFO valuation method." @@ -9371,7 +9371,7 @@ msgstr "نمی توان توکن پیوند را برای به روز رسانی #: erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js:68 msgid "Cannot retrieve link token. Check Error Log for more information" -msgstr "توکن پیوند بازیابی نمی شود. برای اطلاعات بیشتر Log خطا را بررسی کنید" +msgstr "توکن پیوند بازیابی نمی‌شود. برای اطلاعات بیشتر Log خطا را بررسی کنید" #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1488 #: erpnext/accounts/doctype/payment_entry/payment_entry.js:1667 @@ -9384,7 +9384,7 @@ msgstr "نمی توان نوع شارژ را به عنوان «بر مقدار #: erpnext/selling/doctype/quotation/quotation.py:274 msgid "Cannot set as Lost as Sales Order is made." -msgstr "نمی توان آن را به عنوان گمشده تنظیم کرد زیرا سفارش فروش انجام می شود." +msgstr "نمی توان آن را به عنوان گمشده تنظیم کرد زیرا سفارش فروش انجام می‌شود." #: erpnext/setup/doctype/authorization_rule/authorization_rule.py:91 msgid "Cannot set authorization on basis of Discount for {0}" @@ -9796,7 +9796,7 @@ msgstr "هزینه‌ها در رسید خرید برای هر آیتم به‌ #: erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38 msgid "Charges will be distributed proportionately based on item qty or amount, as per your selection" -msgstr "هزینه ها بر اساس مقدار یا مبلغ آیتم، بر اساس انتخاب شما، به تناسب توزیع می شود" +msgstr "هزینه ها بر اساس مقدار یا مبلغ آیتم، بر اساس انتخاب شما، به تناسب توزیع می‌شود" #: erpnext/selling/page/sales_funnel/sales_funnel.js:45 msgid "Chart" @@ -9905,7 +9905,7 @@ msgstr "بررسی شد در" #. Withholding Category' #: erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json msgid "Checking this will round off the tax amount to the nearest integer" -msgstr "بررسی این مقدار مالیات را به نزدیکترین عدد صحیح گرد می کند" +msgstr "بررسی این مقدار مالیات را به نزدیکترین عدد صحیح گرد می‌کند" #: erpnext/selling/page/point_of_sale/pos_item_cart.js:92 #: erpnext/selling/page/point_of_sale/pos_item_cart.js:148 @@ -10114,7 +10114,7 @@ msgstr "برای دریافت آیتم‌ها از سفارش‌های فروش #: erpnext/setup/doctype/holiday_list/holiday_list.js:70 msgid "Click on Add to Holidays. This will populate the holidays table with all the dates that fall on the selected weekly off. Repeat the process for populating the dates for all your weekly holidays" -msgstr "روی افزودن به تعطیلات کلیک کنید. با این کار جدول تعطیلات با تمام تاریخ هایی که در تعطیلات هفتگی انتخاب شده قرار می گیرند پر می کند. فرآیند پر کردن تاریخ ها را برای تمام تعطیلات هفتگی خود تکرار کنید" +msgstr "روی افزودن به تعطیلات کلیک کنید. با این کار جدول تعطیلات با تمام تاریخ هایی که در تعطیلات هفتگی انتخاب شده قرار می گیرند پر می‌کند. فرآیند پر کردن تاریخ ها را برای تمام تعطیلات هفتگی خود تکرار کنید" #: erpnext/manufacturing/doctype/production_plan/production_plan.js:601 msgid "Click on Get Sales Orders to fetch sales orders based on the above filters." @@ -10124,7 +10124,7 @@ msgstr "برای دریافت سفارش‌های فروش بر اساس فیل #. Supplier Invoice' #: erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json msgid "Click on Import Invoices button once the zip file has been attached to the document. Any errors related to processing will be shown in the Error Log." -msgstr "هنگامی که فایل فشرده به سند پیوست شد، روی دکمه درون‌بُرد فاکتورها کلیک کنید. هر گونه خطای مربوط به پردازش در Error Log نشان داده می شود." +msgstr "هنگامی که فایل فشرده به سند پیوست شد، روی دکمه درون‌بُرد فاکتورها کلیک کنید. هر گونه خطای مربوط به پردازش در Error Log نشان داده می‌شود." #: erpnext/templates/emails/confirm_appointment.html:3 msgid "Click on the link below to verify your email and confirm the appointment" @@ -11122,7 +11122,7 @@ msgstr "شرکتی که مشتری داخلی نماینده آن است." #. Invoice' #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json msgid "Company which internal supplier represents" -msgstr "شرکتی که تامین کننده داخلی آن را نمایندگی می کند" +msgstr "شرکتی که تامین کننده داخلی آن را نمایندگی می‌کند" #: erpnext/accounts/doctype/account/account.py:472 msgid "Company {0} does not exist" @@ -11415,7 +11415,7 @@ msgstr "کنش را طوری پیکربندی کنید که تراکنش را م #: erpnext/buying/doctype/buying_settings/buying_settings.js:20 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List." -msgstr "هنگام ایجاد تراکنش خرید جدید، فهرست قیمت پیش‌فرض را پیکربندی کنید. قیمت اقلام از این لیست قیمت دریافت می شود." +msgstr "هنگام ایجاد تراکنش خرید جدید، فهرست قیمت پیش‌فرض را پیکربندی کنید. قیمت اقلام از این لیست قیمت دریافت می‌شود." #. Label of the final_confirmation_date (Date) field in DocType 'Employee' #: erpnext/setup/doctype/employee/employee.json @@ -12400,7 +12400,7 @@ msgstr "مرکز هزینه با تراکنش های موجود را نمی تو #: erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.py:152 msgid "Cost Center {0} cannot be used for allocation as it is used as main cost center in other allocation record." -msgstr "مرکز هزینه {0} را نمی توان برای تخصیص استفاده کرد زیرا به عنوان مرکز هزینه اصلی در سایر رکوردهای تخصیص استفاده می شود." +msgstr "مرکز هزینه {0} را نمی توان برای تخصیص استفاده کرد زیرا به عنوان مرکز هزینه اصلی در سایر رکوردهای تخصیص استفاده می‌شود." #: erpnext/assets/doctype/asset/asset.py:248 msgid "Cost Center {} doesn't belong to Company {}" @@ -15457,7 +15457,7 @@ msgstr "تنظیمات پیش‌فرض برای تراکنش‌های مربوط #: erpnext/setup/doctype/company/company.js:168 msgid "Default tax templates for sales, purchase and items are created." -msgstr "الگوهای مالیاتی پیش فرض برای فروش، خرید و اقلام ایجاد می شود." +msgstr "الگوهای مالیاتی پیش فرض برای فروش، خرید و اقلام ایجاد می‌شود." #. Description of the 'Time Between Operations (Mins)' (Int) field in DocType #. 'Manufacturing Settings' @@ -16076,7 +16076,7 @@ msgstr "جزئیات استهلاک" #: erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:495 msgid "Depreciation Eliminated due to disposal of assets" -msgstr "استهلاک به دلیل واگذاری دارایی ها حذف می شود" +msgstr "استهلاک به دلیل واگذاری دارایی ها حذف می‌شود" #. Option for the 'Entry Type' (Select) field in DocType 'Journal Entry' #. Option for the 'Journal Entry Type' (Select) field in DocType 'Journal Entry @@ -16577,7 +16577,7 @@ msgstr "حساب تفاوت باید یک حساب از نوع دارایی/بد #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py:901 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry" -msgstr "حساب مابه التفاوت باید یک حساب از نوع دارایی/بدهی باشد، زیرا این تطبیق موجودی یک ثبت افتتاحیه است." +msgstr "حساب تفاوت باید یک حساب از نوع دارایی/بدهی باشد، زیرا این تطبیق موجودی یک ثبت افتتاحیه است" #. Label of the difference_amount (Currency) field in DocType 'Payment #. Reconciliation Allocation' @@ -16641,7 +16641,7 @@ msgstr "برای هر ردیف می توان «انبار منبع» و «انب #: erpnext/stock/doctype/packing_slip/packing_slip.py:191 msgid "Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM." -msgstr "UOM های مختلف برای آیتم‌ها منجر به مقدار نادرست (کل) خالص وزن می شود. مطمئن شوید که وزن خالص هر آیتم در همان UOM باشد." +msgstr "UOM های مختلف برای آیتم‌ها منجر به مقدار نادرست (کل) خالص وزن می‌شود. مطمئن شوید که وزن خالص هر آیتم در همان UOM باشد." #. Label of the dimension_defaults (Table) field in DocType 'Accounting #. Dimension' @@ -16861,7 +16861,7 @@ msgstr "الگوی غیرفعال نباید الگوی پیش فرض باشد" #. Reconciliation' #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "Disables auto-fetching of existing quantity" -msgstr "واکشی خودکار مقدار موجود را غیرفعال می کند" +msgstr "واکشی خودکار مقدار موجود را غیرفعال می‌کند" #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry' #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry Type' @@ -18767,7 +18767,7 @@ msgstr "کلید API را در تنظیمات Google وارد کنید." #: erpnext/setup/doctype/employee/employee.js:96 msgid "Enter First and Last name of Employee, based on Which Full Name will be updated. IN transactions, it will be Full Name which will be fetched." -msgstr "نام و نام خانوادگی کارمند را که بر اساس نام کامل به روز می شود وارد کنید. در معاملات، نام کامل خواهد بود که واکشی می شود." +msgstr "نام و نام خانوادگی کارمند را که بر اساس نام کامل به روز می‌شود وارد کنید. در معاملات، نام کامل خواهد بود که واکشی می‌شود." #: erpnext/public/js/utils/serial_no_batch_selector.js:201 msgid "Enter Manually" @@ -18809,7 +18809,7 @@ msgstr "مبلغی را برای بازخرید وارد کنید." #: erpnext/stock/doctype/item/item.js:935 msgid "Enter an Item Code, the name will be auto-filled the same as Item Code on clicking inside the Item Name field." -msgstr "یک کد مورد را وارد کنید، نام با کلیک کردن در داخل قسمت نام مورد، به طور خودکار مانند کد مورد پر می شود." +msgstr "یک کد مورد را وارد کنید، نام با کلیک کردن در داخل قسمت نام مورد، به طور خودکار مانند کد مورد پر می‌شود." #: erpnext/selling/page/point_of_sale/pos_item_cart.js:905 msgid "Enter customer's email" @@ -18858,7 +18858,7 @@ msgstr "واحدهای موجودی افتتاحی را وارد کنید." #: erpnext/manufacturing/doctype/bom/bom.js:859 msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials." -msgstr "مقدار آیتمی را که از این صورتحساب مواد تولید می شود وارد کنید." +msgstr "مقدار آیتمی را که از این صورتحساب مواد تولید می‌شود وارد کنید." #: erpnext/manufacturing/doctype/work_order/work_order.js:1034 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set." @@ -18881,7 +18881,7 @@ msgstr "مخارج تفریحات" #. Agreement' #: erpnext/support/doctype/service_level_agreement/service_level_agreement.json msgid "Entity" -msgstr "وجود، موجودیت" +msgstr "موجودیت" #. Label of the entity_type (Select) field in DocType 'Service Level Agreement' #: erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py:203 @@ -19067,7 +19067,7 @@ msgstr "" #. Description of the 'Batch Number Series' (Data) field in DocType 'Item' #: erpnext/stock/doctype/item/item.json msgid "Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings." -msgstr "مثال: ABCD.#####. اگر سری تنظیم شده باشد و Batch No در تراکنش ها ذکر نشده باشد، شماره دسته خودکار بر اساس این سری ایجاد می شود. اگر همیشه می‌خواهید به صراحت شماره دسته را برای این مورد ذکر کنید، این قسمت را خالی بگذارید. توجه: این تنظیم بر پیشوند سری نامگذاری در تنظیمات موجودی اولویت دارد." +msgstr "مثال: ABCD.#####. اگر سری تنظیم شده باشد و Batch No در تراکنش ها ذکر نشده باشد، شماره دسته خودکار بر اساس این سری ایجاد می‌شود. اگر همیشه می‌خواهید به صراحت شماره دسته را برای این مورد ذکر کنید، این قسمت را خالی بگذارید. توجه: این تنظیم بر پیشوند سری نامگذاری در تنظیمات موجودی اولویت دارد." #: erpnext/stock/stock_ledger.py:2135 msgid "Example: Serial No {0} reserved in {1}." @@ -20088,7 +20088,7 @@ msgstr "صورت های مالی" #: erpnext/public/js/setup_wizard.js:41 msgid "Financial Year Begins On" -msgstr "سال مالی شروع می شود" +msgstr "سال مالی شروع می‌شود" #. Description of the 'Ignore Account Closing Balance' (Check) field in DocType #. 'Accounts Settings' @@ -20507,7 +20507,7 @@ msgstr "برای" #: erpnext/public/js/utils/sales_common.js:335 msgid "For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table." -msgstr "برای آیتم‌های \"باندل محصول\"، انبار، شماره سریال و شماره دسته از جدول \"لیست بسته بندی\" در نظر گرفته می شود. اگر انبار و شماره دسته‌ برای همه آیتم‌های بسته‌بندی برای هر آیتم «باندل محصول» یکسان باشد، آن مقادیر را می‌توان در جدول کالای اصلی وارد کرد، مقادیر در جدول «فهرست بسته‌بندی» کپی می‌شوند." +msgstr "برای آیتم‌های \"باندل محصول\"، انبار، شماره سریال و شماره دسته از جدول \"لیست بسته بندی\" در نظر گرفته می‌شود. اگر انبار و شماره دسته‌ برای همه آیتم‌های بسته‌بندی برای هر آیتم «باندل محصول» یکسان باشد، آن مقادیر را می‌توان در جدول کالای اصلی وارد کرد، مقادیر در جدول «فهرست بسته‌بندی» کپی می‌شوند." #. Label of the for_buying (Check) field in DocType 'Currency Exchange' #: erpnext/setup/doctype/currency_exchange/currency_exchange.json @@ -22595,7 +22595,7 @@ msgstr "در اینجا می توانید قد، وزن، آلرژی، نگرا #: erpnext/setup/doctype/employee/employee.js:122 msgid "Here, you can select a senior of this Employee. Based on this, Organization Chart will be populated." -msgstr "در اینجا، می توانید یک ارشد این کارمند را انتخاب کنید. بر این اساس نمودار سازمانی پر می شود." +msgstr "در اینجا، می توانید یک ارشد این کارمند را انتخاب کنید. بر این اساس نمودار سازمانی پر می‌شود." #: erpnext/setup/doctype/holiday_list/holiday_list.js:77 msgid "Here, your weekly offs are pre-populated based on the previous selections. You can add more rows to also add public and national holidays individually." @@ -22613,7 +22613,7 @@ msgstr "سلام،" #. Description of the 'Contact List' (Code) field in DocType 'Shareholder' #: erpnext/accounts/doctype/shareholder/shareholder.json msgid "Hidden list maintaining the list of contacts linked to Shareholder" -msgstr "لیست مخفی که لیستی از مخاطبین مرتبط با سهامدار را حفظ می کند" +msgstr "لیست مخفی که لیستی از مخاطبین مرتبط با سهامدار را حفظ می‌کند" #. Label of the hide_currency_symbol (Select) field in DocType 'Global #. Defaults' @@ -22887,7 +22887,7 @@ msgstr "بیکار (Idle)" #. DocType 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json msgid "If \"Months\" is selected, a fixed amount will be booked as deferred revenue or expense for each month irrespective of the number of days in a month. It will be prorated if deferred revenue or expense is not booked for an entire month" -msgstr "اگر «ماه‌ها» انتخاب شود، صرف نظر از تعداد روزهای یک ماه، مبلغ ثابتی به‌عنوان درآمد یا هزینه معوق برای هر ماه ثبت می‌شود. در صورتی که درآمد یا هزینه معوق برای یک ماه کامل ثبت نشود، به نسبت محاسبه می شود" +msgstr "اگر «ماه‌ها» انتخاب شود، صرف نظر از تعداد روزهای یک ماه، مبلغ ثابتی به‌عنوان درآمد یا هزینه معوق برای هر ماه ثبت می‌شود. در صورتی که درآمد یا هزینه معوق برای یک ماه کامل ثبت نشود، به نسبت محاسبه می‌شود" #. Description of the 'Reconcile on Advance Payment Date' (Check) field in #. DocType 'Company' @@ -22919,7 +22919,7 @@ msgstr "اگر خالی باشد، حساب انبار والد یا پیش‌ف #. 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." -msgstr "در صورت علامت زدن، مقدار رد شده هنگام تهیه فاکتور خرید از رسید خرید لحاظ می شود." +msgstr "در صورت علامت زدن، مقدار رد شده هنگام تهیه فاکتور خرید از رسید خرید لحاظ می‌شود." #. Description of the 'Reserve Stock' (Check) field in DocType 'Sales Order' #: erpnext/selling/doctype/sales_order/sales_order.json @@ -22938,7 +22938,7 @@ msgstr "اگر علامت زده شود، مقدار انتخاب شده به‌ #: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json #: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json msgid "If checked, the tax amount will be considered as already included in the Paid Amount in Payment Entry" -msgstr "اگر علامت زده شود، مبلغ مالیات به عنوان مبلغ پرداخت شده در ثبت پرداخت در نظر گرفته می شود" +msgstr "اگر علامت زده شود، مبلغ مالیات به عنوان مبلغ پرداخت شده در ثبت پرداخت در نظر گرفته می‌شود" #. Description of the 'Is this Tax included in Basic Rate?' (Check) field in #. DocType 'Purchase Taxes and Charges' @@ -22947,7 +22947,7 @@ msgstr "اگر علامت زده شود، مبلغ مالیات به عنوان #: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json #: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json msgid "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount" -msgstr "اگر علامت زده شود، مبلغ مالیات به عنوان قبلاً در نرخ چاپ / مبلغ چاپ در نظر گرفته می شود" +msgstr "اگر علامت زده شود، مبلغ مالیات به عنوان قبلاً در نرخ چاپ / مبلغ چاپ در نظر گرفته می‌شود" #: erpnext/public/js/setup_wizard.js:49 msgid "If checked, we will create demo data for you to explore the system. This demo data can be erased later." @@ -22980,25 +22980,25 @@ msgstr "اگر فعال باشد، سیستم قانون قیمت‌گذاری #. 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." -msgstr "اگر فعال باشد، سیستم مقدار / دسته / شماره سریال انتخاب شده را بازنویسی نمی کند." +msgstr "اگر فعال باشد، سیستم مقدار / دسته / شماره سریال انتخاب شده را بازنویسی نمی‌کند." #. Description of the 'Send Document Print' (Check) field in DocType 'Request #. for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "If enabled, a print of this document will be attached to each email" -msgstr "در صورت فعال بودن، چاپی از این سند به هر ایمیل پیوست می شود" +msgstr "در صورت فعال بودن، چاپی از این سند به هر ایمیل پیوست می‌شود" #. Description of the 'Enable Discount Accounting for Selling' (Check) field in #. DocType 'Selling Settings' #: erpnext/selling/doctype/selling_settings/selling_settings.json msgid "If enabled, additional ledger entries will be made for discounts in a separate Discount Account" -msgstr "در صورت فعال بودن، ورودی های دفتر کل اضافی برای تخفیف در یک حساب تخفیف جداگانه ایجاد می شود" +msgstr "در صورت فعال بودن، ورودی های دفتر کل اضافی برای تخفیف در یک حساب تخفیف جداگانه ایجاد می‌شود" #. Description of the 'Send Attached Files' (Check) field in DocType 'Request #. for Quotation' #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.json msgid "If enabled, all files attached to this document will be attached to each email" -msgstr "در صورت فعال بودن، تمام فایل های پیوست شده به این سند به هر ایمیل پیوست می شود" +msgstr "در صورت فعال بودن، تمام فایل های پیوست شده به این سند به هر ایمیل پیوست می‌شود" #. Description of the 'Do Not Update Serial / Batch on Creation of Auto Bundle' #. (Check) field in DocType 'Stock Settings' @@ -23030,7 +23030,7 @@ msgstr "" #. 'Production Plan' #: erpnext/manufacturing/doctype/production_plan/production_plan.json msgid "If enabled, the system will create material requests even if the stock exists in the 'Raw Materials Warehouse'." -msgstr "اگر فعال باشد، سیستم حتی اگر موجودی در \"انبار مواد خام\" وجود داشته باشد، درخواست های مواد ایجاد می کند." +msgstr "اگر فعال باشد، سیستم حتی اگر موجودی در \"انبار مواد خام\" وجود داشته باشد، درخواست های مواد ایجاد می‌کند." #. Description of the 'Do Not Use Batch-wise Valuation' (Check) field in #. DocType 'Stock Settings' @@ -23068,7 +23068,7 @@ msgstr "اگر نه، می توانید این ثبت را لغو / ارسال #. Rule' #: erpnext/accounts/doctype/pricing_rule/pricing_rule.json msgid "If rate is zero then item will be treated as \"Free Item\"" -msgstr "اگر نرخ صفر باشد، آیتم به عنوان \"آیتم رایگان\" تلقی می شود" +msgstr "اگر نرخ صفر باشد، آیتم به عنوان \"آیتم رایگان\" تلقی می‌شود" #. Description of the 'Supply Raw Materials for Purchase' (Check) field in #. DocType 'Item' @@ -23087,11 +23087,11 @@ msgstr "اگر حساب مسدود شود، ورود به کاربران محد #: erpnext/stock/stock_ledger.py:1836 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} فعال کنید." +msgstr "اگر آیتم به عنوان یک آیتم نرخ ارزش گذاری صفر در این ثبت تراکنش می‌شود، لطفاً \"نرخ ارزش گذاری صفر مجاز\" را در جدول آیتم {0} فعال کنید." #: erpnext/manufacturing/doctype/work_order/work_order.js:1086 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed." -msgstr "اگر BOM انتخاب شده دارای عملیات ذکر شده در آن باشد، سیستم تمام عملیات را از BOM واکشی می کند، این مقادیر را می توان تغییر داد." +msgstr "اگر BOM انتخاب شده دارای عملیات ذکر شده در آن باشد، سیستم تمام عملیات را از BOM واکشی می‌کند، این مقادیر را می توان تغییر داد." #. Description of the 'Catch All' (Link) field in DocType 'Communication #. Medium' @@ -23113,13 +23113,13 @@ msgstr "اگر این چک باکس علامت زده شود، مبلغ پردا #. DocType 'Production Plan' #: erpnext/manufacturing/doctype/production_plan/production_plan.json msgid "If this checkbox is enabled, then the system won’t run the MRP for the available sub-assembly items." -msgstr "اگر این چک باکس فعال باشد، سیستم MRP را برای آیتم‌های زیر مونتاژ موجود اجرا نمی کند." +msgstr "اگر این چک باکس فعال باشد، سیستم MRP را برای آیتم‌های زیر مونتاژ موجود اجرا نمی‌کند." #. Description of the 'Follow Calendar Months' (Check) field in DocType #. 'Subscription' #: erpnext/accounts/doctype/subscription/subscription.json msgid "If this is checked subsequent new invoices will be created on calendar month and quarter start dates irrespective of current invoice start date" -msgstr "اگر این مورد علامت زده شود، فاکتورهای جدید بعدی در تاریخ شروع ماه تقویمی و سه‌ماهه بدون در نظر گرفتن تاریخ شروع فاکتور فعلی ایجاد می شود" +msgstr "اگر این مورد علامت زده شود، فاکتورهای جدید بعدی در تاریخ شروع ماه تقویمی و سه‌ماهه بدون در نظر گرفتن تاریخ شروع فاکتور فعلی ایجاد می‌شود" #. Description of the 'Submit Journal Entries' (Check) field in DocType #. 'Accounts Settings' @@ -23144,11 +23144,11 @@ msgstr "اگر این آیتم دارای گونه باشد، نمی توان آ #: erpnext/buying/doctype/buying_settings/buying_settings.js:27 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 شما را از ایجاد فاکتور خرید یا رسید بدون ایجاد یک سفارش خرید جلوگیری می کند. این پیکربندی را می‌توان با فعال کردن کادر انتخاب «اجازه ایجاد فاکتور خرید بدون سفارش خرید» در بخش اصلی تامین‌کننده، برای یک تامین‌کننده خاص لغو کرد." +msgstr "اگر این گزینه 'بله' پیکربندی شده باشد، ERPNext شما را از ایجاد فاکتور خرید یا رسید بدون ایجاد یک سفارش خرید جلوگیری می‌کند. این پیکربندی را می‌توان با فعال کردن کادر انتخاب «اجازه ایجاد فاکتور خرید بدون سفارش خرید» در بخش اصلی تامین‌کننده، برای یک تامین‌کننده خاص لغو کرد." #: erpnext/buying/doctype/buying_settings/buying_settings.js:34 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 از ایجاد فاکتور خرید بدون ایجاد یک رسید خرید جلوگیری می کند. این پیکربندی را می‌توان برای یک تامین‌کننده خاص با فعال کردن کادر انتخاب «اجازه ایجاد فاکتور خرید بدون رسید خرید» در قسمت اصلی تامین‌کننده لغو کرد." +msgstr "اگر این گزینه 'بله' پیکربندی شده باشد، ERPNext از ایجاد فاکتور خرید بدون ایجاد یک رسید خرید جلوگیری می‌کند. این پیکربندی را می‌توان برای یک تامین‌کننده خاص با فعال کردن کادر انتخاب «اجازه ایجاد فاکتور خرید بدون رسید خرید» در قسمت اصلی تامین‌کننده لغو کرد." #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:10 msgid "If ticked, multiple materials can be used for a single Work Order. This is useful if one or more time consuming products are being manufactured." @@ -23156,7 +23156,7 @@ msgstr "اگر علامت زده شود، می توان از چندین ماده #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:36 msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials." -msgstr "در صورت علامت زدن، هزینه BOM به طور خودکار بر اساس نرخ ارزش گذاری / نرخ لیست قیمت / آخرین نرخ خرید مواد اولیه به روز می شود." +msgstr "در صورت علامت زدن، هزینه BOM به طور خودکار بر اساس نرخ ارزش گذاری / نرخ لیست قیمت / آخرین نرخ خرید مواد اولیه به روز می‌شود." #: erpnext/accounts/doctype/loyalty_program/loyalty_program.js:14 msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0." @@ -23166,11 +23166,11 @@ msgstr "" #. 'Warehouse' #: erpnext/stock/doctype/warehouse/warehouse.json msgid "If yes, then this warehouse will be used to store rejected materials" -msgstr "اگر بله، پس از این انبار برای نگهداری مواد رد شده استفاده می شود" +msgstr "اگر بله، پس از این انبار برای نگهداری مواد رد شده استفاده می‌شود" #: erpnext/stock/doctype/item/item.js:947 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 برای هر تراکنش این کالا یک ثبت در دفتر کل موجودی ایجاد می کند." +msgstr "اگر موجودی این کالا را در موجودی خود نگهداری می کنید، ERPNext برای هر تراکنش این کالا یک ثبت در دفتر کل موجودی ایجاد می‌کند." #. Description of the 'Unreconciled Entries' (Section Break) field in DocType #. 'Payment Reconciliation' @@ -23249,7 +23249,7 @@ msgstr "همپوشانی زمان کارمند را نادیده بگیرید" #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js:140 msgid "Ignore Empty Stock" -msgstr "موجودی خالی را نادیده بگیرید" +msgstr "نادیده گرفتن موجودی خالی" #. Label of the ignore_exchange_rate_revaluation_journals (Check) field in #. DocType 'Process Statement Of Accounts' @@ -25551,7 +25551,7 @@ msgstr "یک اشتراک است" #: erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json #: erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json msgid "Is this Tax included in Basic Rate?" -msgstr "آیا این مالیات شامل نرخ پایه می شود؟" +msgstr "آیا این مالیات شامل نرخ پایه می‌شود؟" #. Option for the 'Transfer Type' (Select) field in DocType 'Share Transfer' #. Option for the 'Status' (Select) field in DocType 'Asset' @@ -26516,7 +26516,7 @@ msgstr "قیمت آیتم برای {0} در لیست قیمت {1} اضافه ش #: 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." -msgstr "قیمت آیتم چندین بار بر اساس لیست قیمت، تامین کننده/مشتری، ارز، آیتم، دسته، UOM، مقدار و تاریخ ها ظاهر می شود." +msgstr "قیمت آیتم چندین بار بر اساس لیست قیمت، تامین کننده/مشتری، ارز، آیتم، دسته، UOM، مقدار و تاریخ ها ظاهر می‌شود." #: erpnext/stock/get_item_details.py:1018 msgid "Item Price updated for {0} in Price List {1}" @@ -28092,7 +28092,7 @@ msgstr "محدود به 12 کاراکتر" #. Settings' #: erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json msgid "Limits don't apply on" -msgstr "محدودیت ها اعمال نمی شود" +msgstr "محدودیت ها اعمال نمی‌شود" #. Label of the amt_in_words_line_spacing (Float) field in DocType 'Cheque #. Print Template' @@ -28978,7 +28978,7 @@ msgstr "بازرسی دستی" #: erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:36 msgid "Manual entry cannot be created! Disable automatic entry for deferred accounting in accounts settings and try again" -msgstr "ثبت دستی ایجاد نمی شود! ثبت خودکار برای حسابداری معوق را در تنظیمات حساب ها غیرفعال کنید و دوباره امتحان کنید" +msgstr "ثبت دستی ایجاد نمی‌شود! ثبت خودکار برای حسابداری معوق را در تنظیمات حساب ها غیرفعال کنید و دوباره امتحان کنید" #. Label of the manufacture_details (Section Break) field in DocType 'Purchase #. Invoice Item' @@ -29933,7 +29933,7 @@ msgstr "پیام برای نمایش" #. Description of the 'Message' (Text) field in DocType 'Project' #: erpnext/projects/doctype/project/project.json msgid "Message will be sent to the users to get their status on the Project" -msgstr "پیامی برای کاربران ارسال می شود تا وضعیت خود را در پروژه دریافت کنند" +msgstr "پیامی برای کاربران ارسال می‌شود تا وضعیت خود را در پروژه دریافت کنند" #. Description of the 'Message' (Text) field in DocType 'SMS Center' #: erpnext/selling/doctype/sms_center/sms_center.json @@ -31389,7 +31389,7 @@ msgstr "سال مالی جدید ایجاد شد: - " #. DocType 'Subscription' #: erpnext/accounts/doctype/subscription/subscription.json msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date" -msgstr "فاکتورهای جدید طبق برنامه زمانی تولید می شود حتی اگر فاکتورهای فعلی پرداخت نشده یا سررسید گذشته باشد" +msgstr "فاکتورهای جدید طبق برنامه زمانی تولید می‌شود حتی اگر فاکتورهای فعلی پرداخت نشده یا سررسید گذشته باشد" #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js:241 msgid "New release date should be in the future" @@ -32401,13 +32401,13 @@ msgstr "" #: erpnext/manufacturing/doctype/production_plan/production_plan.js:613 msgid "On expanding a row in the Items to Manufacture table, you'll see an option to 'Include Exploded Items'. Ticking this includes raw materials of the sub-assembly items in the production process." -msgstr "با گسترش یک ردیف در جدول Items to Manufacture، گزینه ای برای \"شامل آیتم‌های گسترده شده\" را مشاهده خواهید کرد. تیک زدن این شامل مواد اولیه آیتم‌های زیر مونتاژ در فرآیند تولید می شود." +msgstr "با گسترش یک ردیف در جدول Items to Manufacture، گزینه ای برای \"شامل آیتم‌های گسترده شده\" را مشاهده خواهید کرد. تیک زدن این شامل مواد اولیه آیتم‌های زیر مونتاژ در فرآیند تولید می‌شود." #. Description of the 'Use Serial / Batch Fields' (Check) field in DocType #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "On submission of the stock transaction, system will auto create the Serial and Batch Bundle based on the Serial No / Batch fields." -msgstr "پس از ارسال تراکنش موجودی، سیستم به صورت خودکار باندل سریال و دسته را بر اساس فیلدهای شماره سریال / دسته ایجاد می کند." +msgstr "پس از ارسال تراکنش موجودی، سیستم به صورت خودکار باندل سریال و دسته را بر اساس فیلدهای شماره سریال / دسته ایجاد می‌کند." #: erpnext/setup/default_energy_point_rules.py:43 msgid "On {0} Creation" @@ -32484,7 +32484,7 @@ msgstr "" #. (Select) field in DocType 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json msgid "Only applies for Normal Payments" -msgstr "فقط برای پرداخت های عادی اعمال می شود" +msgstr "فقط برای پرداخت های عادی اعمال می‌شود" #: erpnext/assets/report/fixed_asset_register/fixed_asset_register.js:43 msgid "Only existing assets" @@ -32520,7 +32520,7 @@ msgstr "" #: erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py:43 msgid "Only {0} are supported" -msgstr "فقط {0} پشتیبانی می شود" +msgstr "فقط {0} پشتیبانی می‌شود" #. Option for the 'Status' (Select) field in DocType 'POS Opening Entry' #. Option for the 'Status' (Select) field in DocType 'Appointment' @@ -34369,7 +34369,7 @@ msgstr "موفقیت جزئی" #. 'Stock Settings' #: erpnext/stock/doctype/stock_settings/stock_settings.json msgid "Partial stock can be reserved. For example, If you have a Sales Order of 100 units and the Available Stock is 90 units then a Stock Reservation Entry will be created for 90 units. " -msgstr "موجودی جزئی قابل رزرو است. به عنوان مثال، اگر شما یک سفارش فروش 100 واحدی دارید و موجودی در دسترس 90 واحد است، یک ورودی رزرو موجودی برای 90 واحد ایجاد می شود. " +msgstr "موجودی جزئی قابل رزرو است. به عنوان مثال، اگر شما یک سفارش فروش 100 واحدی دارید و موجودی در دسترس 90 واحد است، یک ورودی رزرو موجودی برای 90 واحد ایجاد می‌شود. " #. Option for the 'Completion Status' (Select) field in DocType 'Maintenance #. Schedule Detail' @@ -35161,7 +35161,7 @@ msgstr "فاکتور تطبیق پرداخت" #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js:123 msgid "Payment Reconciliation Job: {0} is running for this party. Can't reconcile now." -msgstr "کار تطبیق پرداخت: {0} برای این طرف اجرا می شود. الان نمیشه تطبیق کرد" +msgstr "کار تطبیق پرداخت: {0} برای این طرف اجرا می‌شود. الان نمیشه تطبیق کرد" #. Name of a DocType #: erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json @@ -35358,7 +35358,7 @@ msgstr "جزئیات الگوی شرایط پرداخت" #. field in DocType 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json msgid "Payment Terms from orders will be fetched into the invoices as is" -msgstr "شرایط پرداخت از سفارش‌ها همانطور که هست در فاکتورها آورده می شود" +msgstr "شرایط پرداخت از سفارش‌ها همانطور که هست در فاکتورها آورده می‌شود" #: erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:45 msgid "Payment Terms:" @@ -39744,7 +39744,7 @@ msgstr "رسید خرید" #. 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Purchase Receipt (Draft) will be auto-created on submission of Subcontracting Receipt." -msgstr "رسید خرید (پیش نویس) با ارسال رسید پیمانکاری فرعی به صورت خودکار ایجاد می شود." +msgstr "رسید خرید (پیش نویس) با ارسال رسید پیمانکاری فرعی به صورت خودکار ایجاد می‌شود." #. Label of the pr_detail (Data) field in DocType 'Purchase Invoice Item' #: erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json @@ -39908,7 +39908,7 @@ msgstr "ارزش خرید" #: erpnext/utilities/activation.py:104 msgid "Purchase orders help you plan and follow up on your purchases" -msgstr "سفارش‌های خرید به شما کمک می کند تا خریدهای خود را برنامه ریزی و پیگیری کنید" +msgstr "سفارش‌های خرید به شما کمک می‌کند تا خریدهای خود را برنامه ریزی و پیگیری کنید" #. Option for the 'Current State' (Select) field in DocType 'Share Balance' #: erpnext/accounts/doctype/share_balance/share_balance.json @@ -40223,7 +40223,7 @@ msgstr "تعداد کالاهای تمام شده باید بیشتر از 0 ب #. 'Pick List' #: erpnext/stock/doctype/pick_list/pick_list.json msgid "Qty of raw materials will be decided based on the qty of the Finished Goods Item" -msgstr "تعداد مواد خام بر اساس تعداد کالاهای نهایی تعیین می شود" +msgstr "تعداد مواد خام بر اساس تعداد کالاهای نهایی تعیین می‌شود" #. Label of the consumed_qty (Float) field in DocType 'Purchase Receipt Item #. Supplied' @@ -41213,7 +41213,7 @@ msgstr "نرخ و مبلغ" #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json msgid "Rate at which Customer Currency is converted to customer's base currency" -msgstr "نرخی که ارز مشتری به ارز پایه مشتری تبدیل می شود" +msgstr "نرخی که ارز مشتری به ارز پایه مشتری تبدیل می‌شود" #. Description of the 'Price List Exchange Rate' (Float) field in DocType #. 'Quotation' @@ -41225,7 +41225,7 @@ msgstr "نرخی که ارز مشتری به ارز پایه مشتری تبدی #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/stock/doctype/delivery_note/delivery_note.json msgid "Rate at which Price list currency is converted to company's base currency" -msgstr "نرخی که ارز فهرست قیمت به ارز پایه شرکت تبدیل می شود" +msgstr "نرخی که ارز فهرست قیمت به ارز پایه شرکت تبدیل می‌شود" #. Description of the 'Price List Exchange Rate' (Float) field in DocType 'POS #. Invoice' @@ -41234,7 +41234,7 @@ msgstr "نرخی که ارز فهرست قیمت به ارز پایه شرکت #: erpnext/accounts/doctype/pos_invoice/pos_invoice.json #: erpnext/accounts/doctype/sales_invoice/sales_invoice.json msgid "Rate at which Price list currency is converted to customer's base currency" -msgstr "نرخی که ارز فهرست قیمت به ارز پایه مشتری تبدیل می شود" +msgstr "نرخی که ارز فهرست قیمت به ارز پایه مشتری تبدیل می‌شود" #. Description of the 'Exchange Rate' (Float) field in DocType 'Quotation' #. Description of the 'Exchange Rate' (Float) field in DocType 'Sales Order' @@ -41243,18 +41243,18 @@ msgstr "نرخی که ارز فهرست قیمت به ارز پایه مشتری #: erpnext/selling/doctype/sales_order/sales_order.json #: erpnext/stock/doctype/delivery_note/delivery_note.json msgid "Rate at which customer's currency is converted to company's base currency" -msgstr "نرخی که ارز مشتری به ارز پایه شرکت تبدیل می شود" +msgstr "نرخی که ارز مشتری به ارز پایه شرکت تبدیل می‌شود" #. Description of the 'Exchange Rate' (Float) field in DocType 'Purchase #. Receipt' #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json msgid "Rate at which supplier's currency is converted to company's base currency" -msgstr "نرخی که ارز تامین کننده به ارز پایه شرکت تبدیل می شود" +msgstr "نرخی که ارز تامین کننده به ارز پایه شرکت تبدیل می‌شود" #. Description of the 'Tax Rate' (Float) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json msgid "Rate at which this tax is applied" -msgstr "نرخی که این مالیات اعمال می شود" +msgstr "نرخی که این مالیات اعمال می‌شود" #. Label of the rate_of_depreciation (Percent) field in DocType 'Asset #. Depreciation Schedule' @@ -41831,7 +41831,7 @@ msgstr "وفق دادن" #. Reconciliation Item' #: erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json msgid "Reconcile All Serial Nos / Batches" -msgstr "" +msgstr "تطبیق همه شماره سریال ها / دسته ها" #. Label of the reconcile_effect_on (Date) field in DocType 'Payment Entry #. Reference' @@ -46013,7 +46013,7 @@ msgstr "درصد ارزش نجات" #: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py:41 msgid "Same Company is entered more than once" -msgstr "همان شرکت بیش از یک بار وارد می شود" +msgstr "همان شرکت بیش از یک بار وارد می‌شود" #. Label of the same_item (Check) field in DocType 'Pricing Rule' #. Label of the same_item (Check) field in DocType 'Promotional Scheme Product @@ -46536,7 +46536,7 @@ msgstr "انتخاب مشتریان توسط" #: erpnext/setup/doctype/employee/employee.js:108 msgid "Select Date of Birth. This will validate Employees age and prevent hiring of under-age staff." -msgstr "تاریخ تولد را انتخاب کنید. این امر سن کارکنان را تأیید می کند و از استخدام کارکنان زیر سن جلوگیری می کند." +msgstr "تاریخ تولد را انتخاب کنید. این امر سن کارکنان را تأیید می‌کند و از استخدام کارکنان زیر سن جلوگیری می‌کند." #: erpnext/setup/doctype/employee/employee.js:115 msgid "Select Date of joining. It will have impact on the first salary calculation, Leave allocation on pro-rata bases." @@ -46549,7 +46549,7 @@ msgstr "تامین کننده پیش فرض را انتخاب کنید" #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js:260 msgid "Select Difference Account" -msgstr "حساب تفاوت را انتخاب کنید" +msgstr "انتخاب حساب تفاوت" #: erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:57 msgid "Select Dimension" @@ -46687,7 +46687,7 @@ msgstr "یک تامین کننده انتخاب کنید" #: erpnext/stock/doctype/material_request/material_request.js:382 msgid "Select a Supplier from the Default Suppliers of the items below. On selection, a Purchase Order will be made against items belonging to the selected Supplier only." -msgstr "یک تامین کننده از تامین کنندگان پیش فرض موارد زیر انتخاب کنید. در صورت انتخاب، یک سفارش خرید فقط در برابر اقلام متعلق به تامین کننده منتخب انجام می شود." +msgstr "یک تامین کننده از تامین کنندگان پیش فرض موارد زیر انتخاب کنید. در صورت انتخاب، یک سفارش خرید فقط در برابر اقلام متعلق به تامین کننده منتخب انجام می‌شود." #: erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js:161 msgid "Select a company" @@ -46742,7 +46742,7 @@ msgstr "حساب بانکی را برای تطبیق انتخاب کنید." #: erpnext/manufacturing/doctype/operation/operation.js:25 msgid "Select the Default Workstation where the Operation will be performed. This will be fetched in BOMs and Work Orders." -msgstr "ایستگاه کاری پیش‌فرض را که در آن عملیات انجام می‌شود، انتخاب کنید. این در BOM ها و دستور کارها واکشی می شود." +msgstr "ایستگاه کاری پیش‌فرض را که در آن عملیات انجام می‌شود، انتخاب کنید. این در BOM ها و دستور کارها واکشی می‌شود." #: erpnext/manufacturing/doctype/work_order/work_order.js:1022 msgid "Select the Item to be manufactured." @@ -46750,7 +46750,7 @@ msgstr "موردی را که باید تولید شود انتخاب کنید." #: erpnext/manufacturing/doctype/bom/bom.js:852 msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically." -msgstr "موردی را که باید تولید شود انتخاب کنید. نام مورد، UoM، شرکت و ارز به طور خودکار واکشی می شود." +msgstr "موردی را که باید تولید شود انتخاب کنید. نام مورد، UoM، شرکت و ارز به طور خودکار واکشی می‌شود." #: erpnext/manufacturing/doctype/production_plan/production_plan.js:319 #: erpnext/manufacturing/doctype/production_plan/production_plan.js:332 @@ -47946,42 +47946,42 @@ msgstr "تنظیم {0} در شرکت {1}" #. 'Subcontracting Receipt' #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Sets 'Accepted Warehouse' in each row of the Items table." -msgstr "انبار پذیرفته شده را در هر ردیف از جدول آیتم‌ها تنظیم می کند." +msgstr "انبار پذیرفته شده را در هر ردیف از جدول آیتم‌ها تنظیم می‌کند." #. Description of the 'Rejected Warehouse' (Link) field in DocType #. 'Subcontracting Receipt' #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "Sets 'Rejected Warehouse' in each row of the Items table." -msgstr "انبار مرجوعی را در هر ردیف از جدول آیتم‌ها تنظیم می کند." +msgstr "انبار مرجوعی را در هر ردیف از جدول آیتم‌ها تنظیم می‌کند." #. Description of the 'Set Reserve Warehouse' (Link) field in DocType #. 'Subcontracting Order' #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json msgid "Sets 'Reserve Warehouse' in each row of the Supplied Items table." -msgstr "«انبار رزرو» را در هر ردیف از جدول آیتم‌های تامین شده تنظیم می کند." +msgstr "«انبار رزرو» را در هر ردیف از جدول آیتم‌های تامین شده تنظیم می‌کند." #. Description of the 'Default Source Warehouse' (Link) field in DocType 'Stock #. Entry' #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Sets 'Source Warehouse' in each row of the items table." -msgstr "انبار منبع را در هر ردیف از جدول آیتم‌ها تنظیم می کند." +msgstr "انبار منبع را در هر ردیف از جدول آیتم‌ها تنظیم می‌کند." #. Description of the 'Default Target Warehouse' (Link) field in DocType 'Stock #. Entry' #: erpnext/stock/doctype/stock_entry/stock_entry.json msgid "Sets 'Target Warehouse' in each row of the items table." -msgstr "«انبار هدف» را در هر ردیف از جدول آیتم‌ها تنظیم می کند." +msgstr "«انبار هدف» را در هر ردیف از جدول آیتم‌ها تنظیم می‌کند." #. Description of the 'Set Target Warehouse' (Link) field in DocType #. 'Subcontracting Order' #: erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json msgid "Sets 'Warehouse' in each row of the Items table." -msgstr "انبار را در هر ردیف از جدول آیتم‌ها تنظیم می کند." +msgstr "انبار را در هر ردیف از جدول آیتم‌ها تنظیم می‌کند." #. Description of the 'Account Type' (Select) field in DocType 'Account' #: erpnext/accounts/doctype/account/account.json msgid "Setting Account Type helps in selecting this Account in transactions." -msgstr "تنظیم نوع حساب به انتخاب این حساب در تراکنش ها کمک می کند." +msgstr "تنظیم نوع حساب به انتخاب این حساب در تراکنش ها کمک می‌کند." #: erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py:129 msgid "Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}" @@ -50552,7 +50552,7 @@ msgstr "سفارش پیمانکاری فرعی" #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "Subcontracting Order (Draft) will be auto-created on submission of Purchase Order." -msgstr "سفارش پیمانکاری فرعی (پیش‌نویس) با ارسال سفارش خرید به صورت خودکار ایجاد می شود." +msgstr "سفارش پیمانکاری فرعی (پیش‌نویس) با ارسال سفارش خرید به صورت خودکار ایجاد می‌شود." #. Name of a DocType #. Label of the subcontracting_order_item (Data) field in DocType @@ -51744,7 +51744,7 @@ msgstr "شناسه کاربر سیستم (ورود به سیستم). اگر تن #. DocType 'Manufacturing Settings' #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json msgid "System will automatically create the serial numbers / batch for the Finished Good on submission of work order" -msgstr "سیستم به طور خودکار شماره سریال / دسته را برای کالای تمام شده در هنگام ارسال سفارش ایجاد می کند" +msgstr "سیستم به طور خودکار شماره سریال / دسته را برای کالای تمام شده در هنگام ارسال سفارش ایجاد می‌کند" #. Description of the 'Invoice Limit' (Int) field in DocType 'Payment #. Reconciliation' @@ -51752,7 +51752,7 @@ msgstr "سیستم به طور خودکار شماره سریال / دسته ر #. Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "System will fetch all the entries if limit value is zero." -msgstr "اگر مقدار حد صفر باشد، سیستم تمام ورودی ها را واکشی می کند." +msgstr "اگر مقدار حد صفر باشد، سیستم تمام ورودی ها را واکشی می‌کند." #: erpnext/controllers/accounts_controller.py:1900 msgid "System will not check over billing since amount for Item {0} in {1} is zero" @@ -52174,7 +52174,7 @@ msgstr "مبلغ مالیات پس از تخفیف (ارز شرکت)" #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json msgid "Tax Amount will be rounded on a row(items) level" -msgstr "مقدار مالیات در سطح ردیف (آیتم‌ها) گرد می شود" +msgstr "مقدار مالیات در سطح ردیف (آیتم‌ها) گرد می‌شود" #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:23 #: erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:35 @@ -52321,7 +52321,7 @@ msgstr "نرخ مالیات" #: erpnext/regional/report/uae_vat_201/uae_vat_201.py:52 msgid "Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme" -msgstr "بازپرداخت مالیات بر اساس طرح بازپرداخت مالیات برای گردشگران به گردشگران ارائه می شود" +msgstr "بازپرداخت مالیات بر اساس طرح بازپرداخت مالیات برای گردشگران به گردشگران ارائه می‌شود" #. Name of a DocType #. Label of a Link in the Accounting Workspace @@ -53047,7 +53047,7 @@ msgstr "باندل سریال و دسته {0} برای این تراکنش مع #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:17 msgid "The Stock Entry of type 'Manufacture' is known as backflush. Raw materials being consumed to manufacture finished goods is known as backflushing.

When creating Manufacture Entry, raw-material items are backflushed based on BOM of production item. If you want raw-material items to be backflushed based on Material Transfer entry made against that Work Order instead, then you can set it under this field." -msgstr "ثبت موجودی از نوع \"ساخت\" به عنوان کسر خودکار شناخته می شود. مواد اولیه ای که برای تولید کالاهای نهایی مصرف می شود به عنوان کسر خودکار شناخته می شود.

هنگام ایجاد ثبت ساخت، آیتم‌های مواد خام بر اساس BOM آیتم تولیدی، کسر خودکار می شوند. اگر می‌خواهید آیتم‌های مواد خام بر اساس ثبت انتقال مواد که در مقابل آن دستور کار انجام شده است، کسر خودکار شوند، می‌توانید آن را در این قسمت تنظیم کنید." +msgstr "ثبت موجودی از نوع \"ساخت\" به عنوان کسر خودکار شناخته می‌شود. مواد اولیه ای که برای تولید کالاهای نهایی مصرف می‌شود به عنوان کسر خودکار شناخته می‌شود.

هنگام ایجاد ثبت ساخت، آیتم‌های مواد خام بر اساس BOM آیتم تولیدی، کسر خودکار می شوند. اگر می‌خواهید آیتم‌های مواد خام بر اساس ثبت انتقال مواد که در مقابل آن دستور کار انجام شده است، کسر خودکار شوند، می‌توانید آن را در این قسمت تنظیم کنید." #: erpnext/stock/doctype/stock_entry/stock_entry.py:1766 msgid "The Work Order is mandatory for Disassembly Order" @@ -53160,7 +53160,7 @@ msgstr "" #. Description of the 'Net Weight' (Float) field in DocType 'Packing Slip' #: erpnext/stock/doctype/packing_slip/packing_slip.json msgid "The net weight of this package. (calculated automatically as sum of net weight of items)" -msgstr "وزن خالص این بسته. (به طور خودکار به عنوان مجموع وزن خالص آیتم‌ها محاسبه می شود)" +msgstr "وزن خالص این بسته. (به طور خودکار به عنوان مجموع وزن خالص آیتم‌ها محاسبه می‌شود)" #. Description of the 'New BOM' (Link) field in DocType 'BOM Update Tool' #: erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json @@ -53329,7 +53329,7 @@ msgstr "انباری که اقلام تمام شده را قبل از ارسال #: erpnext/manufacturing/doctype/work_order/work_order.js:1048 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 "انباری که مواد اولیه خود را در آن نگهداری می کنید. هر کالای مورد نیاز می تواند یک انبار منبع جداگانه داشته باشد. انبار گروهی نیز می تواند به عنوان انبار منبع انتخاب شود. پس از ارسال دستور کار، مواد اولیه در این انبارها برای استفاده تولید رزرو می شود." +msgstr "انباری که مواد اولیه خود را در آن نگهداری می کنید. هر کالای مورد نیاز می تواند یک انبار منبع جداگانه داشته باشد. انبار گروهی نیز می تواند به عنوان انبار منبع انتخاب شود. پس از ارسال دستور کار، مواد اولیه در این انبارها برای استفاده تولید رزرو می‌شود." #: erpnext/manufacturing/doctype/work_order/work_order.js:1060 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." @@ -53464,11 +53464,11 @@ msgstr "این سفارش خرید به طور کامل قرارداد فرعی #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31 msgid "This Warehouse will be auto-updated in the Target Warehouse field of Work Order." -msgstr "این انبار به طور خودکار در قسمت Target Warehouse دستور کار به روز می شود." +msgstr "این انبار به طور خودکار در قسمت Target Warehouse دستور کار به روز می‌شود." #: erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:24 msgid "This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Orders." -msgstr "این انبار به طور خودکار در فیلد کار در حال انجام دستور کارها به روز می شود." +msgstr "این انبار به طور خودکار در فیلد کار در حال انجام دستور کارها به روز می‌شود." #: erpnext/setup/doctype/email_digest/email_digest.py:184 msgid "This Week's Summary" @@ -53480,7 +53480,7 @@ msgstr "این اقدام صورتحساب آینده را متوقف می‌ک #: erpnext/accounts/doctype/bank_account/bank_account.js:35 msgid "This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?" -msgstr "این عمل پیوند این حساب را با هر سرویس خارجی که ERPNext را با حساب های بانکی شما یکپارچه می کند، لغو می کند. نمی توان آن را واگرد کرد. مطمئنی؟" +msgstr "این عمل پیوند این حساب را با هر سرویس خارجی که ERPNext را با حساب های بانکی شما یکپارچه می‌کند، لغو می‌کند. نمی توان آن را واگرد کرد. مطمئنی؟" #: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_dashboard.py:7 msgid "This covers all scorecards tied to this Setup" @@ -53492,7 +53492,7 @@ msgstr "این سند توسط {0} {1} برای مورد {4} بیش از حد م #: erpnext/stock/doctype/delivery_note/delivery_note.js:434 msgid "This field is used to set the 'Customer'." -msgstr "این فیلد برای تنظیم \"مشتری\" استفاده می شود." +msgstr "این فیلد برای تنظیم \"مشتری\" استفاده می‌شود." #. Description of the 'Bank / Cash Account' (Link) field in DocType 'Payment #. Reconciliation' @@ -53507,13 +53507,13 @@ msgstr "این یک الگوی BOM است و برای ایجاد دستور کا #. 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' #: erpnext/manufacturing/doctype/work_order/work_order.json msgid "This is a location where operations are executed." -msgstr "این مکانی است که عملیات در آن اجرا می شود." +msgstr "این مکانی است که عملیات در آن اجرا می‌شود." #. Description of the 'Source Warehouse' (Link) field in DocType 'Work Order' #: erpnext/manufacturing/doctype/work_order/work_order.json @@ -53523,7 +53523,7 @@ msgstr "این مکانی است که مواد اولیه در آن موجود #. Description of the 'Scrap Warehouse' (Link) field in DocType 'Work Order' #: erpnext/manufacturing/doctype/work_order/work_order.json msgid "This is a location where scraped materials are stored." -msgstr "این مکانی است که مواد ضایعات در آن ذخیره می شود." +msgstr "این مکانی است که مواد ضایعات در آن ذخیره می‌شود." #: erpnext/buying/doctype/request_for_quotation/request_for_quotation.js:275 msgid "This is a preview of the email to be sent. A PDF of the document will automatically be attached with the email." @@ -53571,11 +53571,11 @@ msgstr "این بر اساس معاملات در مقابل این فروشند #: erpnext/stock/doctype/stock_settings/stock_settings.js:42 msgid "This is considered dangerous from accounting point of view." -msgstr "این از نظر حسابداری خطرناک تلقی می شود." +msgstr "این از نظر حسابداری خطرناک تلقی می‌شود." #: erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py:528 msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice" -msgstr "این کار برای رسیدگی به مواردی که رسید خرید پس از فاکتور خرید ایجاد می شود، انجام می شود." +msgstr "این کار برای رسیدگی به مواردی که رسید خرید پس از فاکتور خرید ایجاد می‌شود، انجام می‌شود." #: erpnext/manufacturing/doctype/work_order/work_order.js:1041 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." @@ -53583,7 +53583,7 @@ msgstr "این به طور پیش فرض فعال است. اگر می‌خواه #: erpnext/stock/doctype/item/item.js:954 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 "این برای آیتم‌های مواد خام است که برای ایجاد کالاهای نهایی استفاده می شود. اگر آیتم یک سرویس اضافی مانند \"شستن\" است که در BOM استفاده می شود، این مورد را علامت نزنید." +msgstr "این برای آیتم‌های مواد خام است که برای ایجاد کالاهای نهایی استفاده می‌شود. اگر آیتم یک سرویس اضافی مانند \"شستن\" است که در BOM استفاده می‌شود، این مورد را علامت نزنید." #: erpnext/selling/doctype/party_specific_item/party_specific_item.py:35 msgid "This item filter has already been applied for the {0}" @@ -53653,12 +53653,12 @@ msgstr "این بخش به کاربر اجازه می دهد متن Body و Clos #: erpnext/stock/doctype/delivery_note/delivery_note.js:440 msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc." -msgstr "این جدول برای تنظیم جزئیات مربوط به \"آیتم\"، \"مقدار\"، \"نرخ پایه\" و غیره استفاده می شود." +msgstr "این جدول برای تنظیم جزئیات مربوط به \"آیتم\"، \"مقدار\"، \"نرخ پایه\" و غیره استفاده می‌شود." #. Description of a DocType #: erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json msgid "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses." -msgstr "" +msgstr "این ابزار به شما کمک می‌کند تا مقدار و ارزش‌گذاری موجودی را در سیستم به‌روزرسانی یا اصلاح کنید. معمولاً برای همگام‌سازی مقادیر سیستمی با موجودی واقعی در انبارهای شما استفاده می‌شود." #. Description of the 'Default Common Code' (Link) field in DocType 'Code List' #: erpnext/edi/doctype/code_list/code_list.json @@ -53675,11 +53675,11 @@ msgstr "این به کد آیتم گونه اضافه خواهد شد. به عن #. 'Employee' #: erpnext/setup/doctype/employee/employee.json msgid "This will restrict user access to other employee records" -msgstr "این امر دسترسی کاربر به سایر رکوردهای کارمندان را محدود می کند" +msgstr "این امر دسترسی کاربر به سایر رکوردهای کارمندان را محدود می‌کند" #: erpnext/controllers/selling_controller.py:782 msgid "This {} will be treated as material transfer." -msgstr "این {} به عنوان انتقال مواد در نظر گرفته می شود." +msgstr "این {} به عنوان انتقال مواد در نظر گرفته می‌شود." #. Label of the threshold_percentage (Percent) field in DocType 'Promotional #. Scheme Price Discount' @@ -55758,7 +55758,7 @@ msgstr "" #. 'Accounts Settings' #: erpnext/accounts/doctype/accounts_settings/accounts_settings.json msgid "Truncates 'Remarks' column to set character length" -msgstr "ستون \"Remarks\" را برای تنظیم طول کاراکتر کوتاه می کند" +msgstr "ستون \"Remarks\" را برای تنظیم طول کاراکتر کوتاه می‌کند" #. Option for the 'Day of Week' (Select) field in DocType 'Communication Medium #. Timeslot' @@ -56089,7 +56089,7 @@ msgstr "نرخ مبادله {0} تا {1} برای تاریخ کلیدی {2} یا #: erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py:78 msgid "Unable to find score starting at {0}. You need to have standing scores covering 0 to 100" -msgstr "نمی توان امتیازی را که از {0} شروع می شود پیدا کرد. شما باید نمرات ثابتی داشته باشید که از 0 تا 100 را پوشش دهد" +msgstr "نمی توان امتیازی را که از {0} شروع می‌شود پیدا کرد. شما باید نمرات ثابتی داشته باشید که از 0 تا 100 را پوشش دهد" #: erpnext/manufacturing/doctype/work_order/work_order.py:732 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}." @@ -56146,7 +56146,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 بعد از ظهر فعال باشد. همچنین می توانید ساعت کاری را بر اساس شیفت ها مشخص کنید. هنگام برنامه ریزی یک دستور کار، سیستم بر اساس ساعات کاری مشخص شده، در دسترس بودن ایستگاه کاری را بررسی می‌کند." #. Option for the 'Fulfilment Status' (Select) field in DocType 'Contract' #: erpnext/crm/doctype/contract/contract.json @@ -56302,7 +56302,7 @@ msgstr "مبلغ ناسازگار" #. Reconciliation' #: erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json msgid "Unreconciled Entries" -msgstr "ورودی های تطبیق نگرفته" +msgstr "ثبت های تطبیق نگرفته" #: erpnext/manufacturing/doctype/work_order/work_order.js:822 #: erpnext/selling/doctype/sales_order/sales_order.js:81 @@ -56774,7 +56774,7 @@ msgstr "استفاده شده" #. Item' #: erpnext/selling/doctype/sales_order_item/sales_order_item.json msgid "Used for Production Plan" -msgstr "برای برنامه تولید استفاده می شود" +msgstr "برای برنامه تولید استفاده می‌شود" #. Label of the user (Link) field in DocType 'Cashier Closing' #. Label of the user (Link) field in DocType 'POS Profile User' @@ -56908,7 +56908,7 @@ msgstr "کاربران با این نقش مجاز به تنظیم حساب ها #: erpnext/stock/doctype/stock_settings/stock_settings.js:38 msgid "Using negative stock disables FIFO/Moving average valuation when inventory is negative." -msgstr "استفاده از موجودی منفی، ارزش گذاری FIFO / میانگین متحرک را زمانی که موجودی کالا منفی است، غیرفعال می کند." +msgstr "استفاده از موجودی منفی، ارزش گذاری FIFO / میانگین متحرک را زمانی که موجودی کالا منفی است، غیرفعال می‌کند." #: 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:95 @@ -58599,11 +58599,11 @@ msgstr "چرخ ها" #. 'Production Plan' #: erpnext/manufacturing/doctype/production_plan/production_plan.json msgid "When a parent warehouse is chosen, the system conducts stock checks against the associated child warehouses" -msgstr "هنگامی که یک انبار اصلی انتخاب می شود، سیستم بررسی های موجودی را در مقابل انبارهای فرزند مرتبط انجام می دهد" +msgstr "هنگامی که یک انبار اصلی انتخاب می‌شود، سیستم بررسی های موجودی را در مقابل انبارهای فرزند مرتبط انجام می دهد" #: erpnext/stock/doctype/item/item.js:973 msgid "When creating an Item, entering a value for this field will automatically create an Item Price at the backend." -msgstr "هنگام ایجاد یک آیتم، با وارد کردن یک مقدار برای این فیلد، به طور خودکار قیمت آیتم در قسمت پشتیبان ایجاد می شود." +msgstr "هنگام ایجاد یک آیتم، با وارد کردن یک مقدار برای این فیلد، به طور خودکار قیمت آیتم در قسمت پشتیبان ایجاد می‌شود." #: erpnext/accounts/doctype/account/account.py:343 msgid "While creating account for Child Company {0}, parent account {1} found as a ledger account." @@ -58617,7 +58617,7 @@ msgstr "هنگام ایجاد حساب برای شرکت فرزند {0}، حسا #. DocType 'Buying Settings' #: erpnext/buying/doctype/buying_settings/buying_settings.json msgid "While making Purchase Invoice from Purchase Order, use Exchange Rate on Invoice's transaction date rather than inheriting it from Purchase Order. Only applies for Purchase Invoice." -msgstr "هنگام تهیه فاکتور خرید از سفارش خرید، به جای ارث بردن آن از سفارش خرید، از نرخ مبادله در تاریخ تراکنش فاکتور استفاده کنید. فقط برای فاکتور خرید اعمال می شود." +msgstr "هنگام تهیه فاکتور خرید از سفارش خرید، به جای ارث بردن آن از سفارش خرید، از نرخ مبادله در تاریخ تراکنش فاکتور استفاده کنید. فقط برای فاکتور خرید اعمال می‌شود." #: erpnext/setup/setup_wizard/operations/install_fixtures.py:269 msgid "White" @@ -58784,7 +58784,7 @@ msgstr "خلاصه دستور کار" #: erpnext/stock/doctype/material_request/material_request.py:868 msgid "Work Order cannot be created for following reason:
{0}" -msgstr "دستور کار به دلایل زیر ایجاد نمی شود:
{0}" +msgstr "دستور کار به دلایل زیر ایجاد نمی‌شود:
{0}" #: erpnext/manufacturing/doctype/work_order/work_order.py:1064 msgid "Work Order cannot be raised against a Item Template" @@ -59961,7 +59961,7 @@ msgstr "{0} یک فیلد اجباری است." #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:73 #: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:60 msgid "{0} is added multiple times on rows: {1}" -msgstr "{0} چندین بار در ردیف ها اضافه می شود: {1}" +msgstr "{0} چندین بار در ردیف ها اضافه می‌شود: {1}" #: erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py:189 msgid "{0} is already running for {1}" @@ -60118,7 +60118,7 @@ msgstr "{0} گونه ایجاد شد." #: erpnext/accounts/doctype/payment_term/payment_term.js:19 msgid "{0} will be given as discount." -msgstr "{0} به عنوان تخفیف داده می شود." +msgstr "{0} به عنوان تخفیف داده می‌شود." #: erpnext/manufacturing/doctype/job_card/job_card.py:862 msgid "{0} {1}" @@ -60272,7 +60272,7 @@ msgstr "{0} {1}: حساب {2} غیرفعال است" #: erpnext/accounts/doctype/gl_entry/gl_entry.py:289 msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}" -msgstr "{0} {1}: ورود حسابداری برای {2} فقط به ارز انجام می شود: {3}" +msgstr "{0} {1}: ورود حسابداری برای {2} فقط به ارز انجام می‌شود: {3}" #: erpnext/controllers/stock_controller.py:762 msgid "{0} {1}: Cost Center is mandatory for Item {2}" @@ -60317,7 +60317,7 @@ msgstr "{0}% تحویل داده شده" #: erpnext/accounts/doctype/payment_term/payment_term.js:15 #, python-format msgid "{0}% of total invoice value will be given as discount." -msgstr "{0}% از ارزش کل فاکتور به عنوان تخفیف داده می شود." +msgstr "{0}% از ارزش کل فاکتور به عنوان تخفیف داده می‌شود." #: erpnext/projects/doctype/task/task.py:124 msgid "{0}'s {1} cannot be after {2}'s Expected End Date." diff --git a/erpnext/locale/tr.po b/erpnext/locale/tr.po index b05750c69e1..ae61f128f8f 100644 --- a/erpnext/locale/tr.po +++ b/erpnext/locale/tr.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: info@erpnext.com\n" "POT-Creation-Date: 2025-02-16 09:34+0000\n" -"PO-Revision-Date: 2025-02-16 23:45\n" +"PO-Revision-Date: 2025-02-22 02:16\n" "Last-Translator: info@erpnext.com\n" "Language-Team: Turkish\n" "MIME-Version: 1.0\n" @@ -291,7 +291,7 @@ msgstr "'{0}' hesabı zaten {1} tarafından kullanılıyor. Başka bir hesap kul #: erpnext/accounts/doctype/pos_settings/pos_settings.py:37 msgid "'{0}' has been already added." -msgstr "" +msgstr "'{0}' zaten eklenmiş." #: erpnext/setup/doctype/company/company.py:208 #: erpnext/setup/doctype/company/company.py:219 @@ -16866,7 +16866,7 @@ msgstr "Seri No ve Parti Seçiciyi Devre Dışı Bırak" #. 'POS Profile' #: erpnext/accounts/doctype/pos_profile/pos_profile.json msgid "Disable auto setting Grand Total to default Payment Mode" -msgstr "" +msgstr "Genel Toplamın varsayılan Ödeme Yönteminin otomatik ayarlanmasını devre dışı bırak" #. Label of the disabled (Check) field in DocType 'Accounting Dimension Filter' #. Label of the disabled (Check) field in DocType 'Bank Account' @@ -17953,7 +17953,7 @@ msgstr "Ürün Grubunu Çoğalt" #: erpnext/accounts/doctype/pos_settings/pos_settings.py:37 msgid "Duplicate POS Fields" -msgstr "" +msgstr "POS Alanlarını Çoğalt" #: erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py:77 #: erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py:64 From b88305a95f78ae6a02895dc289f2c9c9791c3651 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sun, 23 Feb 2025 22:04:52 +0530 Subject: [PATCH 27/69] fix: valuation rate for batch --- erpnext/stock/deprecated_serial_batch.py | 2 ++ erpnext/stock/doctype/bin/bin.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/deprecated_serial_batch.py b/erpnext/stock/deprecated_serial_batch.py index fbeefe8361c..7855dfb14f8 100644 --- a/erpnext/stock/deprecated_serial_batch.py +++ b/erpnext/stock/deprecated_serial_batch.py @@ -365,6 +365,8 @@ class DeprecatedBatchNoValuation: if self.sle.voucher_detail_no: query = query.where(sabb.voucher_detail_no != self.sle.voucher_detail_no) + query = query.where(sabb.voucher_type != "Pick List") + data = query.run(as_dict=True) if not data: return {} diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py index db5d1e58a84..d3de1897633 100644 --- a/erpnext/stock/doctype/bin/bin.py +++ b/erpnext/stock/doctype/bin/bin.py @@ -247,7 +247,7 @@ def update_qty(bin_name, args): & (sle.warehouse == args.get("warehouse")) & (sle.is_cancelled == 0) ) - .orderby(CombineDatetime(sle.posting_date, sle.posting_time), order=Order.desc) + .orderby(sle.posting_datetime, order=Order.desc) .orderby(sle.creation, order=Order.desc) .limit(1) .run() From 6073f5a6f95f5f0fdeae21e0bdd869eddf34cb85 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Sun, 23 Feb 2025 22:26:01 +0530 Subject: [PATCH 28/69] test: added test --- .../sales_invoice/test_sales_invoice.py | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py index de488aebcbf..9ee30acbb77 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -4305,6 +4305,31 @@ class TestSalesInvoice(IntegrationTestCase): doc = frappe.get_doc("Project", project.name) self.assertEqual(doc.total_billed_amount, si.grand_total) + def test_total_billed_amount_with_different_projects(self): + # This test case is for checking the scenario where project is set at document level and for **some** child items only, not all + from copy import copy + + si = create_sales_invoice(do_not_submit=True) + + project = frappe.new_doc("Project") + project.company = "_Test Company" + project.project_name = "Test Total Billed Amount" + project.save() + + si.project = project.name + si.items.append(copy(si.items[0])) + si.items.append(copy(si.items[0])) + si.items[0].project = project.name + si.items[1].project = project.name + # Not setting project on last item + si.items[1].insert() + si.items[2].insert() + si.submit() + + project.reload() + self.assertIsNone(si.items[2].project) + self.assertEqual(project.total_billed_amount, 300) + def test_pos_returns_with_party_account_currency(self): from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_sales_return From 3b2879d3a1e81fd71cc34fa68543411b67ade36a Mon Sep 17 00:00:00 2001 From: Ninad1306 Date: Mon, 24 Feb 2025 12:42:05 +0530 Subject: [PATCH 29/69] fix(report): allow `Closed` purchase orders to be visible --- .../purchase_order_analysis.js | 11 +++++++++-- .../purchase_order_analysis.py | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js index 49cf0da02f7..06e300fb90a 100644 --- a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js +++ b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.js @@ -52,9 +52,16 @@ frappe.query_reports["Purchase Order Analysis"] = { label: __("Status"), fieldtype: "MultiSelectList", width: "80", - options: ["To Pay", "To Bill", "To Receive", "To Receive and Bill", "Completed"], + options: ["To Pay", "To Bill", "To Receive", "To Receive and Bill", "Completed", "Closed"], get_data: function (txt) { - let status = ["To Pay", "To Bill", "To Receive", "To Receive and Bill", "Completed"]; + let status = [ + "To Pay", + "To Bill", + "To Receive", + "To Receive and Bill", + "Completed", + "Closed", + ]; let options = []; for (let option of status) { options.push({ diff --git a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py index f583ce3e6c8..3efb9b021a9 100644 --- a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py +++ b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py @@ -70,7 +70,7 @@ def get_data(filters): po.company, po_item.name, ) - .where((po_item.parent == po.name) & (po.status.notin(("Stopped", "Closed"))) & (po.docstatus == 1)) + .where((po_item.parent == po.name) & (po.status.notin(("Stopped", "On Hold"))) & (po.docstatus == 1)) .groupby(po_item.name) .orderby(po.transaction_date) ) From 8284efdf66b7c51f8562399c6ad4d7322bd9c3e7 Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Tue, 25 Feb 2025 14:51:09 +0530 Subject: [PATCH 30/69] fix: sync translations from crowdin (#46111) * fix: Spanish translations * fix: Swedish translations * fix: Bosnian translations * fix: Persian translations * fix: Bosnian translations --- erpnext/locale/bs.po | 1204 +++++++++++++++++++++--------------------- erpnext/locale/es.po | 20 +- erpnext/locale/fa.po | 714 ++++++++++++------------- erpnext/locale/sv.po | 30 +- 4 files changed, 984 insertions(+), 984 deletions(-) diff --git a/erpnext/locale/bs.po b/erpnext/locale/bs.po index 9506c86b4b2..45887455d6b 100644 --- a/erpnext/locale/bs.po +++ b/erpnext/locale/bs.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: frappe\n" "Report-Msgid-Bugs-To: info@erpnext.com\n" "POT-Creation-Date: 2025-02-16 09:34+0000\n" -"PO-Revision-Date: 2025-02-23 02:28\n" +"PO-Revision-Date: 2025-02-25 02:52\n" "Last-Translator: info@erpnext.com\n" "Language-Team: Bosnian\n" "MIME-Version: 1.0\n" @@ -57,7 +57,7 @@ msgstr " Naziv" #: erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py:648 msgid " Rate" -msgstr " Stopa" +msgstr " Cijena" #: erpnext/public/js/bom_configurator/bom_configurator.bundle.js:122 msgid " Raw Material" @@ -84,11 +84,11 @@ msgstr " Sažetak" #: erpnext/stock/doctype/item/item.py:233 msgid "\"Customer Provided Item\" cannot be Purchase Item also" -msgstr "\"Artikal koji osigurava Klijent\" također ne može biti Kupovni Artikal" +msgstr "\"Artikal koji osigurava Klijent\" ne može biti Kupovni Artikal" #: erpnext/stock/doctype/item/item.py:235 msgid "\"Customer Provided Item\" cannot have Valuation Rate" -msgstr "\"Artikal koju daje Klijent\" ne može imati Procjenjenu Vrijednost" +msgstr "\"Artikal koju daje Klijent\" ne može imati Stopu Vrednovanja" #: erpnext/stock/doctype/item/item.py:311 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item" @@ -96,11 +96,11 @@ msgstr "Ne može se poništiti izbor opcije \"Fiksna Imovina\", jer postoji zapi #: erpnext/public/js/utils/serial_no_batch_selector.js:262 msgid "\"SN-01::10\" for \"SN-01\" to \"SN-10\"" -msgstr "\"SN-01::10\" za \"SN-01\" do \"SN-10\"" +msgstr "\"SB-01::10\" za \"SB-01\" do \"SB-10\"" #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:148 msgid "# In Stock" -msgstr "# Na zalihama" +msgstr "# Na Zalihama" #: erpnext/manufacturing/report/work_order_stock_report/work_order_stock_report.py:141 msgid "# Req'd Items" @@ -130,7 +130,7 @@ msgstr "% Fakturisano" #. Label of the percent_complete_method (Select) field in DocType 'Project' #: erpnext/projects/doctype/project/project.json msgid "% Complete Method" -msgstr "% Završena Metoda" +msgstr "% Završeno Metoda" #. Label of the percent_complete (Percent) field in DocType 'Project' #: erpnext/projects/doctype/project/project.json @@ -222,7 +222,7 @@ msgstr "'Dozvoli višestruke Prodajne Naloge naspram Kupovnog Naloga Klijenta'" #: erpnext/controllers/trends.py:56 msgid "'Based On' and 'Group By' can not be same" -msgstr "'Bazirano na' i 'Grupiraj po' ne mogu biti isti" +msgstr "'Na Osnovu' i 'Grupiraj Po' ne mogu biti isti" #: erpnext/stock/report/product_bundle_balance/product_bundle_balance.py:233 msgid "'Date' is required" @@ -252,11 +252,11 @@ msgstr "'Od datuma' mora biti nakon 'Do datuma'" #: erpnext/stock/doctype/item/item.py:396 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 zalihi" +msgstr "'Ima Serijski Broj' ne može biti 'Da' za artikal koji nije na zalihama" #: erpnext/stock/doctype/quality_inspection/quality_inspection.py:159 msgid "'Inspection Required before Delivery' has disabled for the item {0}, no need to create the QI" -msgstr "'Potrebna kontrola prije isporuke' je onemogućena za artikal {0}, nema potrebe za kreiranjem kontrole kvaliteta" +msgstr "'Kontrola Obavezna prije Dostave' je onemogućena za artikal {0}, nema potrebe za kreiranjem Kontrole Kvaliteta" #: erpnext/stock/doctype/quality_inspection/quality_inspection.py:150 msgid "'Inspection Required before Purchase' has disabled for the item {0}, no need to create the QI" @@ -271,11 +271,11 @@ msgstr "'Početno'" #: erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py:133 #: erpnext/stock/report/stock_analytics/stock_analytics.py:319 msgid "'To Date' is required" -msgstr "'Do datuma' je obavezno" +msgstr "'Do Datuma' je obavezno" #: erpnext/stock/doctype/packing_slip/packing_slip.py:94 msgid "'To Package No.' cannot be less than 'From Package No.'" -msgstr "'Do paketa broj' ne može biti manje od 'Od paketa broj.'" +msgstr "'Do Paketa Broj' ne može biti manje od 'Od Paketa Broj.'" #: erpnext/controllers/sales_and_purchase_return.py:70 msgid "'Update Stock' can not be checked because items are not delivered via {0}" @@ -302,38 +302,38 @@ msgstr "'{0}' bi trebao biti u valuti kompanije {1}." #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:203 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:106 msgid "(A) Qty After Transaction" -msgstr "(A) Količina nakon transakcije" +msgstr "(A) Količina Nakon Transakcije" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:208 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:111 msgid "(B) Expected Qty After Transaction" -msgstr "(B) Očekivana količina nakon transakcije" +msgstr "(B) Očekivana Količina Nakon Transakcije" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:223 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:126 msgid "(C) Total Qty in Queue" -msgstr "(C) Ukupna količina u redu" +msgstr "(C) Ukupna Količina u Redu" #: erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:184 msgid "(C) Total qty in queue" -msgstr "(C) Ukupna količina u redu čekanja" +msgstr "(C) Ukupna Količina u Redu" #: erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:194 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:233 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:136 msgid "(D) Balance Stock Value" -msgstr "(D) Bilansna vrijednost zaliha" +msgstr "(D) Bilansna Vrijednost Zaliha" #: erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:199 #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:238 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:141 msgid "(E) Balance Stock Value in Queue" -msgstr "(E) Bilansna vrijednost zaliha u redu čekanja" +msgstr "(E) Bilansna Vrijednost Zaliha u Redu" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:248 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:151 msgid "(F) Change in Stock Value" -msgstr "(F) Promjena vrijednosti zaliha" +msgstr "(F) Promjena Vrijednosti Zaliha" #: erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py:192 msgid "(Forecast)" @@ -342,32 +342,32 @@ msgstr "(Prognoza)" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:253 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:156 msgid "(G) Sum of Change in Stock Value" -msgstr "(G) Zbir promjene vrijednosti zaliha" +msgstr "(G) Suma Promjene Vrijednosti Zaliha" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:263 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:166 msgid "(H) Change in Stock Value (FIFO Queue)" -msgstr "(H) Promjena vrijednosti zaliha (FIFO red)" +msgstr "(H) Promjena Vrijednosti Zaliha (FIFO)" #: erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:209 msgid "(H) Valuation Rate" -msgstr "(H) Procijenjena Vrijednost" +msgstr "(H) Stopa Vrednovanja" #. Description of the 'Actual Operating Cost' (Currency) field in DocType 'Work #. Order Operation' #: erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json msgid "(Hour Rate / 60) * Actual Operation Time" -msgstr "(Broj sati / 60) * Stvarno vrijeme rada" +msgstr "(Satnica / 60) * Stvarno Vrijeme Operacije" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:273 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:176 msgid "(I) Valuation Rate" -msgstr "(I) Procijenjena Vrijednost" +msgstr "(I) Stopa Vrednovanja" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:278 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:181 msgid "(J) Valuation Rate as per FIFO" -msgstr "(J) Procijenjena Vrijednost prema FIFO" +msgstr "(J) Stopa Vrednovanja prema FIFO" #: erpnext/stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:288 #: erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py:191 @@ -403,7 +403,7 @@ msgstr "0-30 dana" #. Program' #: erpnext/accounts/doctype/loyalty_program/loyalty_program.json msgid "1 Loyalty Points = How much base currency?" -msgstr "1 bod lojalnosti = Koliko je osnovna valuta?" +msgstr "1 Bod Lojalnosti = Koliko u osnovnoj valuti?" #. Option for the 'Frequency' (Select) field in DocType 'Video Settings' #: erpnext/utilities/doctype/video_settings/video_settings.json @@ -529,7 +529,7 @@ msgstr "Preko 90" #: erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.py:61 msgid "From Time cannot be later than To Time for {0}" -msgstr "Od vremena ne može biti kasnije od do vremena za {0}" +msgstr "Od Vremena ne može biti kasnije od Do Vremena za {0}" #. Content of the 'Help Text' (HTML) field in DocType 'Process Statement Of #. Accounts' @@ -574,13 +574,13 @@ msgstr "
\n" #: erpnext/stock/doctype/purchase_receipt/purchase_receipt.json #: erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json msgid "
Other Details
" -msgstr "
Ostali detalji
" +msgstr "
Ostali Detalji
" #. Content of the 'no_bank_transactions' (HTML) field in DocType 'Bank #. Reconciliation Tool' #: erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json msgid "
No Matching Bank Transactions Found
" -msgstr "
Nisu pronađene odgovarajuće bankovne transakcije
" +msgstr "
Nisu Pronađene Odgovarajuće Bankovne Transakcije
" #: erpnext/public/js/bank_reconciliation_tool/dialog_manager.js:262 msgid "
{0}
" @@ -669,15 +669,15 @@ msgid "

Standard Terms and Conditions Example

\n\n" "

The fieldnames you can use in your email template are the fields in the document from which you are sending the email. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Sales Invoice)

\n\n" "

Templating

\n\n" "

Templates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.

" -msgstr "

Primjer standardnih odredbi i uvjeta

\n\n" -"
Uvjeti isporuke za broj narudžbe {{ name }}\n\n"
-"- Datum narudžbe: {{ transaction_date }}\n"
-"- Očekivani datum isporuke: {{ delivery_date }}\n"
+msgstr "
Primjer Standardnih Odredbi i Uvjeta
\n\n"
+"
Uvjeti dostaveza broj Naloga {{ name }}\n\n"
+"- Datum Naloga: {{ transaction_date }}\n"
+"- Očekivani Datum Dostave: {{ delivery_date }}\n"
 "
\n\n"
-"
Kako dobiti nazive polja
\n\n"
-"
Imena polja koja možete koristiti u svom predlošku e-pošte su polja u dokumentu iz kojeg šaljete e-poštu. Polja bilo kojeg dokumenta možete pronaći preko Postavljanje > Prilagodite prikaz obrasca i odaberite vrstu dokumenta (npr. prodajna faktura)
\n\n"
-"
Izrada šablona
\n\n"
-"
Predlošci su sastavljeni pomoću Jinja Templating Language. Da biste saznali više o Jinji, pročitajte ovu dokumentaciju.
"
+"
Kako preuzeti nazive polja
\n\n"
+"
Imena polja koja možete koristiti u svom šablonu e-pošte su polja u dokumentu iz kojeg šaljete e-poštu. Polja bilo kojeg dokumenta možete pronaći preko Postavljanje > Prilagodite prikaz forme i odaberite tip dokumenta (npr. Prodajna Faktura)
\n\n"
+"
Izrada Šablona
\n\n"
+"
Šabloni su sastavljeni pomoću Jinja Templating Language. Da biste saznali više o Jinji, pročitajte ovu dokumentaciju.
"
 
 #. Content of the 'html_5' (HTML) field in DocType 'Bank Statement Import'
 #: erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
@@ -699,7 +699,7 @@ msgstr "